|
From b67882dece4df10893307467f3782237fad72d25 Mon Sep 17 00:00:00 2001
|
|
From: "djm@openbsd.org" <djm@openbsd.org>
|
|
Date: Thu, 13 Sep 2018 02:08:33 +0000
|
|
Subject: [PATCH 1/5] upstream: hold our collective noses and use the
|
|
openssl-1.1.x API in
|
|
|
|
OpenSSH; feedback and ok tb@ jsing@ markus@
|
|
|
|
OpenBSD-Commit-ID: cacbcac87ce5da0d3ca7ef1b38a6f7fb349e4417
|
|
---
|
|
auth2.c | 4 +-
|
|
cipher.c | 16 +-
|
|
cipher.h | 4 +-
|
|
dh.c | 60 +++--
|
|
dh.h | 2 +-
|
|
digest-openssl.c | 26 ++-
|
|
kexdhc.c | 15 +-
|
|
kexdhs.c | 11 +-
|
|
kexgexc.c | 18 +-
|
|
kexgexs.c | 21 +-
|
|
monitor.c | 6 +-
|
|
ssh-dss.c | 26 ++-
|
|
ssh-ecdsa.c | 23 +-
|
|
ssh-keygen.c | 61 +++--
|
|
ssh-pkcs11-client.c | 12 +-
|
|
ssh-pkcs11.c | 55 +++--
|
|
ssh-rsa.c | 47 ++--
|
|
sshd.c | 6 +-
|
|
sshkey.c | 637 ++++++++++++++++++++++++++++------------------------
|
|
sshkey.h | 7 +-
|
|
20 files changed, 619 insertions(+), 438 deletions(-)
|
|
|
|
diff --git a/auth2.c b/auth2.c
|
|
index ab879589..4d19957a 100644
|
|
--- a/auth2.c
|
|
+++ b/auth2.c
|
|
@@ -706,7 +706,7 @@ auth2_record_key(Authctxt *authctxt, int authenticated,
|
|
struct sshkey **tmp, *dup;
|
|
int r;
|
|
|
|
- if ((r = sshkey_demote(key, &dup)) != 0)
|
|
+ if ((r = sshkey_from_private(key, &dup)) != 0)
|
|
fatal("%s: copy key: %s", __func__, ssh_err(r));
|
|
sshkey_free(authctxt->auth_method_key);
|
|
authctxt->auth_method_key = dup;
|
|
@@ -715,7 +715,7 @@ auth2_record_key(Authctxt *authctxt, int authenticated,
|
|
return;
|
|
|
|
/* If authenticated, make sure we don't accept this key again */
|
|
- if ((r = sshkey_demote(key, &dup)) != 0)
|
|
+ if ((r = sshkey_from_private(key, &dup)) != 0)
|
|
fatal("%s: copy key: %s", __func__, ssh_err(r));
|
|
if (authctxt->nprev_keys >= INT_MAX ||
|
|
(tmp = recallocarray(authctxt->prev_keys, authctxt->nprev_keys,
|
|
diff --git a/cipher.c b/cipher.c
|
|
index a72682a8..df43826e 100644
|
|
--- a/cipher.c
|
|
+++ b/cipher.c
|
|
@@ -446,7 +446,7 @@ cipher_get_keyiv_len(const struct sshcipher_ctx *cc)
|
|
}
|
|
|
|
int
|
|
-cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, u_int len)
|
|
+cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, size_t len)
|
|
{
|
|
#ifdef WITH_OPENSSL
|
|
const struct sshcipher *c = cc->cipher;
|
|
@@ -473,7 +473,7 @@ cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, u_int len)
|
|
return 0;
|
|
else if (evplen < 0)
|
|
return SSH_ERR_LIBCRYPTO_ERROR;
|
|
- if ((u_int)evplen != len)
|
|
+ if ((size_t)evplen != len)
|
|
return SSH_ERR_INVALID_ARGUMENT;
|
|
#ifndef OPENSSL_HAVE_EVPCTR
|
|
if (c->evptype == evp_aes_128_ctr)
|
|
@@ -484,14 +484,14 @@ cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, u_int len)
|
|
if (!EVP_CIPHER_CTX_ctrl(cc->evp, EVP_CTRL_GCM_IV_GEN,
|
|
len, iv))
|
|
return SSH_ERR_LIBCRYPTO_ERROR;
|
|
- } else
|
|
- memcpy(iv, cc->evp->iv, len);
|
|
+ } else if (!EVP_CIPHER_CTX_get_iv(cc->evp, iv, len))
|
|
+ return SSH_ERR_LIBCRYPTO_ERROR;
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
-cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv)
|
|
+cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv, size_t len)
|
|
{
|
|
#ifdef WITH_OPENSSL
|
|
const struct sshcipher *c = cc->cipher;
|
|
@@ -507,6 +507,8 @@ cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv)
|
|
evplen = EVP_CIPHER_CTX_iv_length(cc->evp);
|
|
if (evplen <= 0)
|
|
return SSH_ERR_LIBCRYPTO_ERROR;
|
|
+ if ((size_t)evplen != len)
|
|
+ return SSH_ERR_INVALID_ARGUMENT;
|
|
#ifndef OPENSSL_HAVE_EVPCTR
|
|
/* XXX iv arg is const, but ssh_aes_ctr_iv isn't */
|
|
if (c->evptype == evp_aes_128_ctr)
|
|
@@ -518,8 +520,8 @@ cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv)
|
|
if (!EVP_CIPHER_CTX_ctrl(cc->evp,
|
|
EVP_CTRL_GCM_SET_IV_FIXED, -1, (void *)iv))
|
|
return SSH_ERR_LIBCRYPTO_ERROR;
|
|
- } else
|
|
- memcpy(cc->evp->iv, iv, evplen);
|
|
+ } else if (!EVP_CIPHER_CTX_set_iv(cc->evp, iv, evplen))
|
|
+ return SSH_ERR_LIBCRYPTO_ERROR;
|
|
#endif
|
|
return 0;
|
|
}
|
|
diff --git a/cipher.h b/cipher.h
|
|
index dc7ecf11..dc1571d2 100644
|
|
--- a/cipher.h
|
|
+++ b/cipher.h
|
|
@@ -68,8 +68,8 @@ u_int cipher_is_cbc(const struct sshcipher *);
|
|
|
|
u_int cipher_ctx_is_plaintext(struct sshcipher_ctx *);
|
|
|
|
-int cipher_get_keyiv(struct sshcipher_ctx *, u_char *, u_int);
|
|
-int cipher_set_keyiv(struct sshcipher_ctx *, const u_char *);
|
|
+int cipher_get_keyiv(struct sshcipher_ctx *, u_char *, size_t);
|
|
+int cipher_set_keyiv(struct sshcipher_ctx *, const u_char *, size_t);
|
|
int cipher_get_keyiv_len(const struct sshcipher_ctx *);
|
|
|
|
#endif /* CIPHER_H */
|
|
diff --git a/dh.c b/dh.c
|
|
index ac8d5a0a..d0d4527b 100644
|
|
--- a/dh.c
|
|
+++ b/dh.c
|
|
@@ -216,14 +216,17 @@ choose_dh(int min, int wantbits, int max)
|
|
/* diffie-hellman-groupN-sha1 */
|
|
|
|
int
|
|
-dh_pub_is_valid(DH *dh, BIGNUM *dh_pub)
|
|
+dh_pub_is_valid(const DH *dh, const BIGNUM *dh_pub)
|
|
{
|
|
int i;
|
|
int n = BN_num_bits(dh_pub);
|
|
int bits_set = 0;
|
|
BIGNUM *tmp;
|
|
+ const BIGNUM *dh_p;
|
|
|
|
- if (dh_pub->neg) {
|
|
+ DH_get0_pqg(dh, &dh_p, NULL, NULL);
|
|
+
|
|
+ if (BN_is_negative(dh_pub)) {
|
|
logit("invalid public DH value: negative");
|
|
return 0;
|
|
}
|
|
@@ -236,7 +239,7 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub)
|
|
error("%s: BN_new failed", __func__);
|
|
return 0;
|
|
}
|
|
- if (!BN_sub(tmp, dh->p, BN_value_one()) ||
|
|
+ if (!BN_sub(tmp, dh_p, BN_value_one()) ||
|
|
BN_cmp(dh_pub, tmp) != -1) { /* pub_exp > p-2 */
|
|
BN_clear_free(tmp);
|
|
logit("invalid public DH value: >= p-1");
|
|
@@ -247,14 +250,14 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub)
|
|
for (i = 0; i <= n; i++)
|
|
if (BN_is_bit_set(dh_pub, i))
|
|
bits_set++;
|
|
- debug2("bits set: %d/%d", bits_set, BN_num_bits(dh->p));
|
|
+ debug2("bits set: %d/%d", bits_set, BN_num_bits(dh_p));
|
|
|
|
/*
|
|
* if g==2 and bits_set==1 then computing log_g(dh_pub) is trivial
|
|
*/
|
|
if (bits_set < 4) {
|
|
logit("invalid public DH value (%d/%d)",
|
|
- bits_set, BN_num_bits(dh->p));
|
|
+ bits_set, BN_num_bits(dh_p));
|
|
return 0;
|
|
}
|
|
return 1;
|
|
@@ -264,9 +267,12 @@ int
|
|
dh_gen_key(DH *dh, int need)
|
|
{
|
|
int pbits;
|
|
+ const BIGNUM *dh_p, *pub_key;
|
|
+
|
|
+ DH_get0_pqg(dh, &dh_p, NULL, NULL);
|
|
|
|
- if (need < 0 || dh->p == NULL ||
|
|
- (pbits = BN_num_bits(dh->p)) <= 0 ||
|
|
+ if (need < 0 || dh_p == NULL ||
|
|
+ (pbits = BN_num_bits(dh_p)) <= 0 ||
|
|
need > INT_MAX / 2 || 2 * need > pbits)
|
|
return SSH_ERR_INVALID_ARGUMENT;
|
|
if (need < 256)
|
|
@@ -275,13 +281,14 @@ dh_gen_key(DH *dh, int need)
|
|
* Pollard Rho, Big step/Little Step attacks are O(sqrt(n)),
|
|
* so double requested need here.
|
|
*/
|
|
- dh->length = MINIMUM(need * 2, pbits - 1);
|
|
- if (DH_generate_key(dh) == 0 ||
|
|
- !dh_pub_is_valid(dh, dh->pub_key)) {
|
|
- BN_clear_free(dh->priv_key);
|
|
- dh->priv_key = NULL;
|
|
+ if (!DH_set_length(dh, MINIMUM(need * 2, pbits - 1)))
|
|
return SSH_ERR_LIBCRYPTO_ERROR;
|
|
- }
|
|
+
|
|
+ if (DH_generate_key(dh) == 0)
|
|
+ return SSH_ERR_LIBCRYPTO_ERROR;
|
|
+ DH_get0_key(dh, &pub_key, NULL);
|
|
+ if (!dh_pub_is_valid(dh, pub_key))
|
|
+ return SSH_ERR_INVALID_FORMAT;
|
|
return 0;
|
|
}
|
|
|
|
@@ -289,22 +296,27 @@ DH *
|
|
dh_new_group_asc(const char *gen, const char *modulus)
|
|
{
|
|
DH *dh;
|
|
+ BIGNUM *dh_p = NULL, *dh_g = NULL;
|
|
|
|
if ((dh = DH_new()) == NULL)
|
|
return NULL;
|
|
- if (BN_hex2bn(&dh->p, modulus) == 0 ||
|
|
- BN_hex2bn(&dh->g, gen) == 0) {
|
|
- DH_free(dh);
|
|
- return NULL;
|
|
- }
|
|
- return (dh);
|
|
+ if (BN_hex2bn(&dh_p, modulus) == 0 ||
|
|
+ BN_hex2bn(&dh_g, gen) == 0)
|
|
+ goto fail;
|
|
+ if (!DH_set0_pqg(dh, dh_p, NULL, dh_g))
|
|
+ goto fail;
|
|
+ return dh;
|
|
+ fail:
|
|
+ DH_free(dh);
|
|
+ BN_clear_free(dh_p);
|
|
+ BN_clear_free(dh_g);
|
|
+ return NULL;
|
|
}
|
|
|
|
/*
|
|
* This just returns the group, we still need to generate the exchange
|
|
* value.
|
|
*/
|
|
-
|
|
DH *
|
|
dh_new_group(BIGNUM *gen, BIGNUM *modulus)
|
|
{
|
|
@@ -312,10 +324,12 @@ dh_new_group(BIGNUM *gen, BIGNUM *modulus)
|
|
|
|
if ((dh = DH_new()) == NULL)
|
|
return NULL;
|
|
- dh->p = modulus;
|
|
- dh->g = gen;
|
|
+ if (!DH_set0_pqg(dh, modulus, NULL, gen)) {
|
|
+ DH_free(dh);
|
|
+ return NULL;
|
|
+ }
|
|
|
|
- return (dh);
|
|
+ return dh;
|
|
}
|
|
|
|
/* rfc2409 "Second Oakley Group" (1024 bits) */
|
|
diff --git a/dh.h b/dh.h
|
|
index bcd485cf..344b29e3 100644
|
|
--- a/dh.h
|
|
+++ b/dh.h
|
|
@@ -42,7 +42,7 @@ DH *dh_new_group18(void);
|
|
DH *dh_new_group_fallback(int);
|
|
|
|
int dh_gen_key(DH *, int);
|
|
-int dh_pub_is_valid(DH *, BIGNUM *);
|
|
+int dh_pub_is_valid(const DH *, const BIGNUM *);
|
|
|
|
u_int dh_estimate(int);
|
|
|
|
diff --git a/digest-openssl.c b/digest-openssl.c
|
|
index 27709992..da7ed72b 100644
|
|
--- a/digest-openssl.c
|
|
+++ b/digest-openssl.c
|
|
@@ -43,7 +43,7 @@
|
|
|
|
struct ssh_digest_ctx {
|
|
int alg;
|
|
- EVP_MD_CTX mdctx;
|
|
+ EVP_MD_CTX *mdctx;
|
|
};
|
|
|
|
struct ssh_digest {
|
|
@@ -106,7 +106,7 @@ ssh_digest_bytes(int alg)
|
|
size_t
|
|
ssh_digest_blocksize(struct ssh_digest_ctx *ctx)
|
|
{
|
|
- return EVP_MD_CTX_block_size(&ctx->mdctx);
|
|
+ return EVP_MD_CTX_block_size(ctx->mdctx);
|
|
}
|
|
|
|
struct ssh_digest_ctx *
|
|
@@ -118,11 +118,14 @@ ssh_digest_start(int alg)
|
|
if (digest == NULL || ((ret = calloc(1, sizeof(*ret))) == NULL))
|
|
return NULL;
|
|
ret->alg = alg;
|
|
- EVP_MD_CTX_init(&ret->mdctx);
|
|
- if (EVP_DigestInit_ex(&ret->mdctx, digest->mdfunc(), NULL) != 1) {
|
|
+ if ((ret->mdctx = EVP_MD_CTX_new()) == NULL) {
|
|
free(ret);
|
|
return NULL;
|
|
}
|
|
+ if (EVP_DigestInit_ex(ret->mdctx, digest->mdfunc(), NULL) != 1) {
|
|
+ ssh_digest_free(ret);
|
|
+ return NULL;
|
|
+ }
|
|
return ret;
|
|
}
|
|
|
|
@@ -132,7 +135,7 @@ ssh_digest_copy_state(struct ssh_digest_ctx *from, struct ssh_digest_ctx *to)
|
|
if (from->alg != to->alg)
|
|
return SSH_ERR_INVALID_ARGUMENT;
|
|
/* we have bcopy-style order while openssl has memcpy-style */
|
|
- if (!EVP_MD_CTX_copy_ex(&to->mdctx, &from->mdctx))
|
|
+ if (!EVP_MD_CTX_copy_ex(to->mdctx, from->mdctx))
|
|
return SSH_ERR_LIBCRYPTO_ERROR;
|
|
return 0;
|
|
}
|
|
@@ -140,7 +143,7 @@ ssh_digest_copy_state(struct ssh_digest_ctx *from, struct ssh_digest_ctx *to)
|
|
int
|
|
ssh_digest_update(struct ssh_digest_ctx *ctx, const void *m, size_t mlen)
|
|
{
|
|
- if (EVP_DigestUpdate(&ctx->mdctx, m, mlen) != 1)
|
|
+ if (EVP_DigestUpdate(ctx->mdctx, m, mlen) != 1)
|
|
return SSH_ERR_LIBCRYPTO_ERROR;
|
|
return 0;
|
|
}
|
|
@@ -161,7 +164,7 @@ ssh_digest_final(struct ssh_digest_ctx *ctx, u_char *d, size_t dlen)
|
|
return SSH_ERR_INVALID_ARGUMENT;
|
|
if (dlen < digest->digest_len) /* No truncation allowed */
|
|
return SSH_ERR_INVALID_ARGUMENT;
|
|
- if (EVP_DigestFinal_ex(&ctx->mdctx, d, &l) != 1)
|
|
+ if (EVP_DigestFinal_ex(ctx->mdctx, d, &l) != 1)
|
|
return SSH_ERR_LIBCRYPTO_ERROR;
|
|
if (l != digest->digest_len) /* sanity */
|
|
return SSH_ERR_INTERNAL_ERROR;
|
|
@@ -171,11 +174,10 @@ ssh_digest_final(struct ssh_digest_ctx *ctx, u_char *d, size_t dlen)
|
|
void
|
|
ssh_digest_free(struct ssh_digest_ctx *ctx)
|
|
{
|
|
- if (ctx != NULL) {
|
|
- EVP_MD_CTX_cleanup(&ctx->mdctx);
|
|
- explicit_bzero(ctx, sizeof(*ctx));
|
|
- free(ctx);
|
|
- }
|
|
+ if (ctx == NULL)
|
|
+ return;
|
|
+ EVP_MD_CTX_free(ctx->mdctx);
|
|
+ freezero(ctx, sizeof(*ctx));
|
|
}
|
|
|
|
int
|
|
diff --git a/kexdhc.c b/kexdhc.c
|
|
index 9a9f1ea7..a8b74247 100644
|
|
--- a/kexdhc.c
|
|
+++ b/kexdhc.c
|
|
@@ -56,6 +56,7 @@ kexdh_client(struct ssh *ssh)
|
|
{
|
|
struct kex *kex = ssh->kex;
|
|
int r;
|
|
+ const BIGNUM *pub_key;
|
|
|
|
/* generate and send 'e', client DH public key */
|
|
switch (kex->kex_type) {
|
|
@@ -81,15 +82,17 @@ kexdh_client(struct ssh *ssh)
|
|
goto out;
|
|
}
|
|
debug("sending SSH2_MSG_KEXDH_INIT");
|
|
- if ((r = dh_gen_key(kex->dh, kex->we_need * 8)) != 0 ||
|
|
- (r = sshpkt_start(ssh, SSH2_MSG_KEXDH_INIT)) != 0 ||
|
|
- (r = sshpkt_put_bignum2(ssh, kex->dh->pub_key)) != 0 ||
|
|
+ if ((r = dh_gen_key(kex->dh, kex->we_need * 8)) != 0)
|
|
+ goto out;
|
|
+ DH_get0_key(kex->dh, &pub_key, NULL);
|
|
+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEXDH_INIT)) != 0 ||
|
|
+ (r = sshpkt_put_bignum2(ssh, pub_key)) != 0 ||
|
|
(r = sshpkt_send(ssh)) != 0)
|
|
goto out;
|
|
#ifdef DEBUG_KEXDH
|
|
DHparams_print_fp(stderr, kex->dh);
|
|
fprintf(stderr, "pub= ");
|
|
- BN_print_fp(stderr, kex->dh->pub_key);
|
|
+ BN_print_fp(stderr, pub_key);
|
|
fprintf(stderr, "\n");
|
|
#endif
|
|
debug("expecting SSH2_MSG_KEXDH_REPLY");
|
|
@@ -104,6 +107,7 @@ input_kex_dh(int type, u_int32_t seq, struct ssh *ssh)
|
|
{
|
|
struct kex *kex = ssh->kex;
|
|
BIGNUM *dh_server_pub = NULL, *shared_secret = NULL;
|
|
+ const BIGNUM *pub_key;
|
|
struct sshkey *server_host_key = NULL;
|
|
u_char *kbuf = NULL, *server_host_key_blob = NULL, *signature = NULL;
|
|
u_char hash[SSH_DIGEST_MAX_LENGTH];
|
|
@@ -168,6 +172,7 @@ input_kex_dh(int type, u_int32_t seq, struct ssh *ssh)
|
|
#endif
|
|
|
|
/* calc and verify H */
|
|
+ DH_get0_key(kex->dh, &pub_key, NULL);
|
|
hashlen = sizeof(hash);
|
|
if ((r = kex_dh_hash(
|
|
kex->hash_alg,
|
|
@@ -176,7 +181,7 @@ input_kex_dh(int type, u_int32_t seq, struct ssh *ssh)
|
|
sshbuf_ptr(kex->my), sshbuf_len(kex->my),
|
|
sshbuf_ptr(kex->peer), sshbuf_len(kex->peer),
|
|
server_host_key_blob, sbloblen,
|
|
- kex->dh->pub_key,
|
|
+ pub_key,
|
|
dh_server_pub,
|
|
shared_secret,
|
|
hash, &hashlen)) != 0)
|
|
diff --git a/kexdhs.c b/kexdhs.c
|
|
index 5dfca0a2..8367c6c3 100644
|
|
--- a/kexdhs.c
|
|
+++ b/kexdhs.c
|
|
@@ -95,6 +95,7 @@ input_kex_dh_init(int type, u_int32_t seq, struct ssh *ssh)
|
|
{
|
|
struct kex *kex = ssh->kex;
|
|
BIGNUM *shared_secret = NULL, *dh_client_pub = NULL;
|
|
+ const BIGNUM *pub_key;
|
|
struct sshkey *server_host_public, *server_host_private;
|
|
u_char *kbuf = NULL, *signature = NULL, *server_host_key_blob = NULL;
|
|
u_char hash[SSH_DIGEST_MAX_LENGTH];
|
|
@@ -121,6 +122,7 @@ input_kex_dh_init(int type, u_int32_t seq, struct ssh *ssh)
|
|
r = SSH_ERR_ALLOC_FAIL;
|
|
goto out;
|
|
}
|
|
+ DH_get0_key(kex->dh, &pub_key, NULL);
|
|
if ((r = sshpkt_get_bignum2(ssh, dh_client_pub)) != 0 ||
|
|
(r = sshpkt_get_end(ssh)) != 0)
|
|
goto out;
|
|
@@ -130,12 +132,9 @@ input_kex_dh_init(int type, u_int32_t seq, struct ssh *ssh)
|
|
BN_print_fp(stderr, dh_client_pub);
|
|
fprintf(stderr, "\n");
|
|
debug("bits %d", BN_num_bits(dh_client_pub));
|
|
-#endif
|
|
-
|
|
-#ifdef DEBUG_KEXDH
|
|
DHparams_print_fp(stderr, kex->dh);
|
|
fprintf(stderr, "pub= ");
|
|
- BN_print_fp(stderr, kex->dh->pub_key);
|
|
+ BN_print_fp(stderr, pub_key);
|
|
fprintf(stderr, "\n");
|
|
#endif
|
|
if (!dh_pub_is_valid(kex->dh, dh_client_pub)) {
|
|
@@ -171,7 +170,7 @@ input_kex_dh_init(int type, u_int32_t seq, struct ssh *ssh)
|
|
sshbuf_ptr(kex->my), sshbuf_len(kex->my),
|
|
server_host_key_blob, sbloblen,
|
|
dh_client_pub,
|
|
- kex->dh->pub_key,
|
|
+ pub_key,
|
|
shared_secret,
|
|
hash, &hashlen)) != 0)
|
|
goto out;
|
|
@@ -197,7 +196,7 @@ input_kex_dh_init(int type, u_int32_t seq, struct ssh *ssh)
|
|
/* send server hostkey, DH pubkey 'f' and signed H */
|
|
if ((r = sshpkt_start(ssh, SSH2_MSG_KEXDH_REPLY)) != 0 ||
|
|
(r = sshpkt_put_string(ssh, server_host_key_blob, sbloblen)) != 0 ||
|
|
- (r = sshpkt_put_bignum2(ssh, kex->dh->pub_key)) != 0 || /* f */
|
|
+ (r = sshpkt_put_bignum2(ssh, pub_key)) != 0 || /* f */
|
|
(r = sshpkt_put_string(ssh, signature, slen)) != 0 ||
|
|
(r = sshpkt_send(ssh)) != 0)
|
|
goto out;
|
|
diff --git a/kexgexc.c b/kexgexc.c
|
|
index 762a9a32..955bc837 100644
|
|
--- a/kexgexc.c
|
|
+++ b/kexgexc.c
|
|
@@ -93,6 +93,7 @@ input_kex_dh_gex_group(int type, u_int32_t seq, struct ssh *ssh)
|
|
{
|
|
struct kex *kex = ssh->kex;
|
|
BIGNUM *p = NULL, *g = NULL;
|
|
+ const BIGNUM *pub_key;
|
|
int r, bits;
|
|
|
|
debug("got SSH2_MSG_KEX_DH_GEX_GROUP");
|
|
@@ -118,16 +119,18 @@ input_kex_dh_gex_group(int type, u_int32_t seq, struct ssh *ssh)
|
|
p = g = NULL; /* belong to kex->dh now */
|
|
|
|
/* generate and send 'e', client DH public key */
|
|
- if ((r = dh_gen_key(kex->dh, kex->we_need * 8)) != 0 ||
|
|
- (r = sshpkt_start(ssh, SSH2_MSG_KEX_DH_GEX_INIT)) != 0 ||
|
|
- (r = sshpkt_put_bignum2(ssh, kex->dh->pub_key)) != 0 ||
|
|
+ if ((r = dh_gen_key(kex->dh, kex->we_need * 8)) != 0)
|
|
+ goto out;
|
|
+ DH_get0_key(kex->dh, &pub_key, NULL);
|
|
+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEX_DH_GEX_INIT)) != 0 ||
|
|
+ (r = sshpkt_put_bignum2(ssh, pub_key)) != 0 ||
|
|
(r = sshpkt_send(ssh)) != 0)
|
|
goto out;
|
|
debug("SSH2_MSG_KEX_DH_GEX_INIT sent");
|
|
#ifdef DEBUG_KEXDH
|
|
DHparams_print_fp(stderr, kex->dh);
|
|
fprintf(stderr, "pub= ");
|
|
- BN_print_fp(stderr, kex->dh->pub_key);
|
|
+ BN_print_fp(stderr, pub_key);
|
|
fprintf(stderr, "\n");
|
|
#endif
|
|
ssh_dispatch_set(ssh, SSH2_MSG_KEX_DH_GEX_GROUP, NULL);
|
|
@@ -144,6 +147,7 @@ input_kex_dh_gex_reply(int type, u_int32_t seq, struct ssh *ssh)
|
|
{
|
|
struct kex *kex = ssh->kex;
|
|
BIGNUM *dh_server_pub = NULL, *shared_secret = NULL;
|
|
+ const BIGNUM *pub_key, *dh_p, *dh_g;
|
|
struct sshkey *server_host_key = NULL;
|
|
u_char *kbuf = NULL, *signature = NULL, *server_host_key_blob = NULL;
|
|
u_char hash[SSH_DIGEST_MAX_LENGTH];
|
|
@@ -211,6 +215,8 @@ input_kex_dh_gex_reply(int type, u_int32_t seq, struct ssh *ssh)
|
|
kex->min = kex->max = -1;
|
|
|
|
/* calc and verify H */
|
|
+ DH_get0_key(kex->dh, &pub_key, NULL);
|
|
+ DH_get0_pqg(kex->dh, &dh_p, NULL, &dh_g);
|
|
hashlen = sizeof(hash);
|
|
if ((r = kexgex_hash(
|
|
kex->hash_alg,
|
|
@@ -220,8 +226,8 @@ input_kex_dh_gex_reply(int type, u_int32_t seq, struct ssh *ssh)
|
|
sshbuf_ptr(kex->peer), sshbuf_len(kex->peer),
|
|
server_host_key_blob, sbloblen,
|
|
kex->min, kex->nbits, kex->max,
|
|
- kex->dh->p, kex->dh->g,
|
|
- kex->dh->pub_key,
|
|
+ dh_p, dh_g,
|
|
+ pub_key,
|
|
dh_server_pub,
|
|
shared_secret,
|
|
hash, &hashlen)) != 0)
|
|
diff --git a/kexgexs.c b/kexgexs.c
|
|
index f6983fd6..2a4aa7e8 100644
|
|
--- a/kexgexs.c
|
|
+++ b/kexgexs.c
|
|
@@ -72,6 +72,7 @@ input_kex_dh_gex_request(int type, u_int32_t seq, struct ssh *ssh)
|
|
struct kex *kex = ssh->kex;
|
|
int r;
|
|
u_int min = 0, max = 0, nbits = 0;
|
|
+ const BIGNUM *dh_p, *dh_g;
|
|
|
|
debug("SSH2_MSG_KEX_DH_GEX_REQUEST received");
|
|
if ((r = sshpkt_get_u32(ssh, &min)) != 0 ||
|
|
@@ -101,9 +102,10 @@ input_kex_dh_gex_request(int type, u_int32_t seq, struct ssh *ssh)
|
|
goto out;
|
|
}
|
|
debug("SSH2_MSG_KEX_DH_GEX_GROUP sent");
|
|
+ DH_get0_pqg(kex->dh, &dh_p, NULL, &dh_g);
|
|
if ((r = sshpkt_start(ssh, SSH2_MSG_KEX_DH_GEX_GROUP)) != 0 ||
|
|
- (r = sshpkt_put_bignum2(ssh, kex->dh->p)) != 0 ||
|
|
- (r = sshpkt_put_bignum2(ssh, kex->dh->g)) != 0 ||
|
|
+ (r = sshpkt_put_bignum2(ssh, dh_p)) != 0 ||
|
|
+ (r = sshpkt_put_bignum2(ssh, dh_g)) != 0 ||
|
|
(r = sshpkt_send(ssh)) != 0)
|
|
goto out;
|
|
|
|
@@ -123,6 +125,7 @@ input_kex_dh_gex_init(int type, u_int32_t seq, struct ssh *ssh)
|
|
{
|
|
struct kex *kex = ssh->kex;
|
|
BIGNUM *shared_secret = NULL, *dh_client_pub = NULL;
|
|
+ const BIGNUM *pub_key, *dh_p, *dh_g;
|
|
struct sshkey *server_host_public, *server_host_private;
|
|
u_char *kbuf = NULL, *signature = NULL, *server_host_key_blob = NULL;
|
|
u_char hash[SSH_DIGEST_MAX_LENGTH];
|
|
@@ -153,17 +156,17 @@ input_kex_dh_gex_init(int type, u_int32_t seq, struct ssh *ssh)
|
|
(r = sshpkt_get_end(ssh)) != 0)
|
|
goto out;
|
|
|
|
+ DH_get0_key(kex->dh, &pub_key, NULL);
|
|
+ DH_get0_pqg(kex->dh, &dh_p, NULL, &dh_g);
|
|
+
|
|
#ifdef DEBUG_KEXDH
|
|
fprintf(stderr, "dh_client_pub= ");
|
|
BN_print_fp(stderr, dh_client_pub);
|
|
fprintf(stderr, "\n");
|
|
debug("bits %d", BN_num_bits(dh_client_pub));
|
|
-#endif
|
|
-
|
|
-#ifdef DEBUG_KEXDH
|
|
DHparams_print_fp(stderr, kex->dh);
|
|
fprintf(stderr, "pub= ");
|
|
- BN_print_fp(stderr, kex->dh->pub_key);
|
|
+ BN_print_fp(stderr, pub_key);
|
|
fprintf(stderr, "\n");
|
|
#endif
|
|
if (!dh_pub_is_valid(kex->dh, dh_client_pub)) {
|
|
@@ -199,9 +202,9 @@ input_kex_dh_gex_init(int type, u_int32_t seq, struct ssh *ssh)
|
|
sshbuf_ptr(kex->my), sshbuf_len(kex->my),
|
|
server_host_key_blob, sbloblen,
|
|
kex->min, kex->nbits, kex->max,
|
|
- kex->dh->p, kex->dh->g,
|
|
+ dh_p, dh_g,
|
|
dh_client_pub,
|
|
- kex->dh->pub_key,
|
|
+ pub_key,
|
|
shared_secret,
|
|
hash, &hashlen)) != 0)
|
|
goto out;
|
|
@@ -227,7 +230,7 @@ input_kex_dh_gex_init(int type, u_int32_t seq, struct ssh *ssh)
|
|
/* send server hostkey, DH pubkey 'f' and signed H */
|
|
if ((r = sshpkt_start(ssh, SSH2_MSG_KEX_DH_GEX_REPLY)) != 0 ||
|
|
(r = sshpkt_put_string(ssh, server_host_key_blob, sbloblen)) != 0 ||
|
|
- (r = sshpkt_put_bignum2(ssh, kex->dh->pub_key)) != 0 || /* f */
|
|
+ (r = sshpkt_put_bignum2(ssh, pub_key)) != 0 || /* f */
|
|
(r = sshpkt_put_string(ssh, signature, slen)) != 0 ||
|
|
(r = sshpkt_send(ssh)) != 0)
|
|
goto out;
|
|
diff --git a/monitor.c b/monitor.c
|
|
index d4b4b047..b30813b4 100644
|
|
--- a/monitor.c
|
|
+++ b/monitor.c
|
|
@@ -566,6 +566,7 @@ int
|
|
mm_answer_moduli(int sock, struct sshbuf *m)
|
|
{
|
|
DH *dh;
|
|
+ const BIGNUM *dh_p, *dh_g;
|
|
int r;
|
|
u_int min, want, max;
|
|
|
|
@@ -590,9 +591,10 @@ mm_answer_moduli(int sock, struct sshbuf *m)
|
|
return (0);
|
|
} else {
|
|
/* Send first bignum */
|
|
+ DH_get0_pqg(dh, &dh_p, NULL, &dh_g);
|
|
if ((r = sshbuf_put_u8(m, 1)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(m, dh->p)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(m, dh->g)) != 0)
|
|
+ (r = sshbuf_put_bignum2(m, dh_p)) != 0 ||
|
|
+ (r = sshbuf_put_bignum2(m, dh_g)) != 0)
|
|
fatal("%s: buffer error: %s", __func__, ssh_err(r));
|
|
|
|
DH_free(dh);
|
|
diff --git a/ssh-dss.c b/ssh-dss.c
|
|
index 9f832ee2..631b1571 100644
|
|
--- a/ssh-dss.c
|
|
+++ b/ssh-dss.c
|
|
@@ -51,6 +51,7 @@ ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
|
|
const u_char *data, size_t datalen, u_int compat)
|
|
{
|
|
DSA_SIG *sig = NULL;
|
|
+ const BIGNUM *sig_r, *sig_s;
|
|
u_char digest[SSH_DIGEST_MAX_LENGTH], sigblob[SIGBLOB_LEN];
|
|
size_t rlen, slen, len, dlen = ssh_digest_bytes(SSH_DIGEST_SHA1);
|
|
struct sshbuf *b = NULL;
|
|
@@ -76,15 +77,16 @@ ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
|
|
goto out;
|
|
}
|
|
|
|
- rlen = BN_num_bytes(sig->r);
|
|
- slen = BN_num_bytes(sig->s);
|
|
+ DSA_SIG_get0(sig, &sig_r, &sig_s);
|
|
+ rlen = BN_num_bytes(sig_r);
|
|
+ slen = BN_num_bytes(sig_s);
|
|
if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
|
|
ret = SSH_ERR_INTERNAL_ERROR;
|
|
goto out;
|
|
}
|
|
explicit_bzero(sigblob, SIGBLOB_LEN);
|
|
- BN_bn2bin(sig->r, sigblob + SIGBLOB_LEN - INTBLOB_LEN - rlen);
|
|
- BN_bn2bin(sig->s, sigblob + SIGBLOB_LEN - slen);
|
|
+ BN_bn2bin(sig_r, sigblob + SIGBLOB_LEN - INTBLOB_LEN - rlen);
|
|
+ BN_bn2bin(sig_s, sigblob + SIGBLOB_LEN - slen);
|
|
|
|
if ((b = sshbuf_new()) == NULL) {
|
|
ret = SSH_ERR_ALLOC_FAIL;
|
|
@@ -118,6 +120,7 @@ ssh_dss_verify(const struct sshkey *key,
|
|
const u_char *data, size_t datalen, u_int compat)
|
|
{
|
|
DSA_SIG *sig = NULL;
|
|
+ BIGNUM *sig_r = NULL, *sig_s = NULL;
|
|
u_char digest[SSH_DIGEST_MAX_LENGTH], *sigblob = NULL;
|
|
size_t len, dlen = ssh_digest_bytes(SSH_DIGEST_SHA1);
|
|
int ret = SSH_ERR_INTERNAL_ERROR;
|
|
@@ -155,16 +158,21 @@ ssh_dss_verify(const struct sshkey *key,
|
|
|
|
/* parse signature */
|
|
if ((sig = DSA_SIG_new()) == NULL ||
|
|
- (sig->r = BN_new()) == NULL ||
|
|
- (sig->s = BN_new()) == NULL) {
|
|
+ (sig_r = BN_new()) == NULL ||
|
|
+ (sig_s = BN_new()) == NULL) {
|
|
ret = SSH_ERR_ALLOC_FAIL;
|
|
goto out;
|
|
}
|
|
- if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
|
|
- (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL)) {
|
|
+ if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig_r) == NULL) ||
|
|
+ (BN_bin2bn(sigblob + INTBLOB_LEN, INTBLOB_LEN, sig_s) == NULL)) {
|
|
ret = SSH_ERR_LIBCRYPTO_ERROR;
|
|
goto out;
|
|
}
|
|
+ if (!DSA_SIG_set0(sig, sig_r, sig_s)) {
|
|
+ ret = SSH_ERR_LIBCRYPTO_ERROR;
|
|
+ goto out;
|
|
+ }
|
|
+ sig_r = sig_s = NULL; /* transferred */
|
|
|
|
/* sha1 the data */
|
|
if ((ret = ssh_digest_memory(SSH_DIGEST_SHA1, data, datalen,
|
|
@@ -186,6 +194,8 @@ ssh_dss_verify(const struct sshkey *key,
|
|
out:
|
|
explicit_bzero(digest, sizeof(digest));
|
|
DSA_SIG_free(sig);
|
|
+ BN_clear_free(sig_r);
|
|
+ BN_clear_free(sig_s);
|
|
sshbuf_free(b);
|
|
free(ktype);
|
|
if (sigblob != NULL) {
|
|
diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
|
|
index 3d3b78d7..9e92af04 100644
|
|
--- a/ssh-ecdsa.c
|
|
+++ b/ssh-ecdsa.c
|
|
@@ -49,6 +49,7 @@ ssh_ecdsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
|
|
const u_char *data, size_t datalen, u_int compat)
|
|
{
|
|
ECDSA_SIG *sig = NULL;
|
|
+ const BIGNUM *sig_r, *sig_s;
|
|
int hash_alg;
|
|
u_char digest[SSH_DIGEST_MAX_LENGTH];
|
|
size_t len, dlen;
|
|
@@ -80,8 +81,9 @@ ssh_ecdsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
|
|
ret = SSH_ERR_ALLOC_FAIL;
|
|
goto out;
|
|
}
|
|
- if ((ret = sshbuf_put_bignum2(bb, sig->r)) != 0 ||
|
|
- (ret = sshbuf_put_bignum2(bb, sig->s)) != 0)
|
|
+ ECDSA_SIG_get0(sig, &sig_r, &sig_s);
|
|
+ if ((ret = sshbuf_put_bignum2(bb, sig_r)) != 0 ||
|
|
+ (ret = sshbuf_put_bignum2(bb, sig_s)) != 0)
|
|
goto out;
|
|
if ((ret = sshbuf_put_cstring(b, sshkey_ssh_name_plain(key))) != 0 ||
|
|
(ret = sshbuf_put_stringb(b, bb)) != 0)
|
|
@@ -112,6 +114,7 @@ ssh_ecdsa_verify(const struct sshkey *key,
|
|
const u_char *data, size_t datalen, u_int compat)
|
|
{
|
|
ECDSA_SIG *sig = NULL;
|
|
+ BIGNUM *sig_r = NULL, *sig_s = NULL;
|
|
int hash_alg;
|
|
u_char digest[SSH_DIGEST_MAX_LENGTH];
|
|
size_t dlen;
|
|
@@ -146,15 +149,23 @@ ssh_ecdsa_verify(const struct sshkey *key,
|
|
}
|
|
|
|
/* parse signature */
|
|
- if ((sig = ECDSA_SIG_new()) == NULL) {
|
|
+ if ((sig = ECDSA_SIG_new()) == NULL ||
|
|
+ (sig_r = BN_new()) == NULL ||
|
|
+ (sig_s = BN_new()) == NULL) {
|
|
ret = SSH_ERR_ALLOC_FAIL;
|
|
goto out;
|
|
}
|
|
- if (sshbuf_get_bignum2(sigbuf, sig->r) != 0 ||
|
|
- sshbuf_get_bignum2(sigbuf, sig->s) != 0) {
|
|
+ if (sshbuf_get_bignum2(sigbuf, sig_r) != 0 ||
|
|
+ sshbuf_get_bignum2(sigbuf, sig_s) != 0) {
|
|
ret = SSH_ERR_INVALID_FORMAT;
|
|
goto out;
|
|
}
|
|
+ if (!ECDSA_SIG_set0(sig, sig_r, sig_s)) {
|
|
+ ret = SSH_ERR_LIBCRYPTO_ERROR;
|
|
+ goto out;
|
|
+ }
|
|
+ sig_r = sig_s = NULL; /* transferred */
|
|
+
|
|
if (sshbuf_len(sigbuf) != 0) {
|
|
ret = SSH_ERR_UNEXPECTED_TRAILING_DATA;
|
|
goto out;
|
|
@@ -180,6 +191,8 @@ ssh_ecdsa_verify(const struct sshkey *key,
|
|
sshbuf_free(sigbuf);
|
|
sshbuf_free(b);
|
|
ECDSA_SIG_free(sig);
|
|
+ BN_clear_free(sig_r);
|
|
+ BN_clear_free(sig_s);
|
|
free(ktype);
|
|
return ret;
|
|
}
|
|
diff --git a/ssh-keygen.c b/ssh-keygen.c
|
|
index 22860ad9..f240af66 100644
|
|
--- a/ssh-keygen.c
|
|
+++ b/ssh-keygen.c
|
|
@@ -450,7 +450,10 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
|
|
u_int magic, i1, i2, i3, i4;
|
|
size_t slen;
|
|
u_long e;
|
|
-
|
|
+ BIGNUM *dsa_p = NULL, *dsa_q = NULL, *dsa_g = NULL;
|
|
+ BIGNUM *dsa_pub_key = NULL, *dsa_priv_key = NULL;
|
|
+ BIGNUM *rsa_n = NULL, *rsa_e = NULL, *rsa_d = NULL;
|
|
+ BIGNUM *rsa_p = NULL, *rsa_q = NULL, *rsa_iqmp = NULL;
|
|
if ((b = sshbuf_from(blob, blen)) == NULL)
|
|
fatal("%s: sshbuf_from failed", __func__);
|
|
if ((r = sshbuf_get_u32(b, &magic)) != 0)
|
|
@@ -494,11 +497,23 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
|
|
|
|
switch (key->type) {
|
|
case KEY_DSA:
|
|
- buffer_get_bignum_bits(b, key->dsa->p);
|
|
- buffer_get_bignum_bits(b, key->dsa->g);
|
|
- buffer_get_bignum_bits(b, key->dsa->q);
|
|
- buffer_get_bignum_bits(b, key->dsa->pub_key);
|
|
- buffer_get_bignum_bits(b, key->dsa->priv_key);
|
|
+ if ((dsa_p = BN_new()) == NULL ||
|
|
+ (dsa_q = BN_new()) == NULL ||
|
|
+ (dsa_g = BN_new()) == NULL ||
|
|
+ (dsa_pub_key = BN_new()) == NULL ||
|
|
+ (dsa_priv_key = BN_new()) == NULL)
|
|
+ fatal("%s: BN_new", __func__);
|
|
+ buffer_get_bignum_bits(b, dsa_p);
|
|
+ buffer_get_bignum_bits(b, dsa_g);
|
|
+ buffer_get_bignum_bits(b, dsa_q);
|
|
+ buffer_get_bignum_bits(b, dsa_pub_key);
|
|
+ buffer_get_bignum_bits(b, dsa_priv_key);
|
|
+ if (!DSA_set0_pqg(key->dsa, dsa_p, dsa_q, dsa_g))
|
|
+ fatal("%s: DSA_set0_pqg failed", __func__);
|
|
+ dsa_p = dsa_q = dsa_g = NULL; /* transferred */
|
|
+ if (!DSA_set0_key(key->dsa, dsa_pub_key, dsa_priv_key))
|
|
+ fatal("%s: DSA_set0_key failed", __func__);
|
|
+ dsa_pub_key = dsa_priv_key = NULL; /* transferred */
|
|
break;
|
|
case KEY_RSA:
|
|
if ((r = sshbuf_get_u8(b, &e1)) != 0 ||
|
|
@@ -515,18 +530,34 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
|
|
e += e3;
|
|
debug("e %lx", e);
|
|
}
|
|
- if (!BN_set_word(key->rsa->e, e)) {
|
|
+ if ((rsa_e = BN_new()) == NULL)
|
|
+ fatal("%s: BN_new", __func__);
|
|
+ if (!BN_set_word(rsa_e, e)) {
|
|
+ BN_clear_free(rsa_e);
|
|
sshbuf_free(b);
|
|
sshkey_free(key);
|
|
return NULL;
|
|
}
|
|
- buffer_get_bignum_bits(b, key->rsa->d);
|
|
- buffer_get_bignum_bits(b, key->rsa->n);
|
|
- 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 = ssh_rsa_generate_additional_parameters(key)) != 0)
|
|
+ if ((rsa_n = BN_new()) == NULL ||
|
|
+ (rsa_d = BN_new()) == NULL ||
|
|
+ (rsa_p = BN_new()) == NULL ||
|
|
+ (rsa_q = BN_new()) == NULL ||
|
|
+ (rsa_iqmp = BN_new()) == NULL)
|
|
+ fatal("%s: BN_new", __func__);
|
|
+ buffer_get_bignum_bits(b, rsa_d);
|
|
+ buffer_get_bignum_bits(b, rsa_n);
|
|
+ buffer_get_bignum_bits(b, rsa_iqmp);
|
|
+ buffer_get_bignum_bits(b, rsa_q);
|
|
+ buffer_get_bignum_bits(b, rsa_p);
|
|
+ if (!RSA_set0_key(key->rsa, rsa_n, rsa_e, rsa_d))
|
|
+ fatal("%s: RSA_set0_key failed", __func__);
|
|
+ rsa_n = rsa_e = rsa_d = NULL; /* transferred */
|
|
+ if (!RSA_set0_factors(key->rsa, rsa_p, rsa_q))
|
|
+ fatal("%s: RSA_set0_factors failed", __func__);
|
|
+ rsa_p = rsa_q = NULL; /* transferred */
|
|
+ if ((r = ssh_rsa_complete_crt_parameters(key, rsa_iqmp)) != 0)
|
|
fatal("generate RSA parameters failed: %s", ssh_err(r));
|
|
+ BN_clear_free(rsa_iqmp);
|
|
break;
|
|
}
|
|
rlen = sshbuf_len(b);
|
|
@@ -634,7 +665,7 @@ do_convert_from_pkcs8(struct sshkey **k, int *private)
|
|
identity_file);
|
|
}
|
|
fclose(fp);
|
|
- switch (EVP_PKEY_type(pubkey->type)) {
|
|
+ switch (EVP_PKEY_base_id(pubkey)) {
|
|
case EVP_PKEY_RSA:
|
|
if ((*k = sshkey_new(KEY_UNSPEC)) == NULL)
|
|
fatal("sshkey_new failed");
|
|
@@ -658,7 +689,7 @@ do_convert_from_pkcs8(struct sshkey **k, int *private)
|
|
#endif
|
|
default:
|
|
fatal("%s: unsupported pubkey type %d", __func__,
|
|
- EVP_PKEY_type(pubkey->type));
|
|
+ EVP_PKEY_base_id(pubkey));
|
|
}
|
|
EVP_PKEY_free(pubkey);
|
|
return;
|
|
diff --git a/ssh-pkcs11-client.c b/ssh-pkcs11-client.c
|
|
index 028b272c..bcc18c6b 100644
|
|
--- a/ssh-pkcs11-client.c
|
|
+++ b/ssh-pkcs11-client.c
|
|
@@ -156,12 +156,14 @@ pkcs11_rsa_private_encrypt(int flen, const u_char *from, u_char *to, RSA *rsa,
|
|
static int
|
|
wrap_key(RSA *rsa)
|
|
{
|
|
- static RSA_METHOD helper_rsa;
|
|
+ static RSA_METHOD *helper_rsa;
|
|
|
|
- memcpy(&helper_rsa, RSA_get_default_method(), sizeof(helper_rsa));
|
|
- helper_rsa.name = "ssh-pkcs11-helper";
|
|
- helper_rsa.rsa_priv_enc = pkcs11_rsa_private_encrypt;
|
|
- RSA_set_method(rsa, &helper_rsa);
|
|
+ if ((helper_rsa = RSA_meth_dup(RSA_get_default_method())) == NULL)
|
|
+ fatal("%s: RSA_meth_dup failed", __func__);
|
|
+ if (!RSA_meth_set1_name(helper_rsa, "ssh-pkcs11-helper") ||
|
|
+ !RSA_meth_set_priv_enc(helper_rsa, pkcs11_rsa_private_encrypt))
|
|
+ fatal("%s: failed to prepare method", __func__);
|
|
+ RSA_set_method(rsa, helper_rsa);
|
|
return (0);
|
|
}
|
|
|
|
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
|
|
index 65a7b589..c35f9415 100644
|
|
--- a/ssh-pkcs11.c
|
|
+++ b/ssh-pkcs11.c
|
|
@@ -67,7 +67,7 @@ struct pkcs11_key {
|
|
struct pkcs11_provider *provider;
|
|
CK_ULONG slotidx;
|
|
int (*orig_finish)(RSA *rsa);
|
|
- RSA_METHOD rsa_method;
|
|
+ RSA_METHOD *rsa_method;
|
|
char *keyid;
|
|
int keyid_len;
|
|
};
|
|
@@ -182,6 +182,7 @@ pkcs11_rsa_finish(RSA *rsa)
|
|
rv = k11->orig_finish(rsa);
|
|
if (k11->provider)
|
|
pkcs11_provider_unref(k11->provider);
|
|
+ RSA_meth_free(k11->rsa_method);
|
|
free(k11->keyid);
|
|
free(k11);
|
|
}
|
|
@@ -326,13 +327,18 @@ pkcs11_rsa_wrap(struct pkcs11_provider *provider, CK_ULONG slotidx,
|
|
k11->keyid = xmalloc(k11->keyid_len);
|
|
memcpy(k11->keyid, keyid_attrib->pValue, k11->keyid_len);
|
|
}
|
|
- k11->orig_finish = def->finish;
|
|
- memcpy(&k11->rsa_method, def, sizeof(k11->rsa_method));
|
|
- k11->rsa_method.name = "pkcs11";
|
|
- k11->rsa_method.rsa_priv_enc = pkcs11_rsa_private_encrypt;
|
|
- k11->rsa_method.rsa_priv_dec = pkcs11_rsa_private_decrypt;
|
|
- k11->rsa_method.finish = pkcs11_rsa_finish;
|
|
- RSA_set_method(rsa, &k11->rsa_method);
|
|
+ k11->rsa_method = RSA_meth_dup(def);
|
|
+ if (k11->rsa_method == NULL)
|
|
+ fatal("%s: RSA_meth_dup failed", __func__);
|
|
+ k11->orig_finish = RSA_meth_get_finish(def);
|
|
+ if (!RSA_meth_set1_name(k11->rsa_method, "pkcs11") ||
|
|
+ !RSA_meth_set_priv_enc(k11->rsa_method,
|
|
+ pkcs11_rsa_private_encrypt) ||
|
|
+ !RSA_meth_set_priv_dec(k11->rsa_method,
|
|
+ pkcs11_rsa_private_decrypt) ||
|
|
+ !RSA_meth_set_finish(k11->rsa_method, pkcs11_rsa_finish))
|
|
+ fatal("%s: setup pkcs11 method failed", __func__);
|
|
+ RSA_set_method(rsa, k11->rsa_method);
|
|
RSA_set_app_data(rsa, k11);
|
|
return (0);
|
|
}
|
|
@@ -444,6 +450,15 @@ pkcs11_key_included(struct sshkey ***keysp, int *nkeys, struct sshkey *key)
|
|
return (0);
|
|
}
|
|
|
|
+static int
|
|
+have_rsa_key(const RSA *rsa)
|
|
+{
|
|
+ const BIGNUM *rsa_n, *rsa_e;
|
|
+
|
|
+ RSA_get0_key(rsa, &rsa_n, &rsa_e, NULL);
|
|
+ return rsa_n != NULL && rsa_e != NULL;
|
|
+}
|
|
+
|
|
static int
|
|
pkcs11_fetch_keys_filter(struct pkcs11_provider *p, CK_ULONG slotidx,
|
|
CK_ATTRIBUTE filter[], CK_ATTRIBUTE attribs[3],
|
|
@@ -512,10 +527,20 @@ pkcs11_fetch_keys_filter(struct pkcs11_provider *p, CK_ULONG slotidx,
|
|
if ((rsa = RSA_new()) == NULL) {
|
|
error("RSA_new failed");
|
|
} else {
|
|
- rsa->n = BN_bin2bn(attribs[1].pValue,
|
|
+ BIGNUM *rsa_n, *rsa_e;
|
|
+
|
|
+ rsa_n = BN_bin2bn(attribs[1].pValue,
|
|
attribs[1].ulValueLen, NULL);
|
|
- rsa->e = BN_bin2bn(attribs[2].pValue,
|
|
+ rsa_e = BN_bin2bn(attribs[2].pValue,
|
|
attribs[2].ulValueLen, NULL);
|
|
+ if (rsa_n != NULL && rsa_e != NULL) {
|
|
+ if (!RSA_set0_key(rsa,
|
|
+ rsa_n, rsa_e, NULL))
|
|
+ fatal("%s: set key", __func__);
|
|
+ rsa_n = rsa_e = NULL; /* transferred */
|
|
+ }
|
|
+ BN_free(rsa_n);
|
|
+ BN_free(rsa_e);
|
|
}
|
|
} else {
|
|
cp = attribs[2].pValue;
|
|
@@ -525,16 +550,16 @@ pkcs11_fetch_keys_filter(struct pkcs11_provider *p, CK_ULONG slotidx,
|
|
== NULL) {
|
|
error("d2i_X509 failed");
|
|
} else if ((evp = X509_get_pubkey(x509)) == NULL ||
|
|
- evp->type != EVP_PKEY_RSA ||
|
|
- evp->pkey.rsa == NULL) {
|
|
+ EVP_PKEY_base_id(evp) != EVP_PKEY_RSA ||
|
|
+ EVP_PKEY_get0_RSA(evp) == NULL) {
|
|
debug("X509_get_pubkey failed or no rsa");
|
|
- } else if ((rsa = RSAPublicKey_dup(evp->pkey.rsa))
|
|
- == NULL) {
|
|
+ } else if ((rsa = RSAPublicKey_dup(
|
|
+ EVP_PKEY_get0_RSA(evp))) == NULL) {
|
|
error("RSAPublicKey_dup");
|
|
}
|
|
X509_free(x509);
|
|
}
|
|
- if (rsa && rsa->n && rsa->e &&
|
|
+ if (rsa && have_rsa_key(rsa) &&
|
|
pkcs11_rsa_wrap(p, slotidx, &attribs[0], rsa) == 0) {
|
|
if ((key = sshkey_new(KEY_UNSPEC)) == NULL)
|
|
fatal("sshkey_new failed");
|
|
diff --git a/ssh-rsa.c b/ssh-rsa.c
|
|
index 1756315b..2788f334 100644
|
|
--- a/ssh-rsa.c
|
|
+++ b/ssh-rsa.c
|
|
@@ -104,38 +104,55 @@ rsa_hash_alg_nid(int type)
|
|
}
|
|
|
|
int
|
|
-ssh_rsa_generate_additional_parameters(struct sshkey *key)
|
|
+ssh_rsa_complete_crt_parameters(struct sshkey *key, const BIGNUM *iqmp)
|
|
{
|
|
- BIGNUM *aux = NULL;
|
|
+ const BIGNUM *rsa_p, *rsa_q, *rsa_d;
|
|
+ BIGNUM *aux = NULL, *d_consttime = NULL;
|
|
+ BIGNUM *rsa_dmq1 = NULL, *rsa_dmp1 = NULL, *rsa_iqmp = NULL;
|
|
BN_CTX *ctx = NULL;
|
|
- BIGNUM d;
|
|
int r;
|
|
|
|
if (key == NULL || key->rsa == NULL ||
|
|
sshkey_type_plain(key->type) != KEY_RSA)
|
|
return SSH_ERR_INVALID_ARGUMENT;
|
|
|
|
+ RSA_get0_key(key->rsa, NULL, NULL, &rsa_d);
|
|
+ RSA_get0_factors(key->rsa, &rsa_p, &rsa_q);
|
|
+
|
|
if ((ctx = BN_CTX_new()) == NULL)
|
|
return SSH_ERR_ALLOC_FAIL;
|
|
- if ((aux = BN_new()) == NULL) {
|
|
+ if ((aux = BN_new()) == NULL ||
|
|
+ (rsa_dmq1 = BN_new()) == NULL ||
|
|
+ (rsa_dmp1 = BN_new()) == NULL)
|
|
+ return SSH_ERR_ALLOC_FAIL;
|
|
+ if ((d_consttime = BN_dup(rsa_d)) == NULL ||
|
|
+ (rsa_iqmp = BN_dup(iqmp)) == NULL) {
|
|
r = SSH_ERR_ALLOC_FAIL;
|
|
goto out;
|
|
}
|
|
BN_set_flags(aux, BN_FLG_CONSTTIME);
|
|
+ BN_set_flags(d_consttime, BN_FLG_CONSTTIME);
|
|
|
|
- BN_init(&d);
|
|
- BN_with_flags(&d, key->rsa->d, BN_FLG_CONSTTIME);
|
|
-
|
|
- if ((BN_sub(aux, key->rsa->q, BN_value_one()) == 0) ||
|
|
- (BN_mod(key->rsa->dmq1, &d, aux, ctx) == 0) ||
|
|
- (BN_sub(aux, key->rsa->p, BN_value_one()) == 0) ||
|
|
- (BN_mod(key->rsa->dmp1, &d, aux, ctx) == 0)) {
|
|
+ if ((BN_sub(aux, rsa_q, BN_value_one()) == 0) ||
|
|
+ (BN_mod(rsa_dmq1, d_consttime, aux, ctx) == 0) ||
|
|
+ (BN_sub(aux, rsa_p, BN_value_one()) == 0) ||
|
|
+ (BN_mod(rsa_dmp1, d_consttime, aux, ctx) == 0)) {
|
|
+ r = SSH_ERR_LIBCRYPTO_ERROR;
|
|
+ goto out;
|
|
+ }
|
|
+ if (!RSA_set0_crt_params(key->rsa, rsa_dmp1, rsa_dmq1, rsa_iqmp)) {
|
|
r = SSH_ERR_LIBCRYPTO_ERROR;
|
|
goto out;
|
|
}
|
|
+ rsa_dmp1 = rsa_dmq1 = rsa_iqmp = NULL; /* transferred */
|
|
+ /* success */
|
|
r = 0;
|
|
out:
|
|
BN_clear_free(aux);
|
|
+ BN_clear_free(d_consttime);
|
|
+ BN_clear_free(rsa_dmp1);
|
|
+ BN_clear_free(rsa_dmq1);
|
|
+ BN_clear_free(rsa_iqmp);
|
|
BN_CTX_free(ctx);
|
|
return r;
|
|
}
|
|
@@ -145,6 +162,7 @@ int
|
|
ssh_rsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
|
|
const u_char *data, size_t datalen, const char *alg_ident)
|
|
{
|
|
+ const BIGNUM *rsa_n;
|
|
u_char digest[SSH_DIGEST_MAX_LENGTH], *sig = NULL;
|
|
size_t slen = 0;
|
|
u_int dlen, len;
|
|
@@ -163,7 +181,8 @@ ssh_rsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
|
|
if (key == NULL || key->rsa == NULL || hash_alg == -1 ||
|
|
sshkey_type_plain(key->type) != KEY_RSA)
|
|
return SSH_ERR_INVALID_ARGUMENT;
|
|
- if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE)
|
|
+ RSA_get0_key(key->rsa, &rsa_n, NULL, NULL);
|
|
+ if (BN_num_bits(rsa_n) < SSH_RSA_MINIMUM_MODULUS_SIZE)
|
|
return SSH_ERR_KEY_LENGTH;
|
|
slen = RSA_size(key->rsa);
|
|
if (slen <= 0 || slen > SSHBUF_MAX_BIGNUM)
|
|
@@ -225,6 +244,7 @@ ssh_rsa_verify(const struct sshkey *key,
|
|
const u_char *sig, size_t siglen, const u_char *data, size_t datalen,
|
|
const char *alg)
|
|
{
|
|
+ const BIGNUM *rsa_n;
|
|
char *sigtype = NULL;
|
|
int hash_alg, want_alg, ret = SSH_ERR_INTERNAL_ERROR;
|
|
size_t len = 0, diff, modlen, dlen;
|
|
@@ -235,7 +255,8 @@ ssh_rsa_verify(const struct sshkey *key,
|
|
sshkey_type_plain(key->type) != KEY_RSA ||
|
|
sig == NULL || siglen == 0)
|
|
return SSH_ERR_INVALID_ARGUMENT;
|
|
- if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE)
|
|
+ RSA_get0_key(key->rsa, &rsa_n, NULL, NULL);
|
|
+ if (BN_num_bits(rsa_n) < SSH_RSA_MINIMUM_MODULUS_SIZE)
|
|
return SSH_ERR_KEY_LENGTH;
|
|
|
|
if ((b = sshbuf_from(sig, siglen)) == NULL)
|
|
diff --git a/sshd.c b/sshd.c
|
|
index a738c3ab..98beb1ed 100644
|
|
--- a/sshd.c
|
|
+++ b/sshd.c
|
|
@@ -493,8 +493,8 @@ demote_sensitive_data(void)
|
|
|
|
for (i = 0; i < options.num_host_key_files; i++) {
|
|
if (sensitive_data.host_keys[i]) {
|
|
- if ((r = sshkey_demote(sensitive_data.host_keys[i],
|
|
- &tmp)) != 0)
|
|
+ if ((r = sshkey_from_private(
|
|
+ sensitive_data.host_keys[i], &tmp)) != 0)
|
|
fatal("could not demote host %s key: %s",
|
|
sshkey_type(sensitive_data.host_keys[i]),
|
|
ssh_err(r));
|
|
@@ -1772,7 +1772,7 @@ main(int ac, char **av)
|
|
error("Error loading host key \"%s\": %s",
|
|
options.host_key_files[i], ssh_err(r));
|
|
if (pubkey == NULL && key != NULL)
|
|
- if ((r = sshkey_demote(key, &pubkey)) != 0)
|
|
+ if ((r = sshkey_from_private(key, &pubkey)) != 0)
|
|
fatal("Could not demote key: \"%s\": %s",
|
|
options.host_key_files[i], ssh_err(r));
|
|
sensitive_data.host_keys[i] = key;
|
|
diff --git a/sshkey.c b/sshkey.c
|
|
index 72c08c7e..a5e6e60e 100644
|
|
--- a/sshkey.c
|
|
+++ b/sshkey.c
|
|
@@ -288,14 +288,24 @@ sshkey_names_valid2(const char *names, int allow_wildcard)
|
|
u_int
|
|
sshkey_size(const struct sshkey *k)
|
|
{
|
|
+#ifdef WITH_OPENSSL
|
|
+ const BIGNUM *rsa_n, *dsa_p;
|
|
+#endif /* WITH_OPENSSL */
|
|
+
|
|
switch (k->type) {
|
|
#ifdef WITH_OPENSSL
|
|
case KEY_RSA:
|
|
case KEY_RSA_CERT:
|
|
- return BN_num_bits(k->rsa->n);
|
|
+ if (k->rsa == NULL)
|
|
+ return 0;
|
|
+ RSA_get0_key(k->rsa, &rsa_n, NULL, NULL);
|
|
+ return BN_num_bits(rsa_n);
|
|
case KEY_DSA:
|
|
case KEY_DSA_CERT:
|
|
- return BN_num_bits(k->dsa->p);
|
|
+ if (k->dsa == NULL)
|
|
+ return 0;
|
|
+ DSA_get0_pqg(k->dsa, &dsa_p, NULL, NULL);
|
|
+ return BN_num_bits(dsa_p);
|
|
case KEY_ECDSA:
|
|
case KEY_ECDSA_CERT:
|
|
return sshkey_curve_nid_to_bits(k->ecdsa_nid);
|
|
@@ -500,10 +510,7 @@ sshkey_new(int type)
|
|
#ifdef WITH_OPENSSL
|
|
case KEY_RSA:
|
|
case KEY_RSA_CERT:
|
|
- if ((rsa = RSA_new()) == NULL ||
|
|
- (rsa->n = BN_new()) == NULL ||
|
|
- (rsa->e = BN_new()) == NULL) {
|
|
- RSA_free(rsa);
|
|
+ if ((rsa = RSA_new()) == NULL) {
|
|
free(k);
|
|
return NULL;
|
|
}
|
|
@@ -511,12 +518,7 @@ sshkey_new(int type)
|
|
break;
|
|
case KEY_DSA:
|
|
case KEY_DSA_CERT:
|
|
- if ((dsa = DSA_new()) == NULL ||
|
|
- (dsa->p = BN_new()) == NULL ||
|
|
- (dsa->q = BN_new()) == NULL ||
|
|
- (dsa->g = BN_new()) == NULL ||
|
|
- (dsa->pub_key = BN_new()) == NULL) {
|
|
- DSA_free(dsa);
|
|
+ if ((dsa = DSA_new()) == NULL) {
|
|
free(k);
|
|
return NULL;
|
|
}
|
|
@@ -550,47 +552,7 @@ sshkey_new(int type)
|
|
return k;
|
|
}
|
|
|
|
-int
|
|
-sshkey_add_private(struct sshkey *k)
|
|
-{
|
|
- switch (k->type) {
|
|
-#ifdef WITH_OPENSSL
|
|
- case KEY_RSA:
|
|
- case KEY_RSA_CERT:
|
|
-#define bn_maybe_alloc_failed(p) (p == NULL && (p = BN_new()) == NULL)
|
|
- if (bn_maybe_alloc_failed(k->rsa->d) ||
|
|
- bn_maybe_alloc_failed(k->rsa->iqmp) ||
|
|
- bn_maybe_alloc_failed(k->rsa->q) ||
|
|
- bn_maybe_alloc_failed(k->rsa->p) ||
|
|
- bn_maybe_alloc_failed(k->rsa->dmq1) ||
|
|
- bn_maybe_alloc_failed(k->rsa->dmp1))
|
|
- return SSH_ERR_ALLOC_FAIL;
|
|
- break;
|
|
- case KEY_DSA:
|
|
- case KEY_DSA_CERT:
|
|
- if (bn_maybe_alloc_failed(k->dsa->priv_key))
|
|
- return SSH_ERR_ALLOC_FAIL;
|
|
- break;
|
|
-#undef bn_maybe_alloc_failed
|
|
- case KEY_ECDSA:
|
|
- case KEY_ECDSA_CERT:
|
|
- /* Cannot do anything until we know the group */
|
|
- break;
|
|
-#endif /* WITH_OPENSSL */
|
|
- case KEY_ED25519:
|
|
- case KEY_ED25519_CERT:
|
|
- case KEY_XMSS:
|
|
- case KEY_XMSS_CERT:
|
|
- /* no need to prealloc */
|
|
- break;
|
|
- case KEY_UNSPEC:
|
|
- break;
|
|
- default:
|
|
- return SSH_ERR_INVALID_ARGUMENT;
|
|
- }
|
|
- return 0;
|
|
-}
|
|
-
|
|
+/* XXX garbage-collect this API */
|
|
struct sshkey *
|
|
sshkey_new_private(int type)
|
|
{
|
|
@@ -598,10 +560,6 @@ sshkey_new_private(int type)
|
|
|
|
if (k == NULL)
|
|
return NULL;
|
|
- if (sshkey_add_private(k) != 0) {
|
|
- sshkey_free(k);
|
|
- return NULL;
|
|
- }
|
|
return k;
|
|
}
|
|
|
|
@@ -683,9 +641,15 @@ cert_compare(struct sshkey_cert *a, struct sshkey_cert *b)
|
|
int
|
|
sshkey_equal_public(const struct sshkey *a, const struct sshkey *b)
|
|
{
|
|
-#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
|
|
+#if defined(WITH_OPENSSL)
|
|
+ const BIGNUM *rsa_e_a, *rsa_n_a;
|
|
+ const BIGNUM *rsa_e_b, *rsa_n_b;
|
|
+ const BIGNUM *dsa_p_a, *dsa_q_a, *dsa_g_a, *dsa_pub_key_a;
|
|
+ const BIGNUM *dsa_p_b, *dsa_q_b, *dsa_g_b, *dsa_pub_key_b;
|
|
+# if defined(OPENSSL_HAS_ECC)
|
|
BN_CTX *bnctx;
|
|
-#endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */
|
|
+# endif /* OPENSSL_HAS_ECC */
|
|
+#endif /* WITH_OPENSSL */
|
|
|
|
if (a == NULL || b == NULL ||
|
|
sshkey_type_plain(a->type) != sshkey_type_plain(b->type))
|
|
@@ -695,16 +659,24 @@ sshkey_equal_public(const struct sshkey *a, const struct sshkey *b)
|
|
#ifdef WITH_OPENSSL
|
|
case KEY_RSA_CERT:
|
|
case KEY_RSA:
|
|
- return a->rsa != NULL && b->rsa != NULL &&
|
|
- BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
|
|
- BN_cmp(a->rsa->n, b->rsa->n) == 0;
|
|
+ if (a->rsa == NULL || b->rsa == NULL)
|
|
+ return 0;
|
|
+ RSA_get0_key(a->rsa, &rsa_n_a, &rsa_e_a, NULL);
|
|
+ RSA_get0_key(b->rsa, &rsa_n_b, &rsa_e_b, NULL);
|
|
+ return BN_cmp(rsa_e_a, rsa_e_b) == 0 &&
|
|
+ BN_cmp(rsa_n_a, rsa_n_b) == 0;
|
|
case KEY_DSA_CERT:
|
|
case KEY_DSA:
|
|
- return a->dsa != NULL && b->dsa != NULL &&
|
|
- BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
|
|
- BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
|
|
- BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
|
|
- BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
|
|
+ if (a->dsa == NULL || b->dsa == NULL)
|
|
+ return 0;
|
|
+ DSA_get0_pqg(a->dsa, &dsa_p_a, &dsa_q_a, &dsa_g_a);
|
|
+ DSA_get0_pqg(b->dsa, &dsa_p_b, &dsa_q_b, &dsa_g_b);
|
|
+ DSA_get0_key(a->dsa, &dsa_pub_key_a, NULL);
|
|
+ DSA_get0_key(b->dsa, &dsa_pub_key_b, NULL);
|
|
+ return BN_cmp(dsa_p_a, dsa_p_b) == 0 &&
|
|
+ BN_cmp(dsa_q_a, dsa_q_b) == 0 &&
|
|
+ BN_cmp(dsa_g_a, dsa_g_b) == 0 &&
|
|
+ BN_cmp(dsa_pub_key_a, dsa_pub_key_b) == 0;
|
|
# ifdef OPENSSL_HAS_ECC
|
|
case KEY_ECDSA_CERT:
|
|
case KEY_ECDSA:
|
|
@@ -761,6 +733,9 @@ to_blob_buf(const struct sshkey *key, struct sshbuf *b, int force_plain,
|
|
{
|
|
int type, ret = SSH_ERR_INTERNAL_ERROR;
|
|
const char *typename;
|
|
+#ifdef WITH_OPENSSL
|
|
+ const BIGNUM *rsa_n, *rsa_e, *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
|
|
+#endif /* WITH_OPENSSL */
|
|
|
|
if (key == NULL)
|
|
return SSH_ERR_INVALID_ARGUMENT;
|
|
@@ -793,11 +768,13 @@ to_blob_buf(const struct sshkey *key, struct sshbuf *b, int force_plain,
|
|
case KEY_DSA:
|
|
if (key->dsa == NULL)
|
|
return SSH_ERR_INVALID_ARGUMENT;
|
|
+ DSA_get0_pqg(key->dsa, &dsa_p, &dsa_q, &dsa_g);
|
|
+ DSA_get0_key(key->dsa, &dsa_pub_key, NULL);
|
|
if ((ret = sshbuf_put_cstring(b, typename)) != 0 ||
|
|
- (ret = sshbuf_put_bignum2(b, key->dsa->p)) != 0 ||
|
|
- (ret = sshbuf_put_bignum2(b, key->dsa->q)) != 0 ||
|
|
- (ret = sshbuf_put_bignum2(b, key->dsa->g)) != 0 ||
|
|
- (ret = sshbuf_put_bignum2(b, key->dsa->pub_key)) != 0)
|
|
+ (ret = sshbuf_put_bignum2(b, dsa_p)) != 0 ||
|
|
+ (ret = sshbuf_put_bignum2(b, dsa_q)) != 0 ||
|
|
+ (ret = sshbuf_put_bignum2(b, dsa_g)) != 0 ||
|
|
+ (ret = sshbuf_put_bignum2(b, dsa_pub_key)) != 0)
|
|
return ret;
|
|
break;
|
|
# ifdef OPENSSL_HAS_ECC
|
|
@@ -814,9 +791,10 @@ to_blob_buf(const struct sshkey *key, struct sshbuf *b, int force_plain,
|
|
case KEY_RSA:
|
|
if (key->rsa == NULL)
|
|
return SSH_ERR_INVALID_ARGUMENT;
|
|
+ RSA_get0_key(key->rsa, &rsa_n, &rsa_e, NULL);
|
|
if ((ret = sshbuf_put_cstring(b, typename)) != 0 ||
|
|
- (ret = sshbuf_put_bignum2(b, key->rsa->e)) != 0 ||
|
|
- (ret = sshbuf_put_bignum2(b, key->rsa->n)) != 0)
|
|
+ (ret = sshbuf_put_bignum2(b, rsa_e)) != 0 ||
|
|
+ (ret = sshbuf_put_bignum2(b, rsa_n)) != 0)
|
|
return ret;
|
|
break;
|
|
#endif /* WITH_OPENSSL */
|
|
@@ -1750,59 +1728,95 @@ sshkey_from_private(const struct sshkey *k, struct sshkey **pkp)
|
|
{
|
|
struct sshkey *n = NULL;
|
|
int ret = SSH_ERR_INTERNAL_ERROR;
|
|
+ int r = SSH_ERR_INTERNAL_ERROR;
|
|
+#ifdef WITH_OPENSSL
|
|
+ const BIGNUM *rsa_n, *rsa_e;
|
|
+ BIGNUM *rsa_n_dup = NULL, *rsa_e_dup = NULL;
|
|
+ const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
|
|
+ BIGNUM *dsa_p_dup = NULL, *dsa_q_dup = NULL, *dsa_g_dup = NULL;
|
|
+ BIGNUM *dsa_pub_key_dup = NULL;
|
|
+#endif /* WITH_OPENSSL */
|
|
|
|
*pkp = NULL;
|
|
switch (k->type) {
|
|
#ifdef WITH_OPENSSL
|
|
case KEY_DSA:
|
|
case KEY_DSA_CERT:
|
|
- if ((n = sshkey_new(k->type)) == NULL)
|
|
- return SSH_ERR_ALLOC_FAIL;
|
|
- if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
|
|
- (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
|
|
- (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
|
|
- (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL)) {
|
|
- sshkey_free(n);
|
|
- return SSH_ERR_ALLOC_FAIL;
|
|
+ if ((n = sshkey_new(k->type)) == NULL) {
|
|
+ r = SSH_ERR_ALLOC_FAIL;
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ DSA_get0_pqg(k->dsa, &dsa_p, &dsa_q, &dsa_g);
|
|
+ DSA_get0_key(k->dsa, &dsa_pub_key, NULL);
|
|
+ if ((dsa_p_dup = BN_dup(dsa_p)) == NULL ||
|
|
+ (dsa_q_dup = BN_dup(dsa_q)) == NULL ||
|
|
+ (dsa_g_dup = BN_dup(dsa_g)) == NULL ||
|
|
+ (dsa_pub_key_dup = BN_dup(dsa_pub_key)) == NULL) {
|
|
+ r = SSH_ERR_ALLOC_FAIL;
|
|
+ goto out;
|
|
+ }
|
|
+ if (!DSA_set0_pqg(n->dsa, dsa_p_dup, dsa_q_dup, dsa_g_dup)) {
|
|
+ r = SSH_ERR_LIBCRYPTO_ERROR;
|
|
+ goto out;
|
|
+ }
|
|
+ dsa_p_dup = dsa_q_dup = dsa_g_dup = NULL; /* transferred */
|
|
+ if (!DSA_set0_key(n->dsa, dsa_pub_key_dup, NULL)) {
|
|
+ r = SSH_ERR_LIBCRYPTO_ERROR;
|
|
+ goto out;
|
|
}
|
|
+ dsa_pub_key_dup = NULL; /* transferred */
|
|
+
|
|
break;
|
|
# ifdef OPENSSL_HAS_ECC
|
|
case KEY_ECDSA:
|
|
case KEY_ECDSA_CERT:
|
|
- if ((n = sshkey_new(k->type)) == NULL)
|
|
- return SSH_ERR_ALLOC_FAIL;
|
|
+ if ((n = sshkey_new(k->type)) == NULL) {
|
|
+ r = SSH_ERR_ALLOC_FAIL;
|
|
+ goto out;
|
|
+ }
|
|
n->ecdsa_nid = k->ecdsa_nid;
|
|
n->ecdsa = EC_KEY_new_by_curve_name(k->ecdsa_nid);
|
|
if (n->ecdsa == NULL) {
|
|
- sshkey_free(n);
|
|
- return SSH_ERR_ALLOC_FAIL;
|
|
+ r = SSH_ERR_ALLOC_FAIL;
|
|
+ goto out;
|
|
}
|
|
if (EC_KEY_set_public_key(n->ecdsa,
|
|
EC_KEY_get0_public_key(k->ecdsa)) != 1) {
|
|
- sshkey_free(n);
|
|
- return SSH_ERR_LIBCRYPTO_ERROR;
|
|
+ r = SSH_ERR_LIBCRYPTO_ERROR;
|
|
+ goto out;
|
|
}
|
|
break;
|
|
# endif /* OPENSSL_HAS_ECC */
|
|
case KEY_RSA:
|
|
case KEY_RSA_CERT:
|
|
- if ((n = sshkey_new(k->type)) == NULL)
|
|
- return SSH_ERR_ALLOC_FAIL;
|
|
- if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
|
|
- (BN_copy(n->rsa->e, k->rsa->e) == NULL)) {
|
|
- sshkey_free(n);
|
|
- return SSH_ERR_ALLOC_FAIL;
|
|
+ if ((n = sshkey_new(k->type)) == NULL) {
|
|
+ r = SSH_ERR_ALLOC_FAIL;
|
|
+ goto out;
|
|
}
|
|
+ RSA_get0_key(k->rsa, &rsa_n, &rsa_e, NULL);
|
|
+ if ((rsa_n_dup = BN_dup(rsa_n)) == NULL ||
|
|
+ (rsa_e_dup = BN_dup(rsa_e)) == NULL) {
|
|
+ r = SSH_ERR_ALLOC_FAIL;
|
|
+ goto out;
|
|
+ }
|
|
+ if (!RSA_set0_key(n->rsa, rsa_n_dup, rsa_e_dup, NULL)) {
|
|
+ r = SSH_ERR_LIBCRYPTO_ERROR;
|
|
+ goto out;
|
|
+ }
|
|
+ rsa_n_dup = rsa_e_dup = NULL; /* transferred */
|
|
break;
|
|
#endif /* WITH_OPENSSL */
|
|
case KEY_ED25519:
|
|
case KEY_ED25519_CERT:
|
|
- if ((n = sshkey_new(k->type)) == NULL)
|
|
- return SSH_ERR_ALLOC_FAIL;
|
|
+ if ((n = sshkey_new(k->type)) == NULL) {
|
|
+ r = SSH_ERR_ALLOC_FAIL;
|
|
+ goto out;
|
|
+ }
|
|
if (k->ed25519_pk != NULL) {
|
|
if ((n->ed25519_pk = malloc(ED25519_PK_SZ)) == NULL) {
|
|
- sshkey_free(n);
|
|
- return SSH_ERR_ALLOC_FAIL;
|
|
+ r = SSH_ERR_ALLOC_FAIL;
|
|
+ goto out;
|
|
}
|
|
memcpy(n->ed25519_pk, k->ed25519_pk, ED25519_PK_SZ);
|
|
}
|
|
@@ -1810,37 +1824,46 @@ sshkey_from_private(const struct sshkey *k, struct sshkey **pkp)
|
|
#ifdef WITH_XMSS
|
|
case KEY_XMSS:
|
|
case KEY_XMSS_CERT:
|
|
- if ((n = sshkey_new(k->type)) == NULL)
|
|
- return SSH_ERR_ALLOC_FAIL;
|
|
- if ((ret = sshkey_xmss_init(n, k->xmss_name)) != 0) {
|
|
- sshkey_free(n);
|
|
- return ret;
|
|
+ if ((n = sshkey_new(k->type)) == NULL) {
|
|
+ r = SSH_ERR_ALLOC_FAIL;
|
|
+ goto out;
|
|
}
|
|
+ if ((r = sshkey_xmss_init(n, k->xmss_name)) != 0)
|
|
+ goto out;
|
|
if (k->xmss_pk != NULL) {
|
|
size_t pklen = sshkey_xmss_pklen(k);
|
|
if (pklen == 0 || sshkey_xmss_pklen(n) != pklen) {
|
|
- sshkey_free(n);
|
|
- return SSH_ERR_INTERNAL_ERROR;
|
|
+ r = SSH_ERR_INTERNAL_ERROR;
|
|
+ goto out;
|
|
}
|
|
if ((n->xmss_pk = malloc(pklen)) == NULL) {
|
|
- sshkey_free(n);
|
|
- return SSH_ERR_ALLOC_FAIL;
|
|
+ r = SSH_ERR_ALLOC_FAIL;
|
|
+ goto out;
|
|
}
|
|
memcpy(n->xmss_pk, k->xmss_pk, pklen);
|
|
}
|
|
break;
|
|
#endif /* WITH_XMSS */
|
|
default:
|
|
- return SSH_ERR_KEY_TYPE_UNKNOWN;
|
|
- }
|
|
- if (sshkey_is_cert(k)) {
|
|
- if ((ret = sshkey_cert_copy(k, n)) != 0) {
|
|
- sshkey_free(n);
|
|
- return ret;
|
|
- }
|
|
+ r = SSH_ERR_KEY_TYPE_UNKNOWN;
|
|
+ goto out;
|
|
}
|
|
+ if (sshkey_is_cert(k) && (r = sshkey_cert_copy(k, n)) != 0)
|
|
+ goto out;
|
|
+ /* success */
|
|
*pkp = n;
|
|
- return 0;
|
|
+ n = NULL;
|
|
+ r = 0;
|
|
+ out:
|
|
+ sshkey_free(n);
|
|
+ BN_clear_free(rsa_n_dup);
|
|
+ BN_clear_free(rsa_e_dup);
|
|
+ BN_clear_free(dsa_p_dup);
|
|
+ BN_clear_free(dsa_q_dup);
|
|
+ BN_clear_free(dsa_g_dup);
|
|
+ BN_clear_free(dsa_pub_key_dup);
|
|
+
|
|
+ return r;
|
|
}
|
|
|
|
static int
|
|
@@ -1966,6 +1989,17 @@ cert_parse(struct sshbuf *b, struct sshkey *key, struct sshbuf *certbuf)
|
|
return ret;
|
|
}
|
|
|
|
+static int
|
|
+check_rsa_length(const RSA *rsa)
|
|
+{
|
|
+ const BIGNUM *rsa_n;
|
|
+
|
|
+ RSA_get0_key(rsa, &rsa_n, NULL, NULL);
|
|
+ if (BN_num_bits(rsa_n) < SSH_RSA_MINIMUM_MODULUS_SIZE)
|
|
+ return SSH_ERR_KEY_LENGTH;
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int
|
|
sshkey_from_blob_internal(struct sshbuf *b, struct sshkey **keyp,
|
|
int allow_cert)
|
|
@@ -1976,9 +2010,13 @@ sshkey_from_blob_internal(struct sshbuf *b, struct sshkey **keyp,
|
|
size_t len;
|
|
u_char *pk = NULL;
|
|
struct sshbuf *copy;
|
|
-#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
|
|
+#if defined(WITH_OPENSSL)
|
|
+ BIGNUM *rsa_n = NULL, *rsa_e = NULL;
|
|
+ BIGNUM *dsa_p = NULL, *dsa_q = NULL, *dsa_g = NULL, *dsa_pub_key = NULL;
|
|
+# if defined(OPENSSL_HAS_ECC)
|
|
EC_POINT *q = NULL;
|
|
-#endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */
|
|
+# endif /* OPENSSL_HAS_ECC */
|
|
+#endif /* WITH_OPENSSL */
|
|
|
|
#ifdef DEBUG_PK /* XXX */
|
|
sshbuf_dump(b, stderr);
|
|
@@ -2013,15 +2051,23 @@ sshkey_from_blob_internal(struct sshbuf *b, struct sshkey **keyp,
|
|
ret = SSH_ERR_ALLOC_FAIL;
|
|
goto out;
|
|
}
|
|
- if (sshbuf_get_bignum2(b, key->rsa->e) != 0 ||
|
|
- sshbuf_get_bignum2(b, key->rsa->n) != 0) {
|
|
+ if ((rsa_e = BN_new()) == NULL ||
|
|
+ (rsa_n = BN_new()) == NULL) {
|
|
+ ret = SSH_ERR_ALLOC_FAIL;
|
|
+ goto out;
|
|
+ }
|
|
+ if (sshbuf_get_bignum2(b, rsa_e) != 0 ||
|
|
+ sshbuf_get_bignum2(b, rsa_n) != 0) {
|
|
ret = SSH_ERR_INVALID_FORMAT;
|
|
goto out;
|
|
}
|
|
- if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
|
|
- ret = SSH_ERR_KEY_LENGTH;
|
|
+ if (!RSA_set0_key(key->rsa, rsa_n, rsa_e, NULL)) {
|
|
+ ret = SSH_ERR_LIBCRYPTO_ERROR;
|
|
goto out;
|
|
}
|
|
+ rsa_n = rsa_e = NULL; /* transferred */
|
|
+ if ((ret = check_rsa_length(key->rsa)) != 0)
|
|
+ goto out;
|
|
#ifdef DEBUG_PK
|
|
RSA_print_fp(stderr, key->rsa, 8);
|
|
#endif
|
|
@@ -2038,13 +2084,30 @@ sshkey_from_blob_internal(struct sshbuf *b, struct sshkey **keyp,
|
|
ret = SSH_ERR_ALLOC_FAIL;
|
|
goto out;
|
|
}
|
|
- if (sshbuf_get_bignum2(b, key->dsa->p) != 0 ||
|
|
- sshbuf_get_bignum2(b, key->dsa->q) != 0 ||
|
|
- sshbuf_get_bignum2(b, key->dsa->g) != 0 ||
|
|
- sshbuf_get_bignum2(b, key->dsa->pub_key) != 0) {
|
|
+ if ((dsa_p = BN_new()) == NULL ||
|
|
+ (dsa_q = BN_new()) == NULL ||
|
|
+ (dsa_g = BN_new()) == NULL ||
|
|
+ (dsa_pub_key = BN_new()) == NULL) {
|
|
+ ret = SSH_ERR_ALLOC_FAIL;
|
|
+ goto out;
|
|
+ }
|
|
+ if (sshbuf_get_bignum2(b, dsa_p) != 0 ||
|
|
+ sshbuf_get_bignum2(b, dsa_q) != 0 ||
|
|
+ sshbuf_get_bignum2(b, dsa_g) != 0 ||
|
|
+ sshbuf_get_bignum2(b, dsa_pub_key) != 0) {
|
|
ret = SSH_ERR_INVALID_FORMAT;
|
|
goto out;
|
|
}
|
|
+ if (!DSA_set0_pqg(key->dsa, dsa_p, dsa_q, dsa_g)) {
|
|
+ ret = SSH_ERR_LIBCRYPTO_ERROR;
|
|
+ goto out;
|
|
+ }
|
|
+ dsa_p = dsa_q = dsa_g = NULL; /* transferred */
|
|
+ if (!DSA_set0_key(key->dsa, dsa_pub_key, NULL)) {
|
|
+ ret = SSH_ERR_LIBCRYPTO_ERROR;
|
|
+ goto out;
|
|
+ }
|
|
+ dsa_pub_key = NULL; /* transferred */
|
|
#ifdef DEBUG_PK
|
|
DSA_print_fp(stderr, key->dsa, 8);
|
|
#endif
|
|
@@ -2178,9 +2241,17 @@ sshkey_from_blob_internal(struct sshbuf *b, struct sshkey **keyp,
|
|
free(ktype);
|
|
free(curve);
|
|
free(pk);
|
|
-#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
|
|
+#if defined(WITH_OPENSSL)
|
|
+ BN_clear_free(rsa_n);
|
|
+ BN_clear_free(rsa_e);
|
|
+ BN_clear_free(dsa_p);
|
|
+ BN_clear_free(dsa_q);
|
|
+ BN_clear_free(dsa_g);
|
|
+ BN_clear_free(dsa_pub_key);
|
|
+# if defined(OPENSSL_HAS_ECC)
|
|
EC_POINT_free(q);
|
|
-#endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */
|
|
+# endif /* OPENSSL_HAS_ECC */
|
|
+#endif /* WITH_OPENSSL */
|
|
return ret;
|
|
}
|
|
|
|
@@ -2361,120 +2432,6 @@ sshkey_verify(const struct sshkey *key,
|
|
}
|
|
}
|
|
|
|
-/* Converts a private to a public key */
|
|
-int
|
|
-sshkey_demote(const struct sshkey *k, struct sshkey **dkp)
|
|
-{
|
|
- struct sshkey *pk;
|
|
- int ret = SSH_ERR_INTERNAL_ERROR;
|
|
-
|
|
- *dkp = NULL;
|
|
- if ((pk = calloc(1, sizeof(*pk))) == NULL)
|
|
- return SSH_ERR_ALLOC_FAIL;
|
|
- pk->type = k->type;
|
|
- pk->flags = k->flags;
|
|
- pk->ecdsa_nid = k->ecdsa_nid;
|
|
- pk->dsa = NULL;
|
|
- pk->ecdsa = NULL;
|
|
- pk->rsa = NULL;
|
|
- pk->ed25519_pk = NULL;
|
|
- pk->ed25519_sk = NULL;
|
|
- pk->xmss_pk = NULL;
|
|
- pk->xmss_sk = NULL;
|
|
-
|
|
- switch (k->type) {
|
|
-#ifdef WITH_OPENSSL
|
|
- case KEY_RSA_CERT:
|
|
- if ((ret = sshkey_cert_copy(k, pk)) != 0)
|
|
- goto fail;
|
|
- /* FALLTHROUGH */
|
|
- case KEY_RSA:
|
|
- if ((pk->rsa = RSA_new()) == NULL ||
|
|
- (pk->rsa->e = BN_dup(k->rsa->e)) == NULL ||
|
|
- (pk->rsa->n = BN_dup(k->rsa->n)) == NULL) {
|
|
- ret = SSH_ERR_ALLOC_FAIL;
|
|
- goto fail;
|
|
- }
|
|
- break;
|
|
- case KEY_DSA_CERT:
|
|
- if ((ret = sshkey_cert_copy(k, pk)) != 0)
|
|
- goto fail;
|
|
- /* FALLTHROUGH */
|
|
- case KEY_DSA:
|
|
- if ((pk->dsa = DSA_new()) == NULL ||
|
|
- (pk->dsa->p = BN_dup(k->dsa->p)) == NULL ||
|
|
- (pk->dsa->q = BN_dup(k->dsa->q)) == NULL ||
|
|
- (pk->dsa->g = BN_dup(k->dsa->g)) == NULL ||
|
|
- (pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL) {
|
|
- ret = SSH_ERR_ALLOC_FAIL;
|
|
- goto fail;
|
|
- }
|
|
- break;
|
|
- case KEY_ECDSA_CERT:
|
|
- if ((ret = sshkey_cert_copy(k, pk)) != 0)
|
|
- goto fail;
|
|
- /* FALLTHROUGH */
|
|
-# ifdef OPENSSL_HAS_ECC
|
|
- case KEY_ECDSA:
|
|
- pk->ecdsa = EC_KEY_new_by_curve_name(pk->ecdsa_nid);
|
|
- if (pk->ecdsa == NULL) {
|
|
- ret = SSH_ERR_ALLOC_FAIL;
|
|
- goto fail;
|
|
- }
|
|
- if (EC_KEY_set_public_key(pk->ecdsa,
|
|
- EC_KEY_get0_public_key(k->ecdsa)) != 1) {
|
|
- ret = SSH_ERR_LIBCRYPTO_ERROR;
|
|
- goto fail;
|
|
- }
|
|
- break;
|
|
-# endif /* OPENSSL_HAS_ECC */
|
|
-#endif /* WITH_OPENSSL */
|
|
- case KEY_ED25519_CERT:
|
|
- if ((ret = sshkey_cert_copy(k, pk)) != 0)
|
|
- goto fail;
|
|
- /* FALLTHROUGH */
|
|
- case KEY_ED25519:
|
|
- if (k->ed25519_pk != NULL) {
|
|
- if ((pk->ed25519_pk = malloc(ED25519_PK_SZ)) == NULL) {
|
|
- ret = SSH_ERR_ALLOC_FAIL;
|
|
- goto fail;
|
|
- }
|
|
- memcpy(pk->ed25519_pk, k->ed25519_pk, ED25519_PK_SZ);
|
|
- }
|
|
- break;
|
|
-#ifdef WITH_XMSS
|
|
- case KEY_XMSS_CERT:
|
|
- if ((ret = sshkey_cert_copy(k, pk)) != 0)
|
|
- goto fail;
|
|
- /* FALLTHROUGH */
|
|
- case KEY_XMSS:
|
|
- if ((ret = sshkey_xmss_init(pk, k->xmss_name)) != 0)
|
|
- goto fail;
|
|
- if (k->xmss_pk != NULL) {
|
|
- size_t pklen = sshkey_xmss_pklen(k);
|
|
-
|
|
- if (pklen == 0 || sshkey_xmss_pklen(pk) != pklen) {
|
|
- ret = SSH_ERR_INTERNAL_ERROR;
|
|
- goto fail;
|
|
- }
|
|
- if ((pk->xmss_pk = malloc(pklen)) == NULL) {
|
|
- ret = SSH_ERR_ALLOC_FAIL;
|
|
- goto fail;
|
|
- }
|
|
- memcpy(pk->xmss_pk, k->xmss_pk, pklen);
|
|
- }
|
|
- break;
|
|
-#endif /* WITH_XMSS */
|
|
- default:
|
|
- ret = SSH_ERR_KEY_TYPE_UNKNOWN;
|
|
- fail:
|
|
- sshkey_free(pk);
|
|
- return ret;
|
|
- }
|
|
- *dkp = pk;
|
|
- return 0;
|
|
-}
|
|
-
|
|
/* Convert a plain key to their _CERT equivalent */
|
|
int
|
|
sshkey_to_certified(struct sshkey *k)
|
|
@@ -2532,6 +2489,9 @@ sshkey_certify_custom(struct sshkey *k, struct sshkey *ca, const char *alg,
|
|
size_t i, ca_len, sig_len;
|
|
int ret = SSH_ERR_INTERNAL_ERROR;
|
|
struct sshbuf *cert;
|
|
+#ifdef WITH_OPENSSL
|
|
+ const BIGNUM *rsa_n, *rsa_e, *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
|
|
+#endif /* WITH_OPENSSL */
|
|
|
|
if (k == NULL || k->cert == NULL ||
|
|
k->cert->certblob == NULL || ca == NULL)
|
|
@@ -2558,10 +2518,12 @@ sshkey_certify_custom(struct sshkey *k, struct sshkey *ca, const char *alg,
|
|
switch (k->type) {
|
|
#ifdef WITH_OPENSSL
|
|
case KEY_DSA_CERT:
|
|
- if ((ret = sshbuf_put_bignum2(cert, k->dsa->p)) != 0 ||
|
|
- (ret = sshbuf_put_bignum2(cert, k->dsa->q)) != 0 ||
|
|
- (ret = sshbuf_put_bignum2(cert, k->dsa->g)) != 0 ||
|
|
- (ret = sshbuf_put_bignum2(cert, k->dsa->pub_key)) != 0)
|
|
+ DSA_get0_pqg(k->dsa, &dsa_p, &dsa_q, &dsa_g);
|
|
+ DSA_get0_key(k->dsa, &dsa_pub_key, NULL);
|
|
+ if ((ret = sshbuf_put_bignum2(cert, dsa_p)) != 0 ||
|
|
+ (ret = sshbuf_put_bignum2(cert, dsa_q)) != 0 ||
|
|
+ (ret = sshbuf_put_bignum2(cert, dsa_g)) != 0 ||
|
|
+ (ret = sshbuf_put_bignum2(cert, dsa_pub_key)) != 0)
|
|
goto out;
|
|
break;
|
|
# ifdef OPENSSL_HAS_ECC
|
|
@@ -2575,8 +2537,9 @@ sshkey_certify_custom(struct sshkey *k, struct sshkey *ca, const char *alg,
|
|
break;
|
|
# endif /* OPENSSL_HAS_ECC */
|
|
case KEY_RSA_CERT:
|
|
- if ((ret = sshbuf_put_bignum2(cert, k->rsa->e)) != 0 ||
|
|
- (ret = sshbuf_put_bignum2(cert, k->rsa->n)) != 0)
|
|
+ RSA_get0_key(k->rsa, &rsa_n, &rsa_e, NULL);
|
|
+ if ((ret = sshbuf_put_bignum2(cert, rsa_e)) != 0 ||
|
|
+ (ret = sshbuf_put_bignum2(cert, rsa_n)) != 0)
|
|
goto out;
|
|
break;
|
|
#endif /* WITH_OPENSSL */
|
|
@@ -2758,18 +2721,25 @@ sshkey_private_serialize_opt(const struct sshkey *key, struct sshbuf *b,
|
|
enum sshkey_serialize_rep opts)
|
|
{
|
|
int r = SSH_ERR_INTERNAL_ERROR;
|
|
+#ifdef WITH_OPENSSL
|
|
+ const BIGNUM *rsa_n, *rsa_e, *rsa_d, *rsa_iqmp, *rsa_p, *rsa_q;
|
|
+ const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key, *dsa_priv_key;
|
|
+#endif /* WITH_OPENSSL */
|
|
|
|
if ((r = sshbuf_put_cstring(b, sshkey_ssh_name(key))) != 0)
|
|
goto out;
|
|
switch (key->type) {
|
|
#ifdef WITH_OPENSSL
|
|
case KEY_RSA:
|
|
- if ((r = sshbuf_put_bignum2(b, key->rsa->n)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(b, key->rsa->e)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(b, key->rsa->d)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(b, key->rsa->iqmp)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(b, key->rsa->p)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(b, key->rsa->q)) != 0)
|
|
+ RSA_get0_key(key->rsa, &rsa_n, &rsa_e, &rsa_d);
|
|
+ RSA_get0_factors(key->rsa, &rsa_p, &rsa_q);
|
|
+ RSA_get0_crt_params(key->rsa, NULL, NULL, &rsa_iqmp);
|
|
+ if ((r = sshbuf_put_bignum2(b, rsa_n)) != 0 ||
|
|
+ (r = sshbuf_put_bignum2(b, rsa_e)) != 0 ||
|
|
+ (r = sshbuf_put_bignum2(b, rsa_d)) != 0 ||
|
|
+ (r = sshbuf_put_bignum2(b, rsa_iqmp)) != 0 ||
|
|
+ (r = sshbuf_put_bignum2(b, rsa_p)) != 0 ||
|
|
+ (r = sshbuf_put_bignum2(b, rsa_q)) != 0)
|
|
goto out;
|
|
break;
|
|
case KEY_RSA_CERT:
|
|
@@ -2777,19 +2747,24 @@ sshkey_private_serialize_opt(const struct sshkey *key, struct sshbuf *b,
|
|
r = SSH_ERR_INVALID_ARGUMENT;
|
|
goto out;
|
|
}
|
|
+ RSA_get0_key(key->rsa, NULL, NULL, &rsa_d);
|
|
+ RSA_get0_factors(key->rsa, &rsa_p, &rsa_q);
|
|
+ RSA_get0_crt_params(key->rsa, NULL, NULL, &rsa_iqmp);
|
|
if ((r = sshbuf_put_stringb(b, key->cert->certblob)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(b, key->rsa->d)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(b, key->rsa->iqmp)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(b, key->rsa->p)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(b, key->rsa->q)) != 0)
|
|
+ (r = sshbuf_put_bignum2(b, rsa_d)) != 0 ||
|
|
+ (r = sshbuf_put_bignum2(b, rsa_iqmp)) != 0 ||
|
|
+ (r = sshbuf_put_bignum2(b, rsa_p)) != 0 ||
|
|
+ (r = sshbuf_put_bignum2(b, rsa_q)) != 0)
|
|
goto out;
|
|
break;
|
|
case KEY_DSA:
|
|
- if ((r = sshbuf_put_bignum2(b, key->dsa->p)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(b, key->dsa->q)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(b, key->dsa->g)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(b, key->dsa->pub_key)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(b, key->dsa->priv_key)) != 0)
|
|
+ DSA_get0_pqg(key->dsa, &dsa_p, &dsa_q, &dsa_g);
|
|
+ DSA_get0_key(key->dsa, &dsa_pub_key, &dsa_priv_key);
|
|
+ if ((r = sshbuf_put_bignum2(b, dsa_p)) != 0 ||
|
|
+ (r = sshbuf_put_bignum2(b, dsa_q)) != 0 ||
|
|
+ (r = sshbuf_put_bignum2(b, dsa_g)) != 0 ||
|
|
+ (r = sshbuf_put_bignum2(b, dsa_pub_key)) != 0 ||
|
|
+ (r = sshbuf_put_bignum2(b, dsa_priv_key)) != 0)
|
|
goto out;
|
|
break;
|
|
case KEY_DSA_CERT:
|
|
@@ -2797,8 +2772,9 @@ sshkey_private_serialize_opt(const struct sshkey *key, struct sshbuf *b,
|
|
r = SSH_ERR_INVALID_ARGUMENT;
|
|
goto out;
|
|
}
|
|
+ DSA_get0_key(key->dsa, NULL, &dsa_priv_key);
|
|
if ((r = sshbuf_put_stringb(b, key->cert->certblob)) != 0 ||
|
|
- (r = sshbuf_put_bignum2(b, key->dsa->priv_key)) != 0)
|
|
+ (r = sshbuf_put_bignum2(b, dsa_priv_key)) != 0)
|
|
goto out;
|
|
break;
|
|
# ifdef OPENSSL_HAS_ECC
|
|
@@ -2899,6 +2875,10 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
|
|
u_char *xmss_pk = NULL, *xmss_sk = NULL;
|
|
#ifdef WITH_OPENSSL
|
|
BIGNUM *exponent = NULL;
|
|
+ BIGNUM *rsa_n = NULL, *rsa_e = NULL, *rsa_d = NULL;
|
|
+ BIGNUM *rsa_iqmp = NULL, *rsa_p = NULL, *rsa_q = NULL;
|
|
+ BIGNUM *dsa_p = NULL, *dsa_q = NULL, *dsa_g = NULL;
|
|
+ BIGNUM *dsa_pub_key = NULL, *dsa_priv_key = NULL;
|
|
#endif /* WITH_OPENSSL */
|
|
|
|
if (kp != NULL)
|
|
@@ -2913,18 +2893,44 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
|
|
r = SSH_ERR_ALLOC_FAIL;
|
|
goto out;
|
|
}
|
|
- if ((r = sshbuf_get_bignum2(buf, k->dsa->p)) != 0 ||
|
|
- (r = sshbuf_get_bignum2(buf, k->dsa->q)) != 0 ||
|
|
- (r = sshbuf_get_bignum2(buf, k->dsa->g)) != 0 ||
|
|
- (r = sshbuf_get_bignum2(buf, k->dsa->pub_key)) != 0 ||
|
|
- (r = sshbuf_get_bignum2(buf, k->dsa->priv_key)) != 0)
|
|
+ if ((dsa_p = BN_new()) == NULL ||
|
|
+ (dsa_q = BN_new()) == NULL ||
|
|
+ (dsa_g = BN_new()) == NULL ||
|
|
+ (dsa_pub_key = BN_new()) == NULL ||
|
|
+ (dsa_priv_key = BN_new()) == NULL) {
|
|
+ r = SSH_ERR_ALLOC_FAIL;
|
|
+ goto out;
|
|
+ }
|
|
+ if ((r = sshbuf_get_bignum2(buf, dsa_p)) != 0 ||
|
|
+ (r = sshbuf_get_bignum2(buf, dsa_q)) != 0 ||
|
|
+ (r = sshbuf_get_bignum2(buf, dsa_g)) != 0 ||
|
|
+ (r = sshbuf_get_bignum2(buf, dsa_pub_key)) != 0 ||
|
|
+ (r = sshbuf_get_bignum2(buf, dsa_priv_key)) != 0)
|
|
goto out;
|
|
+ if (!DSA_set0_pqg(k->dsa, dsa_p, dsa_q, dsa_g)) {
|
|
+ r = SSH_ERR_LIBCRYPTO_ERROR;
|
|
+ goto out;
|
|
+ }
|
|
+ dsa_p = dsa_q = dsa_g = NULL; /* transferred */
|
|
+ if (!DSA_set0_key(k->dsa, dsa_pub_key, dsa_priv_key)) {
|
|
+ r = SSH_ERR_LIBCRYPTO_ERROR;
|
|
+ goto out;
|
|
+ }
|
|
+ dsa_pub_key = dsa_priv_key = NULL; /* transferred */
|
|
break;
|
|
case KEY_DSA_CERT:
|
|
+ if ((dsa_priv_key = BN_new()) == NULL) {
|
|
+ r = SSH_ERR_ALLOC_FAIL;
|
|
+ goto out;
|
|
+ }
|
|
if ((r = sshkey_froms(buf, &k)) != 0 ||
|
|
- (r = sshkey_add_private(k)) != 0 ||
|
|
- (r = sshbuf_get_bignum2(buf, k->dsa->priv_key)) != 0)
|
|
+ (r = sshbuf_get_bignum2(buf, dsa_priv_key)) != 0)
|
|
+ goto out;
|
|
+ if (!DSA_set0_key(k->dsa, NULL, dsa_priv_key)) {
|
|
+ r = SSH_ERR_LIBCRYPTO_ERROR;
|
|
goto out;
|
|
+ }
|
|
+ dsa_priv_key = NULL; /* transferred */
|
|
break;
|
|
# ifdef OPENSSL_HAS_ECC
|
|
case KEY_ECDSA:
|
|
@@ -2965,7 +2971,6 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
|
|
goto out;
|
|
}
|
|
if ((r = sshkey_froms(buf, &k)) != 0 ||
|
|
- (r = sshkey_add_private(k)) != 0 ||
|
|
(r = sshbuf_get_bignum2(buf, exponent)) != 0)
|
|
goto out;
|
|
if (EC_KEY_set_private_key(k->ecdsa, exponent) != 1) {
|
|
@@ -2983,32 +2988,65 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
|
|
r = SSH_ERR_ALLOC_FAIL;
|
|
goto out;
|
|
}
|
|
- if ((r = sshbuf_get_bignum2(buf, k->rsa->n)) != 0 ||
|
|
- (r = sshbuf_get_bignum2(buf, k->rsa->e)) != 0 ||
|
|
- (r = sshbuf_get_bignum2(buf, k->rsa->d)) != 0 ||
|
|
- (r = sshbuf_get_bignum2(buf, k->rsa->iqmp)) != 0 ||
|
|
- (r = sshbuf_get_bignum2(buf, k->rsa->p)) != 0 ||
|
|
- (r = sshbuf_get_bignum2(buf, k->rsa->q)) != 0 ||
|
|
- (r = ssh_rsa_generate_additional_parameters(k)) != 0)
|
|
+ if ((rsa_n = BN_new()) == NULL ||
|
|
+ (rsa_e = BN_new()) == NULL ||
|
|
+ (rsa_d = BN_new()) == NULL ||
|
|
+ (rsa_iqmp = BN_new()) == NULL ||
|
|
+ (rsa_p = BN_new()) == NULL ||
|
|
+ (rsa_q = BN_new()) == NULL) {
|
|
+ r = SSH_ERR_ALLOC_FAIL;
|
|
goto out;
|
|
- if (BN_num_bits(k->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
|
|
- r = SSH_ERR_KEY_LENGTH;
|
|
+ }
|
|
+ if ((r = sshbuf_get_bignum2(buf, rsa_n)) != 0 ||
|
|
+ (r = sshbuf_get_bignum2(buf, rsa_e)) != 0 ||
|
|
+ (r = sshbuf_get_bignum2(buf, rsa_d)) != 0 ||
|
|
+ (r = sshbuf_get_bignum2(buf, rsa_iqmp)) != 0 ||
|
|
+ (r = sshbuf_get_bignum2(buf, rsa_p)) != 0 ||
|
|
+ (r = sshbuf_get_bignum2(buf, rsa_q)) != 0)
|
|
+ goto out;
|
|
+ if (!RSA_set0_key(k->rsa, rsa_n, rsa_e, rsa_d)) {
|
|
+ r = SSH_ERR_LIBCRYPTO_ERROR;
|
|
goto out;
|
|
}
|
|
+ rsa_n = rsa_e = rsa_d = NULL; /* transferred */
|
|
+ if (!RSA_set0_factors(k->rsa, rsa_p, rsa_q)) {
|
|
+ r = SSH_ERR_LIBCRYPTO_ERROR;
|
|
+ goto out;
|
|
+ }
|
|
+ rsa_p = rsa_q = NULL; /* transferred */
|
|
+ if ((r = check_rsa_length(k->rsa)) != 0)
|
|
+ goto out;
|
|
+ if ((r = ssh_rsa_complete_crt_parameters(k, rsa_iqmp)) != 0)
|
|
+ goto out;
|
|
break;
|
|
case KEY_RSA_CERT:
|
|
+ if ((rsa_d = BN_new()) == NULL ||
|
|
+ (rsa_iqmp = BN_new()) == NULL ||
|
|
+ (rsa_p = BN_new()) == NULL ||
|
|
+ (rsa_q = BN_new()) == NULL) {
|
|
+ r = SSH_ERR_ALLOC_FAIL;
|
|
+ goto out;
|
|
+ }
|
|
if ((r = sshkey_froms(buf, &k)) != 0 ||
|
|
- (r = sshkey_add_private(k)) != 0 ||
|
|
- (r = sshbuf_get_bignum2(buf, k->rsa->d)) != 0 ||
|
|
- (r = sshbuf_get_bignum2(buf, k->rsa->iqmp)) != 0 ||
|
|
- (r = sshbuf_get_bignum2(buf, k->rsa->p)) != 0 ||
|
|
- (r = sshbuf_get_bignum2(buf, k->rsa->q)) != 0 ||
|
|
- (r = ssh_rsa_generate_additional_parameters(k)) != 0)
|
|
+ (r = sshbuf_get_bignum2(buf, rsa_d)) != 0 ||
|
|
+ (r = sshbuf_get_bignum2(buf, rsa_iqmp)) != 0 ||
|
|
+ (r = sshbuf_get_bignum2(buf, rsa_p)) != 0 ||
|
|
+ (r = sshbuf_get_bignum2(buf, rsa_q)) != 0)
|
|
+ goto out;
|
|
+ if (!RSA_set0_key(k->rsa, NULL, NULL, rsa_d)) {
|
|
+ r = SSH_ERR_LIBCRYPTO_ERROR;
|
|
goto out;
|
|
- if (BN_num_bits(k->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
|
|
- r = SSH_ERR_KEY_LENGTH;
|
|
+ }
|
|
+ rsa_d = NULL; /* transferred */
|
|
+ if (!RSA_set0_factors(k->rsa, rsa_p, rsa_q)) {
|
|
+ r = SSH_ERR_LIBCRYPTO_ERROR;
|
|
goto out;
|
|
}
|
|
+ rsa_p = rsa_q = NULL; /* transferred */
|
|
+ if ((r = check_rsa_length(k->rsa)) != 0)
|
|
+ goto out;
|
|
+ if ((r = ssh_rsa_complete_crt_parameters(k, rsa_iqmp)) != 0)
|
|
+ goto out;
|
|
break;
|
|
#endif /* WITH_OPENSSL */
|
|
case KEY_ED25519:
|
|
@@ -3029,7 +3067,6 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
|
|
break;
|
|
case KEY_ED25519_CERT:
|
|
if ((r = sshkey_froms(buf, &k)) != 0 ||
|
|
- (r = sshkey_add_private(k)) != 0 ||
|
|
(r = sshbuf_get_string(buf, &ed25519_pk, &pklen)) != 0 ||
|
|
(r = sshbuf_get_string(buf, &ed25519_sk, &sklen)) != 0)
|
|
goto out;
|
|
@@ -3066,7 +3103,6 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
|
|
break;
|
|
case KEY_XMSS_CERT:
|
|
if ((r = sshkey_froms(buf, &k)) != 0 ||
|
|
- (r = sshkey_add_private(k)) != 0 ||
|
|
(r = sshbuf_get_cstring(buf, &xmss_name, NULL)) != 0 ||
|
|
(r = sshbuf_get_string(buf, &xmss_pk, &pklen)) != 0 ||
|
|
(r = sshbuf_get_string(buf, &xmss_sk, &sklen)) != 0)
|
|
@@ -3115,6 +3151,17 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
|
|
free(curve);
|
|
#ifdef WITH_OPENSSL
|
|
BN_clear_free(exponent);
|
|
+ BN_clear_free(dsa_p);
|
|
+ BN_clear_free(dsa_q);
|
|
+ BN_clear_free(dsa_g);
|
|
+ BN_clear_free(dsa_pub_key);
|
|
+ BN_clear_free(dsa_priv_key);
|
|
+ BN_clear_free(rsa_n);
|
|
+ BN_clear_free(rsa_e);
|
|
+ BN_clear_free(rsa_d);
|
|
+ BN_clear_free(rsa_p);
|
|
+ BN_clear_free(rsa_q);
|
|
+ BN_clear_free(rsa_iqmp);
|
|
#endif /* WITH_OPENSSL */
|
|
sshkey_free(k);
|
|
freezero(ed25519_pk, pklen);
|
|
@@ -3769,7 +3816,9 @@ translate_libcrypto_error(unsigned long pem_err)
|
|
switch (pem_reason) {
|
|
case EVP_R_BAD_DECRYPT:
|
|
return SSH_ERR_KEY_WRONG_PASSPHRASE;
|
|
+#ifdef EVP_R_BN_DECODE_ERROR
|
|
case EVP_R_BN_DECODE_ERROR:
|
|
+#endif
|
|
case EVP_R_DECODE_ERROR:
|
|
#ifdef EVP_R_PRIVATE_KEY_DECODE_ERROR
|
|
case EVP_R_PRIVATE_KEY_DECODE_ERROR:
|
|
@@ -3834,7 +3883,7 @@ sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type,
|
|
r = convert_libcrypto_error();
|
|
goto out;
|
|
}
|
|
- if (pk->type == EVP_PKEY_RSA &&
|
|
+ if (EVP_PKEY_base_id(pk) == EVP_PKEY_RSA &&
|
|
(type == KEY_UNSPEC || type == KEY_RSA)) {
|
|
if ((prv = sshkey_new(KEY_UNSPEC)) == NULL) {
|
|
r = SSH_ERR_ALLOC_FAIL;
|
|
@@ -3849,11 +3898,9 @@ sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type,
|
|
r = SSH_ERR_LIBCRYPTO_ERROR;
|
|
goto out;
|
|
}
|
|
- if (BN_num_bits(prv->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
|
|
- r = SSH_ERR_KEY_LENGTH;
|
|
+ if ((r = check_rsa_length(prv->rsa)) != 0)
|
|
goto out;
|
|
- }
|
|
- } else if (pk->type == EVP_PKEY_DSA &&
|
|
+ } else if (EVP_PKEY_base_id(pk) == EVP_PKEY_DSA &&
|
|
(type == KEY_UNSPEC || type == KEY_DSA)) {
|
|
if ((prv = sshkey_new(KEY_UNSPEC)) == NULL) {
|
|
r = SSH_ERR_ALLOC_FAIL;
|
|
@@ -3865,7 +3912,7 @@ sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type,
|
|
DSA_print_fp(stderr, prv->dsa, 8);
|
|
#endif
|
|
#ifdef OPENSSL_HAS_ECC
|
|
- } else if (pk->type == EVP_PKEY_EC &&
|
|
+ } else if (EVP_PKEY_base_id(pk) == EVP_PKEY_EC &&
|
|
(type == KEY_UNSPEC || type == KEY_ECDSA)) {
|
|
if ((prv = sshkey_new(KEY_UNSPEC)) == NULL) {
|
|
r = SSH_ERR_ALLOC_FAIL;
|
|
diff --git a/sshkey.h b/sshkey.h
|
|
index 9060b2ec..922db5bb 100644
|
|
--- a/sshkey.h
|
|
+++ b/sshkey.h
|
|
@@ -39,6 +39,7 @@
|
|
# define EC_POINT void
|
|
# endif /* OPENSSL_HAS_ECC */
|
|
#else /* WITH_OPENSSL */
|
|
+# define BIGNUM void
|
|
# define RSA void
|
|
# define DSA void
|
|
# define EC_KEY void
|
|
@@ -126,10 +127,8 @@ struct sshkey {
|
|
#define ED25519_PK_SZ crypto_sign_ed25519_PUBLICKEYBYTES
|
|
|
|
struct sshkey *sshkey_new(int);
|
|
-int sshkey_add_private(struct sshkey *);
|
|
-struct sshkey *sshkey_new_private(int);
|
|
+struct sshkey *sshkey_new_private(int); /* XXX garbage collect */
|
|
void sshkey_free(struct sshkey *);
|
|
-int sshkey_demote(const struct sshkey *, struct sshkey **);
|
|
int sshkey_equal_public(const struct sshkey *,
|
|
const struct sshkey *);
|
|
int sshkey_equal(const struct sshkey *, const struct sshkey *);
|
|
@@ -218,7 +217,7 @@ int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type,
|
|
const char *passphrase, struct sshkey **keyp, char **commentp);
|
|
|
|
/* XXX should be internal, but used by ssh-keygen */
|
|
-int ssh_rsa_generate_additional_parameters(struct sshkey *);
|
|
+int ssh_rsa_complete_crt_parameters(struct sshkey *, const BIGNUM *);
|
|
|
|
/* stateful keys (e.g. XMSS) */
|
|
#ifdef NO_ATTRIBUTE_ON_PROTOTYPE_ARGS
|
|
--
|
|
2.16.4
|
|
|