diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-07-01 13:50:45 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-07-21 14:17:32 +1000 |
commit | 83fa3a044891887369ce8b487ce88d713a04df48 (patch) | |
tree | f5d227629414d0a30ef14141a5613ed31fd1985c /sshkey.c | |
parent | 738c73dca2c99ee78c531b4cbeefc2008fe438f0 (diff) |
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
Diffstat (limited to 'sshkey.c')
-rw-r--r-- | sshkey.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.c,v 1.53 2017/06/28 01:09:22 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.c,v 1.54 2017/07/01 13:50:45 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. | 4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. |
@@ -51,7 +51,6 @@ | |||
51 | #include "ssherr.h" | 51 | #include "ssherr.h" |
52 | #include "misc.h" | 52 | #include "misc.h" |
53 | #include "sshbuf.h" | 53 | #include "sshbuf.h" |
54 | #include "rsa.h" | ||
55 | #include "cipher.h" | 54 | #include "cipher.h" |
56 | #include "digest.h" | 55 | #include "digest.h" |
57 | #define SSHKEY_INTERNAL | 56 | #define SSHKEY_INTERNAL |
@@ -2667,7 +2666,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp) | |||
2667 | (r = sshbuf_get_bignum2(buf, k->rsa->iqmp)) != 0 || | 2666 | (r = sshbuf_get_bignum2(buf, k->rsa->iqmp)) != 0 || |
2668 | (r = sshbuf_get_bignum2(buf, k->rsa->p)) != 0 || | 2667 | (r = sshbuf_get_bignum2(buf, k->rsa->p)) != 0 || |
2669 | (r = sshbuf_get_bignum2(buf, k->rsa->q)) != 0 || | 2668 | (r = sshbuf_get_bignum2(buf, k->rsa->q)) != 0 || |
2670 | (r = rsa_generate_additional_parameters(k->rsa)) != 0) | 2669 | (r = ssh_rsa_generate_additional_parameters(k)) != 0) |
2671 | goto out; | 2670 | goto out; |
2672 | if (BN_num_bits(k->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) { | 2671 | if (BN_num_bits(k->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) { |
2673 | r = SSH_ERR_KEY_LENGTH; | 2672 | r = SSH_ERR_KEY_LENGTH; |
@@ -2681,7 +2680,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp) | |||
2681 | (r = sshbuf_get_bignum2(buf, k->rsa->iqmp)) != 0 || | 2680 | (r = sshbuf_get_bignum2(buf, k->rsa->iqmp)) != 0 || |
2682 | (r = sshbuf_get_bignum2(buf, k->rsa->p)) != 0 || | 2681 | (r = sshbuf_get_bignum2(buf, k->rsa->p)) != 0 || |
2683 | (r = sshbuf_get_bignum2(buf, k->rsa->q)) != 0 || | 2682 | (r = sshbuf_get_bignum2(buf, k->rsa->q)) != 0 || |
2684 | (r = rsa_generate_additional_parameters(k->rsa)) != 0) | 2683 | (r = ssh_rsa_generate_additional_parameters(k)) != 0) |
2685 | goto out; | 2684 | goto out; |
2686 | if (BN_num_bits(k->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) { | 2685 | if (BN_num_bits(k->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) { |
2687 | r = SSH_ERR_KEY_LENGTH; | 2686 | r = SSH_ERR_KEY_LENGTH; |