diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | acss.c | 128 | ||||
-rw-r--r-- | auth-pam.c | 8 | ||||
-rw-r--r-- | auth-shadow.c | 4 | ||||
-rw-r--r-- | auth-skey.c | 2 | ||||
-rw-r--r-- | auth1.c | 4 | ||||
-rw-r--r-- | canohost.c | 2 | ||||
-rw-r--r-- | cipher-acss.c | 6 | ||||
-rw-r--r-- | loginrec.c | 34 | ||||
-rw-r--r-- | ssh-rand-helper.c | 4 | ||||
-rw-r--r-- | sshd.c | 2 |
11 files changed, 101 insertions, 98 deletions
@@ -4,6 +4,9 @@ | |||
4 | [auth1.c channels.c cipher.c clientloop.c kex.c session.c ssh.c] | 4 | [auth1.c channels.c cipher.c clientloop.c kex.c session.c ssh.c] |
5 | [sshconnect.c] | 5 | [sshconnect.c] |
6 | spacing | 6 | spacing |
7 | - (djm) [acss.c auth-pam.c auth-shadow.c auth-skey.c auth1.c canohost.c] | ||
8 | [cipher-acss.c loginrec.c ssh-rand-helper.c sshd.c] Fix whitespace at EOL | ||
9 | in portable too ("perl -p -i -e 's/\s+$/\n/' *.[ch]") | ||
7 | 10 | ||
8 | 20050716 | 11 | 20050716 |
9 | - (dtucker) [auth-pam.c] Ensure that only one side of the authentication | 12 | - (dtucker) [auth-pam.c] Ensure that only one side of the authentication |
@@ -2837,4 +2840,4 @@ | |||
2837 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2840 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2838 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2841 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2839 | 2842 | ||
2840 | $Id: ChangeLog,v 1.3847 2005/07/17 07:02:09 djm Exp $ | 2843 | $Id: ChangeLog,v 1.3848 2005/07/17 07:04:47 djm Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acss.c,v 1.2 2004/02/06 04:22:43 dtucker Exp $ */ | 1 | /* $Id: acss.c,v 1.3 2005/07/17 07:04:47 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2004 The OpenBSD project | 3 | * Copyright (c) 2004 The OpenBSD project |
4 | * | 4 | * |
@@ -24,37 +24,37 @@ | |||
24 | 24 | ||
25 | /* decryption sbox */ | 25 | /* decryption sbox */ |
26 | static unsigned char sboxdec[] = { | 26 | static unsigned char sboxdec[] = { |
27 | 0x33, 0x73, 0x3b, 0x26, 0x63, 0x23, 0x6b, 0x76, | 27 | 0x33, 0x73, 0x3b, 0x26, 0x63, 0x23, 0x6b, 0x76, |
28 | 0x3e, 0x7e, 0x36, 0x2b, 0x6e, 0x2e, 0x66, 0x7b, | 28 | 0x3e, 0x7e, 0x36, 0x2b, 0x6e, 0x2e, 0x66, 0x7b, |
29 | 0xd3, 0x93, 0xdb, 0x06, 0x43, 0x03, 0x4b, 0x96, | 29 | 0xd3, 0x93, 0xdb, 0x06, 0x43, 0x03, 0x4b, 0x96, |
30 | 0xde, 0x9e, 0xd6, 0x0b, 0x4e, 0x0e, 0x46, 0x9b, | 30 | 0xde, 0x9e, 0xd6, 0x0b, 0x4e, 0x0e, 0x46, 0x9b, |
31 | 0x57, 0x17, 0x5f, 0x82, 0xc7, 0x87, 0xcf, 0x12, | 31 | 0x57, 0x17, 0x5f, 0x82, 0xc7, 0x87, 0xcf, 0x12, |
32 | 0x5a, 0x1a, 0x52, 0x8f, 0xca, 0x8a, 0xc2, 0x1f, | 32 | 0x5a, 0x1a, 0x52, 0x8f, 0xca, 0x8a, 0xc2, 0x1f, |
33 | 0xd9, 0x99, 0xd1, 0x00, 0x49, 0x09, 0x41, 0x90, | 33 | 0xd9, 0x99, 0xd1, 0x00, 0x49, 0x09, 0x41, 0x90, |
34 | 0xd8, 0x98, 0xd0, 0x01, 0x48, 0x08, 0x40, 0x91, | 34 | 0xd8, 0x98, 0xd0, 0x01, 0x48, 0x08, 0x40, 0x91, |
35 | 0x3d, 0x7d, 0x35, 0x24, 0x6d, 0x2d, 0x65, 0x74, | 35 | 0x3d, 0x7d, 0x35, 0x24, 0x6d, 0x2d, 0x65, 0x74, |
36 | 0x3c, 0x7c, 0x34, 0x25, 0x6c, 0x2c, 0x64, 0x75, | 36 | 0x3c, 0x7c, 0x34, 0x25, 0x6c, 0x2c, 0x64, 0x75, |
37 | 0xdd, 0x9d, 0xd5, 0x04, 0x4d, 0x0d, 0x45, 0x94, | 37 | 0xdd, 0x9d, 0xd5, 0x04, 0x4d, 0x0d, 0x45, 0x94, |
38 | 0xdc, 0x9c, 0xd4, 0x05, 0x4c, 0x0c, 0x44, 0x95, | 38 | 0xdc, 0x9c, 0xd4, 0x05, 0x4c, 0x0c, 0x44, 0x95, |
39 | 0x59, 0x19, 0x51, 0x80, 0xc9, 0x89, 0xc1, 0x10, | 39 | 0x59, 0x19, 0x51, 0x80, 0xc9, 0x89, 0xc1, 0x10, |
40 | 0x58, 0x18, 0x50, 0x81, 0xc8, 0x88, 0xc0, 0x11, | 40 | 0x58, 0x18, 0x50, 0x81, 0xc8, 0x88, 0xc0, 0x11, |
41 | 0xd7, 0x97, 0xdf, 0x02, 0x47, 0x07, 0x4f, 0x92, | 41 | 0xd7, 0x97, 0xdf, 0x02, 0x47, 0x07, 0x4f, 0x92, |
42 | 0xda, 0x9a, 0xd2, 0x0f, 0x4a, 0x0a, 0x42, 0x9f, | 42 | 0xda, 0x9a, 0xd2, 0x0f, 0x4a, 0x0a, 0x42, 0x9f, |
43 | 0x53, 0x13, 0x5b, 0x86, 0xc3, 0x83, 0xcb, 0x16, | 43 | 0x53, 0x13, 0x5b, 0x86, 0xc3, 0x83, 0xcb, 0x16, |
44 | 0x5e, 0x1e, 0x56, 0x8b, 0xce, 0x8e, 0xc6, 0x1b, | 44 | 0x5e, 0x1e, 0x56, 0x8b, 0xce, 0x8e, 0xc6, 0x1b, |
45 | 0xb3, 0xf3, 0xbb, 0xa6, 0xe3, 0xa3, 0xeb, 0xf6, | 45 | 0xb3, 0xf3, 0xbb, 0xa6, 0xe3, 0xa3, 0xeb, 0xf6, |
46 | 0xbe, 0xfe, 0xb6, 0xab, 0xee, 0xae, 0xe6, 0xfb, | 46 | 0xbe, 0xfe, 0xb6, 0xab, 0xee, 0xae, 0xe6, 0xfb, |
47 | 0x37, 0x77, 0x3f, 0x22, 0x67, 0x27, 0x6f, 0x72, | 47 | 0x37, 0x77, 0x3f, 0x22, 0x67, 0x27, 0x6f, 0x72, |
48 | 0x3a, 0x7a, 0x32, 0x2f, 0x6a, 0x2a, 0x62, 0x7f, | 48 | 0x3a, 0x7a, 0x32, 0x2f, 0x6a, 0x2a, 0x62, 0x7f, |
49 | 0xb9, 0xf9, 0xb1, 0xa0, 0xe9, 0xa9, 0xe1, 0xf0, | 49 | 0xb9, 0xf9, 0xb1, 0xa0, 0xe9, 0xa9, 0xe1, 0xf0, |
50 | 0xb8, 0xf8, 0xb0, 0xa1, 0xe8, 0xa8, 0xe0, 0xf1, | 50 | 0xb8, 0xf8, 0xb0, 0xa1, 0xe8, 0xa8, 0xe0, 0xf1, |
51 | 0x5d, 0x1d, 0x55, 0x84, 0xcd, 0x8d, 0xc5, 0x14, | 51 | 0x5d, 0x1d, 0x55, 0x84, 0xcd, 0x8d, 0xc5, 0x14, |
52 | 0x5c, 0x1c, 0x54, 0x85, 0xcc, 0x8c, 0xc4, 0x15, | 52 | 0x5c, 0x1c, 0x54, 0x85, 0xcc, 0x8c, 0xc4, 0x15, |
53 | 0xbd, 0xfd, 0xb5, 0xa4, 0xed, 0xad, 0xe5, 0xf4, | 53 | 0xbd, 0xfd, 0xb5, 0xa4, 0xed, 0xad, 0xe5, 0xf4, |
54 | 0xbc, 0xfc, 0xb4, 0xa5, 0xec, 0xac, 0xe4, 0xf5, | 54 | 0xbc, 0xfc, 0xb4, 0xa5, 0xec, 0xac, 0xe4, 0xf5, |
55 | 0x39, 0x79, 0x31, 0x20, 0x69, 0x29, 0x61, 0x70, | 55 | 0x39, 0x79, 0x31, 0x20, 0x69, 0x29, 0x61, 0x70, |
56 | 0x38, 0x78, 0x30, 0x21, 0x68, 0x28, 0x60, 0x71, | 56 | 0x38, 0x78, 0x30, 0x21, 0x68, 0x28, 0x60, 0x71, |
57 | 0xb7, 0xf7, 0xbf, 0xa2, 0xe7, 0xa7, 0xef, 0xf2, | 57 | 0xb7, 0xf7, 0xbf, 0xa2, 0xe7, 0xa7, 0xef, 0xf2, |
58 | 0xba, 0xfa, 0xb2, 0xaf, 0xea, 0xaa, 0xe2, 0xff | 58 | 0xba, 0xfa, 0xb2, 0xaf, 0xea, 0xaa, 0xe2, 0xff |
59 | }; | 59 | }; |
60 | 60 | ||
@@ -95,38 +95,38 @@ static unsigned char sboxenc[] = { | |||
95 | }; | 95 | }; |
96 | 96 | ||
97 | static unsigned char reverse[] = { | 97 | static unsigned char reverse[] = { |
98 | 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, | 98 | 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, |
99 | 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, | 99 | 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, |
100 | 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, | 100 | 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, |
101 | 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, | 101 | 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, |
102 | 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, | 102 | 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, |
103 | 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, | 103 | 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, |
104 | 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, | 104 | 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, |
105 | 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, | 105 | 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, |
106 | 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, | 106 | 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, |
107 | 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2, | 107 | 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2, |
108 | 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, | 108 | 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, |
109 | 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa, | 109 | 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa, |
110 | 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, | 110 | 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, |
111 | 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6, | 111 | 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6, |
112 | 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, | 112 | 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, |
113 | 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, | 113 | 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, |
114 | 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, | 114 | 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, |
115 | 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1, | 115 | 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1, |
116 | 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, | 116 | 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, |
117 | 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9, | 117 | 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9, |
118 | 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, | 118 | 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, |
119 | 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5, | 119 | 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5, |
120 | 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, | 120 | 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, |
121 | 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd, | 121 | 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd, |
122 | 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3, | 122 | 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3, |
123 | 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, | 123 | 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, |
124 | 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, | 124 | 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, |
125 | 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb, | 125 | 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb, |
126 | 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, | 126 | 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, |
127 | 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, | 127 | 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, |
128 | 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, | 128 | 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, |
129 | 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff | 129 | 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff |
130 | }; | 130 | }; |
131 | 131 | ||
132 | /* | 132 | /* |
diff --git a/auth-pam.c b/auth-pam.c index fecba5de0..4a2841924 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -47,7 +47,7 @@ | |||
47 | 47 | ||
48 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ | 48 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ |
49 | #include "includes.h" | 49 | #include "includes.h" |
50 | RCSID("$Id: auth-pam.c,v 1.124 2005/07/16 01:33:06 dtucker Exp $"); | 50 | RCSID("$Id: auth-pam.c,v 1.125 2005/07/17 07:04:47 djm Exp $"); |
51 | 51 | ||
52 | #ifdef USE_PAM | 52 | #ifdef USE_PAM |
53 | #if defined(HAVE_SECURITY_PAM_APPL_H) | 53 | #if defined(HAVE_SECURITY_PAM_APPL_H) |
@@ -123,7 +123,7 @@ static struct pam_ctxt *cleanup_ctxt; | |||
123 | static int sshpam_thread_status = -1; | 123 | static int sshpam_thread_status = -1; |
124 | static mysig_t sshpam_oldsig; | 124 | static mysig_t sshpam_oldsig; |
125 | 125 | ||
126 | static void | 126 | static void |
127 | sshpam_sigchld_handler(int sig) | 127 | sshpam_sigchld_handler(int sig) |
128 | { | 128 | { |
129 | signal(SIGCHLD, SIG_DFL); | 129 | signal(SIGCHLD, SIG_DFL); |
@@ -853,7 +853,7 @@ do_pam_account(void) | |||
853 | sshpam_err = pam_acct_mgmt(sshpam_handle, 0); | 853 | sshpam_err = pam_acct_mgmt(sshpam_handle, 0); |
854 | debug3("PAM: %s pam_acct_mgmt = %d (%s)", __func__, sshpam_err, | 854 | debug3("PAM: %s pam_acct_mgmt = %d (%s)", __func__, sshpam_err, |
855 | pam_strerror(sshpam_handle, sshpam_err)); | 855 | pam_strerror(sshpam_handle, sshpam_err)); |
856 | 856 | ||
857 | if (sshpam_err != PAM_SUCCESS && sshpam_err != PAM_NEW_AUTHTOK_REQD) { | 857 | if (sshpam_err != PAM_SUCCESS && sshpam_err != PAM_NEW_AUTHTOK_REQD) { |
858 | sshpam_account_status = 0; | 858 | sshpam_account_status = 0; |
859 | return (sshpam_account_status); | 859 | return (sshpam_account_status); |
@@ -1111,7 +1111,7 @@ sshpam_passwd_conv(int n, sshpam_const struct pam_message **msg, | |||
1111 | *resp = reply; | 1111 | *resp = reply; |
1112 | return (PAM_SUCCESS); | 1112 | return (PAM_SUCCESS); |
1113 | 1113 | ||
1114 | fail: | 1114 | fail: |
1115 | for(i = 0; i < n; i++) { | 1115 | for(i = 0; i < n; i++) { |
1116 | if (reply[i].resp != NULL) | 1116 | if (reply[i].resp != NULL) |
1117 | xfree(reply[i].resp); | 1117 | xfree(reply[i].resp); |
diff --git a/auth-shadow.c b/auth-shadow.c index f6004f68f..59737b93c 100644 --- a/auth-shadow.c +++ b/auth-shadow.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$Id: auth-shadow.c,v 1.6 2005/02/16 03:20:06 dtucker Exp $"); | 26 | RCSID("$Id: auth-shadow.c,v 1.7 2005/07/17 07:04:47 djm Exp $"); |
27 | 27 | ||
28 | #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE) | 28 | #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE) |
29 | #include <shadow.h> | 29 | #include <shadow.h> |
@@ -101,7 +101,7 @@ auth_shadow_pwexpired(Authctxt *ctxt) | |||
101 | #if defined(__hpux) && !defined(HAVE_SECUREWARE) | 101 | #if defined(__hpux) && !defined(HAVE_SECUREWARE) |
102 | if (iscomsec()) { | 102 | if (iscomsec()) { |
103 | struct pr_passwd *pr; | 103 | struct pr_passwd *pr; |
104 | 104 | ||
105 | pr = getprpwnam((char *)user); | 105 | pr = getprpwnam((char *)user); |
106 | 106 | ||
107 | /* Test for Trusted Mode expiry disabled */ | 107 | /* Test for Trusted Mode expiry disabled */ |
diff --git a/auth-skey.c b/auth-skey.c index ac1af69ed..f676dbec9 100644 --- a/auth-skey.c +++ b/auth-skey.c | |||
@@ -47,7 +47,7 @@ skey_query(void *ctx, char **name, char **infotxt, | |||
47 | int len; | 47 | int len; |
48 | struct skey skey; | 48 | struct skey skey; |
49 | 49 | ||
50 | if (_compat_skeychallenge(&skey, authctxt->user, challenge, | 50 | if (_compat_skeychallenge(&skey, authctxt->user, challenge, |
51 | sizeof(challenge)) == -1) | 51 | sizeof(challenge)) == -1) |
52 | return -1; | 52 | return -1; |
53 | 53 | ||
@@ -171,7 +171,7 @@ auth1_process_rhosts_rsa(Authctxt *authctxt, char *info, size_t infolen) | |||
171 | key_free(client_host_key); | 171 | key_free(client_host_key); |
172 | 172 | ||
173 | snprintf(info, infolen, " ruser %.100s", client_user); | 173 | snprintf(info, infolen, " ruser %.100s", client_user); |
174 | 174 | ||
175 | return (authenticated); | 175 | return (authenticated); |
176 | } | 176 | } |
177 | 177 | ||
@@ -299,7 +299,7 @@ do_authloop(Authctxt *authctxt) | |||
299 | 299 | ||
300 | #ifdef HAVE_CYGWIN | 300 | #ifdef HAVE_CYGWIN |
301 | if (authenticated && | 301 | if (authenticated && |
302 | !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD, | 302 | !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD, |
303 | authctxt->pw)) { | 303 | authctxt->pw)) { |
304 | packet_disconnect("Authentication rejected for uid %d.", | 304 | packet_disconnect("Authentication rejected for uid %d.", |
305 | authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid); | 305 | authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid); |
diff --git a/canohost.c b/canohost.c index 04dc3d182..c27086bfd 100644 --- a/canohost.c +++ b/canohost.c | |||
@@ -174,7 +174,7 @@ ipv64_normalise_mapped(struct sockaddr_storage *addr, socklen_t *len) | |||
174 | struct in_addr inaddr; | 174 | struct in_addr inaddr; |
175 | u_int16_t port; | 175 | u_int16_t port; |
176 | 176 | ||
177 | if (addr->ss_family != AF_INET6 || | 177 | if (addr->ss_family != AF_INET6 || |
178 | !IN6_IS_ADDR_V4MAPPED(&a6->sin6_addr)) | 178 | !IN6_IS_ADDR_V4MAPPED(&a6->sin6_addr)) |
179 | return; | 179 | return; |
180 | 180 | ||
diff --git a/cipher-acss.c b/cipher-acss.c index 3a966a74d..a95fa6747 100644 --- a/cipher-acss.c +++ b/cipher-acss.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | #include <openssl/evp.h> | 18 | #include <openssl/evp.h> |
19 | 19 | ||
20 | RCSID("$Id: cipher-acss.c,v 1.2 2004/02/06 04:26:11 dtucker Exp $"); | 20 | RCSID("$Id: cipher-acss.c,v 1.3 2005/07/17 07:04:47 djm Exp $"); |
21 | 21 | ||
22 | #if !defined(EVP_CTRL_SET_ACSS_MODE) && (OPENSSL_VERSION_NUMBER >= 0x00907000L) | 22 | #if !defined(EVP_CTRL_SET_ACSS_MODE) && (OPENSSL_VERSION_NUMBER >= 0x00907000L) |
23 | 23 | ||
@@ -33,7 +33,7 @@ typedef struct { | |||
33 | #define EVP_CTRL_SET_ACSS_SUBKEY 0xff07 | 33 | #define EVP_CTRL_SET_ACSS_SUBKEY 0xff07 |
34 | 34 | ||
35 | static int | 35 | static int |
36 | acss_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | 36 | acss_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, |
37 | const unsigned char *iv, int enc) | 37 | const unsigned char *iv, int enc) |
38 | { | 38 | { |
39 | acss_setkey(&data(ctx)->ks,key,enc,ACSS_DATA); | 39 | acss_setkey(&data(ctx)->ks,key,enc,ACSS_DATA); |
@@ -41,7 +41,7 @@ acss_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | |||
41 | } | 41 | } |
42 | 42 | ||
43 | static int | 43 | static int |
44 | acss_ciph(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, | 44 | acss_ciph(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, |
45 | unsigned int inl) | 45 | unsigned int inl) |
46 | { | 46 | { |
47 | acss(&data(ctx)->ks,inl,in,out); | 47 | acss(&data(ctx)->ks,inl,in,out); |
diff --git a/loginrec.c b/loginrec.c index 2543617ba..5d6e120c4 100644 --- a/loginrec.c +++ b/loginrec.c | |||
@@ -165,7 +165,7 @@ | |||
165 | # include <libutil.h> | 165 | # include <libutil.h> |
166 | #endif | 166 | #endif |
167 | 167 | ||
168 | RCSID("$Id: loginrec.c,v 1.68 2005/06/19 00:19:43 djm Exp $"); | 168 | RCSID("$Id: loginrec.c,v 1.69 2005/07/17 07:04:47 djm Exp $"); |
169 | 169 | ||
170 | /** | 170 | /** |
171 | ** prototypes for helper functions in this file | 171 | ** prototypes for helper functions in this file |
@@ -362,7 +362,7 @@ login_init_entry(struct logininfo *li, int pid, const char *username, | |||
362 | strlcpy(li->username, username, sizeof(li->username)); | 362 | strlcpy(li->username, username, sizeof(li->username)); |
363 | pw = getpwnam(li->username); | 363 | pw = getpwnam(li->username); |
364 | if (pw == NULL) { | 364 | if (pw == NULL) { |
365 | fatal("%s: Cannot find user \"%s\"", __func__, | 365 | fatal("%s: Cannot find user \"%s\"", __func__, |
366 | li->username); | 366 | li->username); |
367 | } | 367 | } |
368 | li->uid = pw->pw_uid; | 368 | li->uid = pw->pw_uid; |
@@ -374,7 +374,7 @@ login_init_entry(struct logininfo *li, int pid, const char *username, | |||
374 | return (1); | 374 | return (1); |
375 | } | 375 | } |
376 | 376 | ||
377 | /* | 377 | /* |
378 | * login_set_current_time(struct logininfo *) - set the current time | 378 | * login_set_current_time(struct logininfo *) - set the current time |
379 | * | 379 | * |
380 | * Set the current time in a logininfo structure. This function is | 380 | * Set the current time in a logininfo structure. This function is |
@@ -443,7 +443,7 @@ login_write(struct logininfo *li) | |||
443 | wtmpx_write_entry(li); | 443 | wtmpx_write_entry(li); |
444 | #endif | 444 | #endif |
445 | #ifdef CUSTOM_SYS_AUTH_RECORD_LOGIN | 445 | #ifdef CUSTOM_SYS_AUTH_RECORD_LOGIN |
446 | if (li->type == LTYPE_LOGIN && | 446 | if (li->type == LTYPE_LOGIN && |
447 | !sys_auth_record_login(li->username,li->hostname,li->line, &loginmsg)) | 447 | !sys_auth_record_login(li->username,li->hostname,li->line, &loginmsg)) |
448 | logit("Writing login record failed for %s", li->username); | 448 | logit("Writing login record failed for %s", li->username); |
449 | #endif | 449 | #endif |
@@ -558,7 +558,7 @@ line_stripname(char *dst, const char *src, int dstsize) | |||
558 | return (dst); | 558 | return (dst); |
559 | } | 559 | } |
560 | 560 | ||
561 | /* | 561 | /* |
562 | * line_abbrevname(): Return the abbreviated (usually four-character) | 562 | * line_abbrevname(): Return the abbreviated (usually four-character) |
563 | * form of the line (Just use the last <dstsize> characters of the | 563 | * form of the line (Just use the last <dstsize> characters of the |
564 | * full name.) | 564 | * full name.) |
@@ -808,7 +808,7 @@ utmp_write_library(struct logininfo *li, struct utmp *ut) | |||
808 | } | 808 | } |
809 | # else /* UTMP_USE_LIBRARY */ | 809 | # else /* UTMP_USE_LIBRARY */ |
810 | 810 | ||
811 | /* | 811 | /* |
812 | * Write a utmp entry direct to the file | 812 | * Write a utmp entry direct to the file |
813 | * This is a slightly modification of code in OpenBSD's login.c | 813 | * This is a slightly modification of code in OpenBSD's login.c |
814 | */ | 814 | */ |
@@ -852,7 +852,7 @@ utmp_write_direct(struct logininfo *li, struct utmp *ut) | |||
852 | return (0); | 852 | return (0); |
853 | } | 853 | } |
854 | if (ret != pos) { | 854 | if (ret != pos) { |
855 | logit("%s: Couldn't seek to tty %d slot in %s", | 855 | logit("%s: Couldn't seek to tty %d slot in %s", |
856 | __func__, tty, UTMP_FILE); | 856 | __func__, tty, UTMP_FILE); |
857 | return (0); | 857 | return (0); |
858 | } | 858 | } |
@@ -1052,7 +1052,7 @@ utmpx_write_entry(struct logininfo *li) | |||
1052 | 1052 | ||
1053 | #ifdef USE_WTMP | 1053 | #ifdef USE_WTMP |
1054 | 1054 | ||
1055 | /* | 1055 | /* |
1056 | * Write a wtmp entry direct to the end of the file | 1056 | * Write a wtmp entry direct to the end of the file |
1057 | * This is a slight modification of code in OpenBSD's logwtmp.c | 1057 | * This is a slight modification of code in OpenBSD's logwtmp.c |
1058 | */ | 1058 | */ |
@@ -1113,7 +1113,7 @@ wtmp_write_entry(struct logininfo *li) | |||
1113 | } | 1113 | } |
1114 | 1114 | ||
1115 | 1115 | ||
1116 | /* | 1116 | /* |
1117 | * Notes on fetching login data from wtmp/wtmpx | 1117 | * Notes on fetching login data from wtmp/wtmpx |
1118 | * | 1118 | * |
1119 | * Logouts are usually recorded with (amongst other things) a blank | 1119 | * Logouts are usually recorded with (amongst other things) a blank |
@@ -1157,12 +1157,12 @@ wtmp_get_entry(struct logininfo *li) | |||
1157 | li->tv_sec = li->tv_usec = 0; | 1157 | li->tv_sec = li->tv_usec = 0; |
1158 | 1158 | ||
1159 | if ((fd = open(WTMP_FILE, O_RDONLY)) < 0) { | 1159 | if ((fd = open(WTMP_FILE, O_RDONLY)) < 0) { |
1160 | logit("%s: problem opening %s: %s", __func__, | 1160 | logit("%s: problem opening %s: %s", __func__, |
1161 | WTMP_FILE, strerror(errno)); | 1161 | WTMP_FILE, strerror(errno)); |
1162 | return (0); | 1162 | return (0); |
1163 | } | 1163 | } |
1164 | if (fstat(fd, &st) != 0) { | 1164 | if (fstat(fd, &st) != 0) { |
1165 | logit("%s: couldn't stat %s: %s", __func__, | 1165 | logit("%s: couldn't stat %s: %s", __func__, |
1166 | WTMP_FILE, strerror(errno)); | 1166 | WTMP_FILE, strerror(errno)); |
1167 | close(fd); | 1167 | close(fd); |
1168 | return (0); | 1168 | return (0); |
@@ -1177,7 +1177,7 @@ wtmp_get_entry(struct logininfo *li) | |||
1177 | 1177 | ||
1178 | while (!found) { | 1178 | while (!found) { |
1179 | if (atomicio(read, fd, &ut, sizeof(ut)) != sizeof(ut)) { | 1179 | if (atomicio(read, fd, &ut, sizeof(ut)) != sizeof(ut)) { |
1180 | logit("%s: read of %s failed: %s", __func__, | 1180 | logit("%s: read of %s failed: %s", __func__, |
1181 | WTMP_FILE, strerror(errno)); | 1181 | WTMP_FILE, strerror(errno)); |
1182 | close (fd); | 1182 | close (fd); |
1183 | return (0); | 1183 | return (0); |
@@ -1235,7 +1235,7 @@ wtmpx_write(struct logininfo *li, struct utmpx *utx) | |||
1235 | int fd, ret = 1; | 1235 | int fd, ret = 1; |
1236 | 1236 | ||
1237 | if ((fd = open(WTMPX_FILE, O_WRONLY|O_APPEND, 0)) < 0) { | 1237 | if ((fd = open(WTMPX_FILE, O_WRONLY|O_APPEND, 0)) < 0) { |
1238 | logit("%s: problem opening %s: %s", __func__, | 1238 | logit("%s: problem opening %s: %s", __func__, |
1239 | WTMPX_FILE, strerror(errno)); | 1239 | WTMPX_FILE, strerror(errno)); |
1240 | return (0); | 1240 | return (0); |
1241 | } | 1241 | } |
@@ -1322,12 +1322,12 @@ wtmpx_get_entry(struct logininfo *li) | |||
1322 | li->tv_sec = li->tv_usec = 0; | 1322 | li->tv_sec = li->tv_usec = 0; |
1323 | 1323 | ||
1324 | if ((fd = open(WTMPX_FILE, O_RDONLY)) < 0) { | 1324 | if ((fd = open(WTMPX_FILE, O_RDONLY)) < 0) { |
1325 | logit("%s: problem opening %s: %s", __func__, | 1325 | logit("%s: problem opening %s: %s", __func__, |
1326 | WTMPX_FILE, strerror(errno)); | 1326 | WTMPX_FILE, strerror(errno)); |
1327 | return (0); | 1327 | return (0); |
1328 | } | 1328 | } |
1329 | if (fstat(fd, &st) != 0) { | 1329 | if (fstat(fd, &st) != 0) { |
1330 | logit("%s: couldn't stat %s: %s", __func__, | 1330 | logit("%s: couldn't stat %s: %s", __func__, |
1331 | WTMPX_FILE, strerror(errno)); | 1331 | WTMPX_FILE, strerror(errno)); |
1332 | close(fd); | 1332 | close(fd); |
1333 | return (0); | 1333 | return (0); |
@@ -1342,13 +1342,13 @@ wtmpx_get_entry(struct logininfo *li) | |||
1342 | 1342 | ||
1343 | while (!found) { | 1343 | while (!found) { |
1344 | if (atomicio(read, fd, &utx, sizeof(utx)) != sizeof(utx)) { | 1344 | if (atomicio(read, fd, &utx, sizeof(utx)) != sizeof(utx)) { |
1345 | logit("%s: read of %s failed: %s", __func__, | 1345 | logit("%s: read of %s failed: %s", __func__, |
1346 | WTMPX_FILE, strerror(errno)); | 1346 | WTMPX_FILE, strerror(errno)); |
1347 | close (fd); | 1347 | close (fd); |
1348 | return (0); | 1348 | return (0); |
1349 | } | 1349 | } |
1350 | /* | 1350 | /* |
1351 | * Logouts are recorded as a blank username on a particular | 1351 | * Logouts are recorded as a blank username on a particular |
1352 | * line. So, we just need to find the username in struct utmpx | 1352 | * line. So, we just need to find the username in struct utmpx |
1353 | */ | 1353 | */ |
1354 | if (wtmpx_islogin(li, &utx)) { | 1354 | if (wtmpx_islogin(li, &utx)) { |
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c index aab51fdf7..5486a4632 100644 --- a/ssh-rand-helper.c +++ b/ssh-rand-helper.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include "pathnames.h" | 39 | #include "pathnames.h" |
40 | #include "log.h" | 40 | #include "log.h" |
41 | 41 | ||
42 | RCSID("$Id: ssh-rand-helper.c,v 1.24 2005/06/19 00:19:44 djm Exp $"); | 42 | RCSID("$Id: ssh-rand-helper.c,v 1.25 2005/07/17 07:04:47 djm Exp $"); |
43 | 43 | ||
44 | /* Number of bytes we write out */ | 44 | /* Number of bytes we write out */ |
45 | #define OUTPUT_SEED_SIZE 48 | 45 | #define OUTPUT_SEED_SIZE 48 |
@@ -600,7 +600,7 @@ prng_write_seedfile(void) | |||
600 | save_errno = errno; | 600 | save_errno = errno; |
601 | unlink(tmpseed); | 601 | unlink(tmpseed); |
602 | fatal("problem renaming PRNG seedfile from %.100s " | 602 | fatal("problem renaming PRNG seedfile from %.100s " |
603 | "to %.100s (%.100s)", tmpseed, filename, | 603 | "to %.100s (%.100s)", tmpseed, filename, |
604 | strerror(save_errno)); | 604 | strerror(save_errno)); |
605 | } | 605 | } |
606 | } | 606 | } |
@@ -1034,7 +1034,7 @@ main(int ac, char **av) | |||
1034 | /* | 1034 | /* |
1035 | * Unset KRB5CCNAME, otherwise the user's session may inherit it from | 1035 | * Unset KRB5CCNAME, otherwise the user's session may inherit it from |
1036 | * root's environment | 1036 | * root's environment |
1037 | */ | 1037 | */ |
1038 | if (getenv("KRB5CCNAME") != NULL) | 1038 | if (getenv("KRB5CCNAME") != NULL) |
1039 | unsetenv("KRB5CCNAME"); | 1039 | unsetenv("KRB5CCNAME"); |
1040 | 1040 | ||