diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2003-07-24 06:52:13 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2003-07-24 06:52:13 +0000 |
commit | 0410e32f47c0dcfc3385a1db2ee44f8bb35c10c4 (patch) | |
tree | 5050f4c269f589b71cf440fe69aab4d00b269703 /openbsd-compat/xcrypt.c | |
parent | acb98497fb7ff75362491d1c17a5e01fe2beb5b8 (diff) |
- (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.
Diffstat (limited to 'openbsd-compat/xcrypt.c')
-rw-r--r-- | openbsd-compat/xcrypt.c | 123 |
1 files changed, 123 insertions, 0 deletions
diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c new file mode 100644 index 000000000..167a23513 --- /dev/null +++ b/openbsd-compat/xcrypt.c | |||
@@ -0,0 +1,123 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2003 Ben Lindstrom. All rights reserved. | ||
3 | * | ||
4 | * Redistribution and use in source and binary forms, with or without | ||
5 | * modification, are permitted provided that the following conditions | ||
6 | * are met: | ||
7 | * 1. Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * 2. Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * | ||
13 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
14 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
15 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
16 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
17 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
18 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
19 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
20 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
21 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
23 | */ | ||
24 | |||
25 | #include "includes.h" | ||
26 | |||
27 | #if !defined(HAVE_OSF_SIA) | ||
28 | |||
29 | # ifdef HAVE_CRYPT_H | ||
30 | # include <crypt.h> | ||
31 | # endif | ||
32 | |||
33 | # ifdef __hpux | ||
34 | # include <hpsecurity.h> | ||
35 | # include <prot.h> | ||
36 | # endif | ||
37 | |||
38 | # ifdef HAVE_SECUREWARE | ||
39 | # include <sys/security.h> | ||
40 | # include <sys/audit.h> | ||
41 | # include <prot.h> | ||
42 | # endif | ||
43 | |||
44 | # if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) | ||
45 | # include <shadow.h> | ||
46 | # endif | ||
47 | |||
48 | # if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW) | ||
49 | # include <sys/label.h> | ||
50 | # include <sys/audit.h> | ||
51 | # include <pwdadj.h> | ||
52 | # endif | ||
53 | |||
54 | # if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) | ||
55 | # include "md5crypt.h" | ||
56 | # endif | ||
57 | |||
58 | # ifdef HAVE_CYGWIN | ||
59 | # undef ERROR | ||
60 | # include <windows.h> | ||
61 | # include <sys/cygwin.h> | ||
62 | # define is_winnt (GetVersion() < 0x80000000) | ||
63 | # endif | ||
64 | |||
65 | char * | ||
66 | xcrypt(const char *password, const char *salt) | ||
67 | { | ||
68 | char *crypted; | ||
69 | |||
70 | # ifdef HAVE_MD5_PASSWORDS | ||
71 | if (is_md5_salt(salt)) | ||
72 | crypted = md5_crypt(password, salt); | ||
73 | else | ||
74 | crypted = crypt(password, salt); | ||
75 | # elsif defined(__hpux) && !defined(HAVE_SECUREWARE) | ||
76 | if (iscomsec()) | ||
77 | crypted = bigcrypt(password, salt); | ||
78 | else | ||
79 | crypted = crypt(password, salt); | ||
80 | # elsif defined(HAVE_SECUREWARE) | ||
81 | crypted = bigcrypt(password, salt); | ||
82 | # else | ||
83 | crypted = crypt(password, salt); | ||
84 | # endif | ||
85 | |||
86 | return crypted; | ||
87 | } | ||
88 | |||
89 | /* | ||
90 | * Handle shadowed password systems in a cleaner way for portable | ||
91 | * version. | ||
92 | */ | ||
93 | |||
94 | char * | ||
95 | shadow_pw(struct passwd *pw) | ||
96 | { | ||
97 | char *pw_password = pw->pw_passwd; | ||
98 | |||
99 | # if defined(HAVE_SHADOW_H) && !defined(DISABLED_SHADOW) | ||
100 | struct spwd *spw = getspnam(pw->pw_name); | ||
101 | |||
102 | if (spw != NULL) | ||
103 | pw_password = spw->sp_pwdp; | ||
104 | # endif | ||
105 | # if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW) | ||
106 | struct passwd_adjunct *spw; | ||
107 | if (issecure() && (spw = getpwanam(pw->pw_name)) != NULL) | ||
108 | pw_password = spw->pwa_passwd; | ||
109 | # elsif defined(HAVE_SECUREWARE) | ||
110 | struct pr_passwd *spw = getprpwnam(pw->pw_name); | ||
111 | |||
112 | if (spw != NULL) | ||
113 | pw_password = spw->ufld.fd_encrypt; | ||
114 | # elsif defined(__hpux) && !defined(HAVE_SECUREWARE) | ||
115 | struct pr_passwd *spw; | ||
116 | if (iscomsec() && (spw = getprpwnam(pw->pw_name)) != NULL) | ||
117 | pw_password = spw->ufld.fd_encrypt; | ||
118 | # endif | ||
119 | |||
120 | return pw_password; | ||
121 | } | ||
122 | |||
123 | #endif /* !defined(HAVE_OSF_SIA) */ | ||