From: Peter Mosmans <support@go-forward.net>
Date: Sun, 13 Jul 2014 17:30:07 +0000 (+0100)
Subject: Add names of GOST algorithms.
X-Git-Tag: OpenSSL_1_0_2-beta2~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2fbd94252a119c064fc043da2b47a3510ee4b238;p=oweals%2Fopenssl.git

Add names of GOST algorithms.

PR#3440
(cherry picked from commit 924e5eda2c82d737cc5a1b9c37918aa6e34825da)
---

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 9c7fbc3022..c511279a5d 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1677,6 +1677,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";
 		}
@@ -1710,6 +1713,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;
@@ -1757,6 +1766,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;
@@ -1779,6 +1791,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;