wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add names of GOST algorithms.

Browse source 
PR#3440
(cherry picked from commit 924e5eda2c)

Conflicts:

	ssl/ssl_ciph.c
This commit is contained in:
Peter Mosmans 2014-07-13 18:30:07 +01:00 committed by Dr. Stephen Henson
parent 7aeb3d7937
commit f7123634a5
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ssl/ssl_ciph.c
View file

@ -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;