summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/authfile.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2001-12-27 18:22:16 +0000
committermarkus <markus@openbsd.org>2001-12-27 18:22:16 +0000
commit8f44bd53e2101ef6105a3fc353079aaaebdefc48 (patch)
tree9391d4b87ee62a37352bd63416dddad9e4535086 /usr.bin/ssh/authfile.c
parent-t is only needed for key generation (unbreaks -i, -e, etc). (diff)
downloadwireguard-openbsd-8f44bd53e2101ef6105a3fc353079aaaebdefc48.tar.xz
wireguard-openbsd-8f44bd53e2101ef6105a3fc353079aaaebdefc48.zip
call fatal() for openssl allocation failures
Diffstat (limited to 'usr.bin/ssh/authfile.c')
-rw-r--r--usr.bin/ssh/authfile.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c
index 0da14f25ada..fdaa2061fcd 100644
--- a/usr.bin/ssh/authfile.c
+++ b/usr.bin/ssh/authfile.c
@@ -36,7 +36,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: authfile.c,v 1.42 2001/12/19 17:16:13 stevesk Exp $");
+RCSID("$OpenBSD: authfile.c,v 1.43 2001/12/27 18:22:16 markus Exp $");
#include <openssl/err.h>
#include <openssl/evp.h>
@@ -316,8 +316,6 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase,
char *cp;
CipherContext ciphercontext;
Cipher *cipher;
- BN_CTX *ctx;
- BIGNUM *aux;
Key *prv = NULL;
len = lseek(fd, (off_t) 0, SEEK_END);
@@ -406,17 +404,7 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase,
buffer_get_bignum(&decrypted, prv->rsa->p); /* q */
/* calculate p-1 and q-1 */
- ctx = BN_CTX_new();
- aux = BN_new();
-
- BN_sub(aux, prv->rsa->q, BN_value_one());
- BN_mod(prv->rsa->dmq1, prv->rsa->d, aux, ctx);
-
- BN_sub(aux, prv->rsa->p, BN_value_one());
- BN_mod(prv->rsa->dmp1, prv->rsa->d, aux, ctx);
-
- BN_clear_free(aux);
- BN_CTX_free(ctx);
+ rsa_generate_additional_parameters(prv->rsa);
buffer_free(&decrypted);
close(fd);