diff options
| author | Matt Caswell <matt@openssl.org> | 2015-11-24 13:52:07 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-11-27 17:23:14 +0000 |
| commit | 2a9b96548afc0d540ab873a31dc1a72c66cba434 (patch) | |
| tree | 0ed8536813326785ad51ab62a4b6746efb9c39c9 /ssl/ssl_lib.c | |
| parent | 9689a6aeed4ef7a2357cb95191b4313175440e4c (diff) | |
Updates to GOST2012
Various updates following feedback from the recent commit of the new
GOST2012 code.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index e02b04906e..a9370dcb87 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2068,6 +2068,7 @@ void ssl_set_masks(SSL *s, const SSL_CIPHER *cipher) rsa_enc_export, rsa_sign, dsa_sign, dh_rsa, dh_dsa); #endif +#ifndef OPENSSL_NO_GOST cpk = &(c->pkeys[SSL_PKEY_GOST12_512]); if (cpk->x509 != NULL && cpk->privatekey != NULL) { mask_k |= SSL_kGOST; @@ -2083,6 +2084,7 @@ void ssl_set_masks(SSL *s, const SSL_CIPHER *cipher) mask_k |= SSL_kGOST; mask_a |= SSL_aGOST01; } +#endif if (rsa_enc || (rsa_tmp && rsa_sign)) mask_k |= SSL_kRSA; |