Commit f7123634 authored by Peter Mosmans's avatar Peter Mosmans Committed by Dr. Stephen Henson
Browse files

Add names of GOST algorithms. 

PR#3440
(cherry picked from commit 924e5eda)

Conflicts:

	ssl/ssl_ciph.c
parent 7aeb3d79

ssl/ssl_ciph.c

+18 −0
Original line number Diff line number Diff line
@@ -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;