rpms/openssh
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Properly deserialize received RSA certificates in ssh-agent (#1402029)

Browse Source
This commit is contained in:
Jakub Jelen 2016-12-08 13:50:08 +01:00
parent 7bccf7e6e0
commit 4ce5741703
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openssh-7.3p1-openssl-1.1.0.patch
View File

@ -3566,7 +3566,7 @@ diff -up openssh-7.3p1/sshkey.c.openssl openssh-7.3p1/sshkey.c
break; break;
# ifdef OPENSSL_HAS_ECC # ifdef OPENSSL_HAS_ECC
case KEY_ECDSA: case KEY_ECDSA:
@@ -2818,24 +2994,73 @@ sshkey_private_deserialize(struct sshbuf @@ -2818,24 +2994,81 @@ sshkey_private_deserialize(struct sshbuf
r = SSH_ERR_ALLOC_FAIL; r = SSH_ERR_ALLOC_FAIL;
goto out; goto out;
} }
@ -3631,28 +3631,36 @@ diff -up openssh-7.3p1/sshkey.c.openssl openssh-7.3p1/sshkey.c
+ case KEY_RSA_CERT: { + case KEY_RSA_CERT: {
+ BIGNUM *n, *e, *d, *iqmp, *p, *q; + BIGNUM *n, *e, *d, *iqmp, *p, *q;
+ +
+ /* XXX leave N, E as zero */ + /* N can't be zero because it breaks blinding (seed). Count it now */
+ /* E is zero because it is not in the protocol, but needed for RSA structure */
+ n = BN_new(); + n = BN_new();
+ e = BN_new(); + e = BN_new();
+ d = BN_new(); + d = BN_new();
+ iqmp = BN_new(); + iqmp = BN_new();
+ p = BN_new(); + p = BN_new();
+ q = BN_new(); + q = BN_new();
+ BN_CTX *ctx = BN_CTX_new();
+ +
+ if (n == NULL || e == NULL || d == NULL || + if (n == NULL || e == NULL || d == NULL ||
+ iqmp == NULL || p == NULL || q == NULL || + iqmp == NULL || p == NULL || q == NULL ||
+ ctx == NULL ||
+ (r = sshkey_froms(buf, &k)) != 0 || + (r = sshkey_froms(buf, &k)) != 0 ||
+ (r = sshkey_add_private(k)) != 0 || + (r = sshkey_add_private(k)) != 0 ||
+ (r = sshbuf_get_bignum2(buf, d)) != 0 || + (r = sshbuf_get_bignum2(buf, d)) != 0 ||
+ (r = sshbuf_get_bignum2(buf, iqmp)) != 0 || + (r = sshbuf_get_bignum2(buf, iqmp)) != 0 ||
+ (r = sshbuf_get_bignum2(buf, p)) != 0 || + (r = sshbuf_get_bignum2(buf, p)) != 0 ||
+ (r = sshbuf_get_bignum2(buf, q)) != 0 || + (r = sshbuf_get_bignum2(buf, q)) != 0 ||
+ (r = ((BN_mul(n, p, q, ctx) == 0) /* N = P * Q */
+ ? SSH_ERR_LIBCRYPTO_ERROR : 0)) != 0 ||
+ (r = ((RSA_set0_key(k->rsa, n, e, d) == 0) + (r = ((RSA_set0_key(k->rsa, n, e, d) == 0)
+ ? SSH_ERR_LIBCRYPTO_ERROR : 0)) != 0 || + ? SSH_ERR_LIBCRYPTO_ERROR : 0)) != 0 ||
+ (r = ((RSA_set0_factors(k->rsa, p, q) == 0) + (r = ((RSA_set0_factors(k->rsa, p, q) == 0)
+ ? SSH_ERR_LIBCRYPTO_ERROR : 0)) != 0 || + ? SSH_ERR_LIBCRYPTO_ERROR : 0)) != 0 ||
+ (r = rsa_generate_additional_parameters(k->rsa, iqmp)) != 0) + (r = rsa_generate_additional_parameters(k->rsa, iqmp)) != 0) {
+ BN_CTX_free(ctx);
+ goto out; + goto out;
+ }
+ BN_CTX_free(ctx);
+ } + }
break; break;
#endif /* WITH_OPENSSL */ #endif /* WITH_OPENSSL */