Remove support for GOST R 34.10-94 signature authentication, along with

the two ciphersuites that use it. GOST94 public/private keys have been
long obsoleted and libcrypto does not have support for them anyway.

Discussed with Dmitry Eremin-Solenikov.

1 files changed, 1 insertions, 34 deletions

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 9897fba6c5..4beee2d53c 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.86 2014/12/10 14:58:56 jsing Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.87 2014/12/10 15:36:47 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -747,23 +747,6 @@ SSL_CIPHER ssl3_ciphers[] = {
 
         /* GOST Ciphersuites */
 
-        /* Cipher 80 */
-        {
-                .valid = 1,
-                .name = "GOST94-GOST89-GOST89",
-                .id = 0x3000080,
-                .algorithm_mkey = SSL_kGOST,
-                .algorithm_auth = SSL_aGOST94,
-                .algorithm_enc = SSL_eGOST2814789CNT,
-                .algorithm_mac = SSL_GOST89MAC,
-                .algorithm_ssl = SSL_TLSV1,
-                .algo_strength = SSL_HIGH,
-                .algorithm2 = SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94|
-                    TLS1_STREAM_MAC,
-                .strength_bits = 256,
-                .alg_bits = 256
-        },
-
         /* Cipher 81 */
         {
                 .valid = 1,
@@ -781,22 +764,6 @@ SSL_CIPHER ssl3_ciphers[] = {
                 .alg_bits = 256
         },
 
-        /* Cipher 82 */
-        {
-                .valid = 1,
-                .name = "GOST94-NULL-GOST94",
-                .id = 0x3000082,
-                .algorithm_mkey = SSL_kGOST,
-                .algorithm_auth = SSL_aGOST94,
-                .algorithm_enc = SSL_eNULL,
-                .algorithm_mac = SSL_GOST94,
-                .algorithm_ssl = SSL_TLSV1,
-                .algo_strength = SSL_STRONG_NONE,
-                .algorithm2 = SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94,
-                .strength_bits = 0,
-                .alg_bits = 0
-        },
-
         /* Cipher 83 */
         {
                 .valid = 1,