summaryrefslogtreecommitdiffstats
path: root/crypto/x509
diff options
context:
space:
mode:
authorDmitry Belyavsky <beldmit@gmail.com>2015-11-17 15:32:30 +0000
committerMatt Caswell <matt@openssl.org>2015-11-23 16:09:42 +0000
commite44380a990a3edf1cd0c190c6459c8c026d53646 (patch)
treecb605454d30bf0eeca8c6369fed11fa5ffd29726 /crypto/x509
parent76eba0d94bb418325be6409b272eac5e2bd4a0a9 (diff)
Patch containing TLS implementation for GOST 2012
This patch contains the necessary changes to provide GOST 2012 ciphersuites in TLS. It requires the use of an external GOST 2012 engine. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/x509')
-rw-r--r--crypto/x509/x509type.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/x509/x509type.c b/crypto/x509/x509type.c
index 8332d9e9d4..a7695cad77 100644
--- a/crypto/x509/x509type.c
+++ b/crypto/x509/x509type.c
@@ -94,6 +94,8 @@ int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
ret = EVP_PK_DH | EVP_PKT_EXCH;
break;
case NID_id_GostR3410_2001:
+ case NID_id_GostR3410_2012_256:
+ case NID_id_GostR3410_2012_512:
ret = EVP_PKT_EXCH | EVP_PKT_SIGN;
break;
default: