tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/06/27 05:35:42

Browse Source 
[ssh-keygen.c]
     use cyberflex_inq_class to inquire class.
This commit is contained in:
Ben Lindstrom 2001-07-04 05:00:11 +00:00
parent 60260022ee
commit 680b276aad
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

@ -86,6 +86,9 @@
- markus@cvs.openbsd.org 2001/06/27 04:48:53 - markus@cvs.openbsd.org 2001/06/27 04:48:53
[auth.c match.c sshd.8] [auth.c match.c sshd.8]
tridge@samba.org tridge@samba.org
- markus@cvs.openbsd.org 2001/06/27 05:35:42
[ssh-keygen.c]
use cyberflex_inq_class to inquire class.
20010629 20010629
- (bal) Removed net_aton() since we don't use it any more - (bal) Removed net_aton() since we don't use it any more
@ -5913,4 +5916,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1363 2001/07/04 04:56:44 mouring Exp $ $Id: ChangeLog,v 1.1364 2001/07/04 05:00:11 mouring Exp $

10
ssh-keygen.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-keygen.c,v 1.66 2001/06/26 02:47:07 markus Exp $"); RCSID("$OpenBSD: ssh-keygen.c,v 1.67 2001/06/27 05:35:42 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -416,10 +416,6 @@ do_upload(struct passwd *pw, int reader)
error("load failed"); error("load failed");
goto done; goto done;
} }
{
prv->type = KEY_RSA;
key_write(prv, stderr);
}
for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++) for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++)
elements[i] = NULL; elements[i] = NULL;
COPY_RSA_KEY(q, 0); COPY_RSA_KEY(q, 0);
@ -439,6 +435,10 @@ do_upload(struct passwd *pw, int reader)
error("screset failed."); error("screset failed.");
goto done; goto done;
} }
if ((cla = cyberflex_inq_class(fd)) < 0) {
error("cyberflex_inq_class failed");
goto done;
}
if (cyberflex_verify_AUT0(fd, cla, AUT0, sizeof(AUT0)) < 0) { if (cyberflex_verify_AUT0(fd, cla, AUT0, sizeof(AUT0)) < 0) {
error("cyberflex_verify_AUT0 failed"); error("cyberflex_verify_AUT0 failed");
goto done; goto done;