forked from openssh/openssh-portable
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- (bal) [auth-passwd.c openbsd-compat/Makefile.in openbsd-compat/xcr…
…ypt.c
openbsd-compat/xcrypt.h] Split off encryption into xcrypt() interface,
and isolate shadow password functions. Tested in Solaris, but should
not break other platforms too badly (except maybe HP =). Also brings
auth-passwd.c into full sync with OpenBSD tree.- Loading branch information
Showing
5 changed files
with
219 additions
and
141 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,10 @@ | ||
| 20030724 | ||
| - (bal) [auth-passwd.c openbsd-compat/Makefile.in openbsd-compat/xcrypt.c | ||
| openbsd-compat/xcrypt.h] Split off encryption into xcrypt() interface, | ||
| and isolate shadow password functions. Tested in Solaris, but should | ||
| not break other platforms too badly (except maybe HP =). Also brings | ||
| auth-passwd.c into full sync with OpenBSD tree. | ||
|
|
||
| 20030723 | ||
| - (dtucker) [configure.ac] Back out change for bug #620. | ||
|
|
||
|
|
@@ -721,4 +728,4 @@ | |
| - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | ||
| Report from [email protected], diagnosis from [email protected] | ||
|
|
||
| $Id: ChangeLog,v 1.2864 2003/07/23 04:33:10 dtucker Exp $ | ||
| $Id: ChangeLog,v 1.2865 2003/07/24 06:52:13 mouring Exp $ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /* | ||
| * Copyright (c) 2003 Ben Lindstrom. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #include "includes.h" | ||
|
|
||
| #if !defined(HAVE_OSF_SIA) | ||
|
|
||
| # ifdef HAVE_CRYPT_H | ||
| # include <crypt.h> | ||
| # endif | ||
|
|
||
| # ifdef __hpux | ||
| # include <hpsecurity.h> | ||
| # include <prot.h> | ||
| # endif | ||
|
|
||
| # ifdef HAVE_SECUREWARE | ||
| # include <sys/security.h> | ||
| # include <sys/audit.h> | ||
| # include <prot.h> | ||
| # endif | ||
|
|
||
| # if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) | ||
| # include <shadow.h> | ||
| # endif | ||
|
|
||
| # if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW) | ||
| # include <sys/label.h> | ||
| # include <sys/audit.h> | ||
| # include <pwdadj.h> | ||
| # endif | ||
|
|
||
| # if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) | ||
| # include "md5crypt.h" | ||
| # endif | ||
|
|
||
| # ifdef HAVE_CYGWIN | ||
| # undef ERROR | ||
| # include <windows.h> | ||
| # include <sys/cygwin.h> | ||
| # define is_winnt (GetVersion() < 0x80000000) | ||
| # endif | ||
|
|
||
| char * | ||
| xcrypt(const char *password, const char *salt) | ||
| { | ||
| char *crypted; | ||
|
|
||
| # ifdef HAVE_MD5_PASSWORDS | ||
| if (is_md5_salt(salt)) | ||
| crypted = md5_crypt(password, salt); | ||
| else | ||
| crypted = crypt(password, salt); | ||
| # elsif defined(__hpux) && !defined(HAVE_SECUREWARE) | ||
| if (iscomsec()) | ||
| crypted = bigcrypt(password, salt); | ||
| else | ||
| crypted = crypt(password, salt); | ||
| # elsif defined(HAVE_SECUREWARE) | ||
| crypted = bigcrypt(password, salt); | ||
| # else | ||
| crypted = crypt(password, salt); | ||
| # endif | ||
|
|
||
| return crypted; | ||
| } | ||
|
|
||
| /* | ||
| * Handle shadowed password systems in a cleaner way for portable | ||
| * version. | ||
| */ | ||
|
|
||
| char * | ||
| shadow_pw(struct passwd *pw) | ||
| { | ||
| char *pw_password = pw->pw_passwd; | ||
|
|
||
| # if defined(HAVE_SHADOW_H) && !defined(DISABLED_SHADOW) | ||
| struct spwd *spw = getspnam(pw->pw_name); | ||
|
|
||
| if (spw != NULL) | ||
| pw_password = spw->sp_pwdp; | ||
| # endif | ||
| # if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW) | ||
| struct passwd_adjunct *spw; | ||
| if (issecure() && (spw = getpwanam(pw->pw_name)) != NULL) | ||
| pw_password = spw->pwa_passwd; | ||
| # elsif defined(HAVE_SECUREWARE) | ||
| struct pr_passwd *spw = getprpwnam(pw->pw_name); | ||
|
|
||
| if (spw != NULL) | ||
| pw_password = spw->ufld.fd_encrypt; | ||
| # elsif defined(__hpux) && !defined(HAVE_SECUREWARE) | ||
| struct pr_passwd *spw; | ||
| if (iscomsec() && (spw = getprpwnam(pw->pw_name)) != NULL) | ||
| pw_password = spw->ufld.fd_encrypt; | ||
| # endif | ||
|
|
||
| return pw_password; | ||
| } | ||
|
|
||
| #endif /* !defined(HAVE_OSF_SIA) */ |
Oops, something went wrong.