Remove GOST special case: handled automatically now.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
This commit is contained in:
parent
7afd231275
commit
30c7fea496
15
ssl/t1_lib.c
15
ssl/t1_lib.c
@ -994,22 +994,7 @@ size_t tls12_get_psigalgs(SSL *s, const unsigned char **psigs)
|
|||||||
return s->cert->conf_sigalgslen;
|
return s->cert->conf_sigalgslen;
|
||||||
} else {
|
} else {
|
||||||
*psigs = tls12_sigalgs;
|
*psigs = tls12_sigalgs;
|
||||||
#ifndef OPENSSL_NO_GOST
|
|
||||||
/*
|
|
||||||
* We expect that GOST 2001 signature and GOST 34.11-94 hash are present in all engines
|
|
||||||
* and GOST 2012 algorithms are not always present.
|
|
||||||
* It may change when the old algorithms are deprecated.
|
|
||||||
*/
|
|
||||||
if ((EVP_get_digestbynid(NID_id_GostR3411_94) != NULL)
|
|
||||||
&& (EVP_get_digestbynid(NID_id_GostR3411_2012_256) == NULL)) {
|
|
||||||
return sizeof(tls12_sigalgs) - 4;
|
|
||||||
} else if (EVP_get_digestbynid(NID_id_GostR3411_94) == NULL) {
|
|
||||||
return sizeof(tls12_sigalgs) - 6;
|
|
||||||
}
|
|
||||||
return sizeof(tls12_sigalgs);
|
return sizeof(tls12_sigalgs);
|
||||||
#else
|
|
||||||
return sizeof(tls12_sigalgs);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user