Remove GOST special case: handled automatically now.
authorDr. Stephen Henson <steve@openssl.org>
Sun, 29 Nov 2015 16:59:18 +0000 (16:59 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Mon, 30 Nov 2015 03:49:35 +0000 (03:49 +0000)
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
ssl/t1_lib.c

index 0ace628..02ad438 100644 (file)
@@ -994,22 +994,7 @@ size_t tls12_get_psigalgs(SSL *s, const unsigned char **psigs)
         return s->cert->conf_sigalgslen;
     } else {
         *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);
-#else
-        return sizeof(tls12_sigalgs);
-#endif
     }
 }