wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix "no-ec"

Browse source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2547)
This commit is contained in:
Richard Levitte 2017-02-03 13:56:54 +01:00
parent 8f85aa6bd3
commit 21f198ec48
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ssl/t1_lib.c
View file

@ -2279,7 +2279,9 @@ int tls_choose_sigalg(SSL *s)
{
if (SSL_IS_TLS13(s)) {
size_t i;
#ifndef OPENSSL_NO_EC
int curve = -1;
#endif
/* Look for a certificate matching shared sigaglgs */
for (i = 0; i < s->cert->shared_sigalgslen; i++) {
@ -2305,6 +2307,7 @@ int tls_choose_sigalg(SSL *s)
continue;
}
if (lu->sig == EVP_PKEY_EC) {
#ifndef OPENSSL_NO_EC
if (curve == -1) {
EC_KEY *ec = EVP_PKEY_get0_EC_KEY(c->privatekey);
@ -2312,6 +2315,9 @@ int tls_choose_sigalg(SSL *s)
}
if (curve != lu->curve)
continue;
#else
continue;
#endif
}
s->s3->tmp.sigalg = lu;
s->s3->tmp.cert_idx = idx;