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/s3_lib.c | |
| parent | 9689a6aeed4ef7a2357cb95191b4313175440e4c (diff) | |
| download | openssl-2a9b96548afc0d540ab873a31dc1a72c66cba434.zip openssl-2a9b96548afc0d540ab873a31dc1a72c66cba434.tar.gz openssl-2a9b96548afc0d540ab873a31dc1a72c66cba434.tar.bz2 | |
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/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 8c1b4aa..bf7336c 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -1144,7 +1144,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = { }, /* GOST Ciphersuites */ - +#ifndef OPENSL_NO_GOST { 1, "GOST2001-GOST89-GOST89", @@ -1173,7 +1173,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = { 0, 0 }, - +#endif #ifndef OPENSSL_NO_CAMELLIA /* Camellia ciphersuites from RFC4132 (256-bit portion) */ @@ -3769,7 +3769,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = { 256, 256, }, - +#ifndef OPENSSL_NO_GOST { 1, "GOST2012-GOST8912-GOST8912", @@ -3796,7 +3796,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = { SSL_HANDSHAKE_MAC_GOST12_256 | TLS1_PRF_GOST12_256, 0, 0}, - +#endif /* end of list */ }; |