diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-07-24 18:11:27 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-07-24 18:11:27 +0000 |
| commit | ec4a50b3c3f2f50caccfd52e939857a5d6f02fd1 (patch) | |
| tree | cb856889245aa324e613bece9db3d79f1dab91c1 /ssl/s3_clnt.c | |
| parent | d18b716d259d6d3b68ff7f49d154b9158b98df65 (diff) | |
Abort handshake if signature algorithm used not supported by peer.
Diffstat (limited to 'ssl/s3_clnt.c')
| -rw-r--r-- | ssl/s3_clnt.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 11ffabb460..e9c1518810 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -1750,25 +1750,12 @@ int ssl3_get_key_exchange(SSL *s) { if (TLS1_get_version(s) >= TLS1_2_VERSION) { - int sigalg = tls12_get_sigid(pkey); - /* Should never happen */ - if (sigalg == -1) - { - SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR); + int rv = tls12_check_peer_sigalg(&md, s, p, pkey); + if (rv == -1) goto err; - } - /* Check key type is consistent with signature */ - if (sigalg != (int)p[1]) - { - SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_WRONG_SIGNATURE_TYPE); - al=SSL_AD_DECODE_ERROR; - goto f_err; - } - md = tls12_get_hash(p[0]); - if (md == NULL) + else if (rv == 0) { - SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNKNOWN_DIGEST); - al=SSL_AD_DECODE_ERROR; + al = SSL_AD_DECODE_ERROR; goto f_err; } #ifdef SSL_DEBUG @@ -3161,13 +3148,17 @@ err: } /* Check a certificate can be used for client authentication. Currently - * just check cert exists and if static DH client certificates can be used. + * check cert exists, if we have a suitable digest for TLS 1.2 and if + * static DH client certificates can be used. */ static int ssl3_check_client_certificate(SSL *s) { unsigned long alg_k; if (!s->cert || !s->cert->key->x509 || !s->cert->key->privatekey) return 0; + /* If no suitable signature algorithm can't use certificate */ + if (TLS1_get_version(s) >= TLS1_2_VERSION && !s->cert->key->digest) + return 0; alg_k=s->s3->tmp.new_cipher->algorithm_mkey; /* See if we can use client certificate for fixed DH */ if (alg_k & (SSL_kDHr|SSL_kDHd)) |