RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/10/07 10:29:52 

[authfile.c]
     grammer; Matthew_Clarke@mindlink.bc.ca
This commit is contained in:
Damien Miller 2001-10-10 15:03:36 +10:00
parent 59d9fb9e55
commit 058655cced
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -18,6 +18,9 @@
- markus@cvs.openbsd.org 2001/10/06 11:18:19 - markus@cvs.openbsd.org 2001/10/06 11:18:19
[sshconnect1.c sshconnect2.c sshconnect.c] [sshconnect1.c sshconnect2.c sshconnect.c]
unify hostkey check error messages, simplify prompt. unify hostkey check error messages, simplify prompt.
- markus@cvs.openbsd.org 2001/10/07 10:29:52
[authfile.c]
grammer; Matthew_Clarke@mindlink.bc.ca
20011007 20011007
- (bal) ssh-copy-id corrected permissions for .ssh/ and authorized_keys. - (bal) ssh-copy-id corrected permissions for .ssh/ and authorized_keys.
@ -6663,4 +6666,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1590 2001/10/10 05:03:11 djm Exp $ $Id: ChangeLog,v 1.1591 2001/10/10 05:03:36 djm Exp $

10
authfile.c
View File

@ -36,7 +36,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: authfile.c,v 1.38 2001/09/23 11:09:13 markus Exp $"); RCSID("$OpenBSD: authfile.c,v 1.39 2001/10/07 10:29:52 markus Exp $");
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/evp.h> #include <openssl/evp.h>
@ -250,7 +250,7 @@ key_load_public_rsa1(int fd, const char *filename, char **commentp)
/* Check that it is at least big enough to contain the ID string. */ /* Check that it is at least big enough to contain the ID string. */
if (len < sizeof(authfile_id_string)) { if (len < sizeof(authfile_id_string)) {
debug3("No RSA1 key file %.200s.", filename); debug3("Not a RSA1 key file %.200s.", filename);
buffer_free(&buffer); buffer_free(&buffer);
return NULL; return NULL;
} }
@ -260,7 +260,7 @@ key_load_public_rsa1(int fd, const char *filename, char **commentp)
*/ */
for (i = 0; i < sizeof(authfile_id_string); i++) for (i = 0; i < sizeof(authfile_id_string); i++)
if (buffer_get_char(&buffer) != authfile_id_string[i]) { if (buffer_get_char(&buffer) != authfile_id_string[i]) {
debug3("No RSA1 key file %.200s.", filename); debug3("Not a RSA1 key file %.200s.", filename);
buffer_free(&buffer); buffer_free(&buffer);
return NULL; return NULL;
} }
@ -336,7 +336,7 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase,
/* Check that it is at least big enough to contain the ID string. */ /* Check that it is at least big enough to contain the ID string. */
if (len < sizeof(authfile_id_string)) { if (len < sizeof(authfile_id_string)) {
debug3("No RSA1 key file %.200s.", filename); debug3("Not a RSA1 key file %.200s.", filename);
buffer_free(&buffer); buffer_free(&buffer);
close(fd); close(fd);
return NULL; return NULL;
@ -347,7 +347,7 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase,
*/ */
for (i = 0; i < sizeof(authfile_id_string); i++) for (i = 0; i < sizeof(authfile_id_string); i++)
if (buffer_get_char(&buffer) != authfile_id_string[i]) { if (buffer_get_char(&buffer) != authfile_id_string[i]) {
debug3("No RSA1 key file %.200s.", filename); debug3("Not a RSA1 key file %.200s.", filename);
buffer_free(&buffer); buffer_free(&buffer);
close(fd); close(fd);
return NULL; return NULL;