Add names of GOST algorithms.
authorPeter Mosmans <support@go-forward.net>
Sun, 13 Jul 2014 17:30:07 +0000 (18:30 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Sun, 13 Jul 2014 17:35:14 +0000 (18:35 +0100)
PR#3440
(cherry picked from commit 924e5eda2c82d737cc5a1b9c37918aa6e34825da)

Conflicts:

ssl/ssl_ciph.c

ssl/ssl_ciph.c

index 6fc6ad205f3c26da3cbd2cb18f7cb54ac2c5e4da..d6a743212f9c4b20ce4429ff1db0326af8dfca7f 100644 (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;