diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-22 01:43:59 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-22 01:43:59 +0000 |
commit | 46c162204b5a6f7471525c2f75cb2c607c88b83f (patch) | |
tree | 9041b006ab612c18bdb16b606601839a00ca5b2c /authfile.c | |
parent | a074feb65d6f1fcad02e80b751e2287fd6230b09 (diff) |
One way to massive patch. <sigh> It compiles and works under Linux..
And I think I have all the bits right from the OpenBSD tree.
20001222
- Updated RCSID for pty.c
- (bal) OpenBSD CVS Updates:
- markus@cvs.openbsd.org 2000/12/21 15:10:16
[auth-rh-rsa.c hostfile.c hostfile.h sshconnect.c]
print keyfile:line for changed hostkeys, for deraadt@, ok deraadt@
- markus@cvs.openbsd.org 2000/12/20 19:26:56
[authfile.c]
allow ssh -i userkey for root
- markus@cvs.openbsd.org 2000/12/20 19:37:21
[authfd.c authfd.h kex.c sshconnect2.c sshd.c uidswap.c uidswap.h]
fix prototypes; from stevesk@pobox.com
- markus@cvs.openbsd.org 2000/12/20 19:32:08
[sshd.c]
init pointer to NULL; report from Jan.Ivan@cern.ch
- markus@cvs.openbsd.org 2000/12/19 23:17:54
[auth-krb4.c auth-options.c auth-options.h auth-rhosts.c auth-rsa.c
auth1.c auth2-skey.c auth2.c authfd.c authfd.h authfile.c bufaux.c
bufaux.h buffer.c canohost.c channels.c clientloop.c compress.c
crc32.c deattack.c getput.h hmac.c hmac.h hostfile.c kex.c kex.h
key.c key.h log.c login.c match.c match.h mpaux.c mpaux.h packet.c
packet.h radix.c readconf.c rsa.c scp.c servconf.c servconf.h
serverloop.c session.c sftp-server.c ssh-agent.c ssh-dss.c ssh-dss.h
ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh-rsa.h ssh.c ssh.h uuencode.c
uuencode.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c]
replace 'unsigned bla' with 'u_bla' everywhere. also replace 'char
unsigned' with u_char.
Diffstat (limited to 'authfile.c')
-rw-r--r-- | authfile.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/authfile.c b/authfile.c index 86dcdee28..7a1b74a7f 100644 --- a/authfile.c +++ b/authfile.c | |||
@@ -131,8 +131,8 @@ save_private_key_rsa1(const char *filename, const char *passphrase, | |||
131 | buffer_append_space(&encrypted, &cp, buffer_len(&buffer)); | 131 | buffer_append_space(&encrypted, &cp, buffer_len(&buffer)); |
132 | 132 | ||
133 | cipher_set_key_string(&ciphercontext, cipher, passphrase); | 133 | cipher_set_key_string(&ciphercontext, cipher, passphrase); |
134 | cipher_encrypt(&ciphercontext, (unsigned char *) cp, | 134 | cipher_encrypt(&ciphercontext, (u_char *) cp, |
135 | (unsigned char *) buffer_ptr(&buffer), buffer_len(&buffer)); | 135 | (u_char *) buffer_ptr(&buffer), buffer_len(&buffer)); |
136 | memset(&ciphercontext, 0, sizeof(ciphercontext)); | 136 | memset(&ciphercontext, 0, sizeof(ciphercontext)); |
137 | 137 | ||
138 | /* Destroy temporary data. */ | 138 | /* Destroy temporary data. */ |
@@ -258,7 +258,7 @@ load_public_key_rsa(const char *filename, RSA * pub, char **comment_return) | |||
258 | * Make sure it begins with the id string. Consume the id string | 258 | * Make sure it begins with the id string. Consume the id string |
259 | * from the buffer. | 259 | * from the buffer. |
260 | */ | 260 | */ |
261 | for (i = 0; i < (unsigned int) strlen(AUTHFILE_ID_STRING) + 1; i++) | 261 | for (i = 0; i < (u_int) strlen(AUTHFILE_ID_STRING) + 1; i++) |
262 | if (buffer_get_char(&buffer) != (u_char) AUTHFILE_ID_STRING[i]) { | 262 | if (buffer_get_char(&buffer) != (u_char) AUTHFILE_ID_STRING[i]) { |
263 | debug3("Bad RSA1 key file %.200s.", filename); | 263 | debug3("Bad RSA1 key file %.200s.", filename); |
264 | buffer_free(&buffer); | 264 | buffer_free(&buffer); |
@@ -348,7 +348,7 @@ load_private_key_rsa1(int fd, const char *filename, | |||
348 | * Make sure it begins with the id string. Consume the id string | 348 | * Make sure it begins with the id string. Consume the id string |
349 | * from the buffer. | 349 | * from the buffer. |
350 | */ | 350 | */ |
351 | for (i = 0; i < (unsigned int) strlen(AUTHFILE_ID_STRING) + 1; i++) | 351 | for (i = 0; i < (u_int) strlen(AUTHFILE_ID_STRING) + 1; i++) |
352 | if (buffer_get_char(&buffer) != (u_char) AUTHFILE_ID_STRING[i]) { | 352 | if (buffer_get_char(&buffer) != (u_char) AUTHFILE_ID_STRING[i]) { |
353 | debug3("Bad RSA1 key file %.200s.", filename); | 353 | debug3("Bad RSA1 key file %.200s.", filename); |
354 | buffer_free(&buffer); | 354 | buffer_free(&buffer); |
@@ -383,8 +383,8 @@ load_private_key_rsa1(int fd, const char *filename, | |||
383 | 383 | ||
384 | /* Rest of the buffer is encrypted. Decrypt it using the passphrase. */ | 384 | /* Rest of the buffer is encrypted. Decrypt it using the passphrase. */ |
385 | cipher_set_key_string(&ciphercontext, cipher, passphrase); | 385 | cipher_set_key_string(&ciphercontext, cipher, passphrase); |
386 | cipher_decrypt(&ciphercontext, (unsigned char *) cp, | 386 | cipher_decrypt(&ciphercontext, (u_char *) cp, |
387 | (unsigned char *) buffer_ptr(&buffer), buffer_len(&buffer)); | 387 | (u_char *) buffer_ptr(&buffer), buffer_len(&buffer)); |
388 | memset(&ciphercontext, 0, sizeof(ciphercontext)); | 388 | memset(&ciphercontext, 0, sizeof(ciphercontext)); |
389 | buffer_free(&buffer); | 389 | buffer_free(&buffer); |
390 | 390 | ||
@@ -508,7 +508,7 @@ load_private_key(const char *filename, const char *passphrase, Key *key, | |||
508 | if (check_ntsec(filename)) | 508 | if (check_ntsec(filename)) |
509 | #endif | 509 | #endif |
510 | if (fstat(fd, &st) < 0 || | 510 | if (fstat(fd, &st) < 0 || |
511 | (st.st_uid != 0 && st.st_uid != getuid()) || | 511 | (st.st_uid != 0 && getuid() != 0 && st.st_uid != getuid()) || |
512 | (st.st_mode & 077) != 0) { | 512 | (st.st_mode & 077) != 0) { |
513 | close(fd); | 513 | close(fd); |
514 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); | 514 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); |