summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mosmans <support@go-forward.net>2014-07-13 18:30:07 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-07-13 18:31:36 +0100
commit704422ce1ef964005db8ecfa239b9b04db67ff50 (patch)
tree59e4e75c743c3657a9aaa9283d0e8e2b9fee8030
parent8e8d7e1b2631064666a8953249b310f493fd2def (diff)
Add names of GOST algorithms.
PR#3440 (cherry picked from commit 924e5eda2c82d737cc5a1b9c37918aa6e34825da)
-rw-r--r--ssl/ssl_ciph.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 00a067b7be..184748629d 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1603,6 +1603,9 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case SSL_kSRP:
kx="SRP";
break;
+ case SSL_kGOST:
+ kx="VKO";
+ break;
default:
kx="unknown";
}
@@ -1636,6 +1639,12 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case SSL_aSRP:
au="SRP";
break;
+ case SSL_aGOST94:
+ au="GOST94";
+ break;
+ case SSL_aGOST01:
+ au="GOST01";
+ break;
default:
au="unknown";
break;
@@ -1683,6 +1692,9 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case SSL_SEED:
enc="SEED(128)";
break;
+ case SSL_eGOST2814789CNT:
+ enc="GOST89(256)";
+ break;
default:
enc="unknown";
break;
@@ -1705,6 +1717,12 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case SSL_AEAD:
mac="AEAD";
break;
+ case SSL_GOST89MAC:
+ mac="GOST89";
+ break;
+ case SSL_GOST94:
+ mac="GOST94";
+ break;
default:
mac="unknown";
break;