From f7123634a5f1a63a79d335ae015e9ab540a2fca2 Mon Sep 17 00:00:00 2001 From: Peter Mosmans Date: Sun, 13 Jul 2014 18:30:07 +0100 Subject: [PATCH] Add names of GOST algorithms. PR#3440 (cherry picked from commit 924e5eda2c82d737cc5a1b9c37918aa6e34825da) Conflicts: ssl/ssl_ciph.c --- ssl/ssl_ciph.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 6fc6ad205f..d6a743212f 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -1516,6 +1516,9 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len) case SSL_kPSK: kx="PSK"; break; + case SSL_kGOST: + kx="VKO"; + break; default: kx="unknown"; } @@ -1546,6 +1549,12 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len) case SSL_aPSK: au="PSK"; break; + case SSL_aGOST94: + au="GOST94"; + break; + case SSL_aGOST01: + au="GOST01"; + break; default: au="unknown"; break; @@ -1587,6 +1596,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; @@ -1600,6 +1612,12 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len) case SSL_SHA1: mac="SHA1"; break; + case SSL_GOST89MAC: + mac="GOST89"; + break; + case SSL_GOST94: + mac="GOST94"; + break; default: mac="unknown"; break; -- 2.25.1