upstream commit

remove post-SSHv1 removal dead code from rsa.c and merge
the remaining bit that it still used into ssh-rsa.c; ok markus

Upstream-ID: ac8a048d24dcd89594b0052ea5e3404b473bfa2f

1 files changed, 2 insertions, 3 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index b6b690051..d8f942f5a 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.305 2017/06/28 01:09:22 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.306 2017/07/01 13:50:45 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -41,7 +41,6 @@
 
 #include "xmalloc.h"
 #include "sshkey.h"
-#include "rsa.h"
 #include "authfile.h"
 #include "uuencode.h"
 #include "sshbuf.h"
@@ -528,7 +527,7 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
                 buffer_get_bignum_bits(b, key->rsa->iqmp);
                 buffer_get_bignum_bits(b, key->rsa->q);
                 buffer_get_bignum_bits(b, key->rsa->p);
-                if ((r = rsa_generate_additional_parameters(key->rsa)) != 0)
+                if ((r = ssh_rsa_generate_additional_parameters(key)) != 0)
                         fatal("generate RSA parameters failed: %s", ssh_err(r));
                 break;
         }