From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 3 May 2018 14:25:48 +0000 (+0300)
Subject: Bugfix: GOST2012 certificates for GOST ciphersuites were broken.
X-Git-Tag: OpenSSL_1_1_1-pre8~118
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1f65c0459a1382481f29756b85e9ec12aedaa6bf;p=oweals%2Fopenssl.git

Bugfix: GOST2012 certificates for GOST ciphersuites were broken.

Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6168)
---

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 4aec810179..31e5cc8aa9 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -383,11 +383,6 @@
 # define SSL_PKEY_ED25519        7
 # define SSL_PKEY_ED448          8
 # define SSL_PKEY_NUM            9
-/*
- * Pseudo-constant. GOST cipher suites can use different certs for 1
- * SSL_CIPHER. So let's see which one we have in fact.
- */
-# define SSL_PKEY_GOST_EC SSL_PKEY_NUM+1
 
 /*-
  * SSL_kRSA <- RSA_ENC
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index c076782842..e72ac73737 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -857,6 +857,21 @@ static const SIGALG_LOOKUP *tls1_get_legacy_sigalg(const SSL *s, int idx)
                     break;
                 }
             }
+
+            /*
+             * Some GOST ciphersuites allow more than one signature algorithms
+             * */
+            if (idx == SSL_PKEY_GOST01 && s->s3->tmp.new_cipher->algorithm_auth != SSL_aGOST01) {
+                int real_idx;
+
+                for (real_idx = SSL_PKEY_GOST12_512; real_idx >= SSL_PKEY_GOST01;
+                     real_idx--) {
+                    if (s->cert->pkeys[real_idx].privatekey != NULL) {
+                        idx = real_idx;
+                        break;
+                    }
+                }
+            }
         } else {
             idx = s->cert->key - s->cert->pkeys;
         }