[openssl] OpenSSL_1_1_1-stable update
beldmit at gmail.com
beldmit at gmail.com
Fri Feb 14 09:23:00 UTC 2020
The branch OpenSSL_1_1_1-stable has been updated
via 64dc4eeef8d6f15c6d3ae296b07cb2fa9e84404b (commit)
from 2ba3e6538567fffec1f169668a571c8ad8f766fa (commit)
- Log -----------------------------------------------------------------
commit 64dc4eeef8d6f15c6d3ae296b07cb2fa9e84404b
Author: Nikolay Morozov <nmorozoff77 at yandex.ru>
Date: Wed Feb 12 15:20:41 2020 +0300
Forgotten GOST2012 support in non-vital places
Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
(Merged from https://github.com/openssl/openssl/pull/11072)
-----------------------------------------------------------------------
Summary of changes:
apps/s_cb.c | 1 +
crypto/asn1/asn_mime.c | 8 ++++++++
2 files changed, 9 insertions(+)
diff --git a/apps/s_cb.c b/apps/s_cb.c
index 5dc1d03f28..6750c33279 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -188,6 +188,7 @@ static STRINT_PAIR cert_type_list[] = {
{"RSA fixed ECDH", TLS_CT_RSA_FIXED_ECDH},
{"ECDSA fixed ECDH", TLS_CT_ECDSA_FIXED_ECDH},
{"GOST01 Sign", TLS_CT_GOST01_SIGN},
+ {"GOST12 Sign", TLS_CT_GOST12_SIGN},
{NULL}
};
diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index b8ea51136a..89e3140541 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -198,6 +198,14 @@ static int asn1_write_micalg(BIO *out, STACK_OF(X509_ALGOR) *mdalgs)
BIO_puts(out, "gostr3411-94");
goto err;
+ case NID_id_GostR3411_2012_256:
+ BIO_puts(out, "gostr3411-2012-256");
+ goto err;
+
+ case NID_id_GostR3411_2012_512:
+ BIO_puts(out, "gostr3411-2012-512");
+ goto err;
+
default:
if (have_unknown)
write_comma = 0;
More information about the openssl-commits
mailing list