From cc3446a1ceb1230b771a81ca772f95ef6e00adbc Mon Sep 17 00:00:00 2001 From: mathewmarcus Date: Mon, 2 Jul 2018 20:56:07 -0500 Subject: [PATCH] added GCM specific ciphersuite info --- ssl/ciphersuites.c | 16 ++++++++-------- ssl/ssl_rec.c | 4 +++- ssl/sslciphers.h | 2 ++ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ssl/ciphersuites.c b/ssl/ciphersuites.c index 1954881..f3e09ff 100644 --- a/ssl/ciphersuites.c +++ b/ssl/ciphersuites.c @@ -188,14 +188,14 @@ static SSL_CipherSuite CipherSuites[]={ {49192,KEX_DH,SIG_RSA,ENC_AES256,16,256,256,DIG_SHA384,48,0}, {49193,KEX_DH,SIG_RSA,ENC_AES128,16,128,128,DIG_SHA256,32,0}, {49194,KEX_DH,SIG_RSA,ENC_AES256,16,256,256,DIG_SHA384,48,0}, - {49195,KEX_DH,SIG_DSS,ENC_AES128,4,128,128,DIG_SHA256,32,0}, - {49196,KEX_DH,SIG_DSS,ENC_AES256,4,256,256,DIG_SHA384,48,0}, - {49197,KEX_DH,SIG_DSS,ENC_AES128,4,128,128,DIG_SHA256,32,0}, - {49198,KEX_DH,SIG_DSS,ENC_AES256,4,256,256,DIG_SHA384,48,0}, - {49199,KEX_DH,SIG_RSA,ENC_AES128,4,128,128,DIG_SHA256,32,0}, - {49200,KEX_DH,SIG_RSA,ENC_AES256,4,256,256,DIG_SHA384,48,0}, - {49201,KEX_DH,SIG_RSA,ENC_AES128,4,128,128,DIG_SHA256,32,0}, - {49202,KEX_DH,SIG_RSA,ENC_AES256,4,256,256,DIG_SHA384,48,0}, + {49195,KEX_DH,SIG_DSS,ENC_AES128_GCM,4,128,128,DIG_SHA256,32,0}, + {49196,KEX_DH,SIG_DSS,ENC_AES256_GCM,4,256,256,DIG_SHA384,48,0}, + {49197,KEX_DH,SIG_DSS,ENC_AES128_GCM,4,128,128,DIG_SHA256,32,0}, + {49198,KEX_DH,SIG_DSS,ENC_AES256_GCM,4,256,256,DIG_SHA384,48,0}, + {49199,KEX_DH,SIG_RSA,ENC_AES128_GCM,4,128,128,DIG_SHA256,32,0}, + {49200,KEX_DH,SIG_RSA,ENC_AES256_GCM,4,256,256,DIG_SHA384,48,0}, + {49201,KEX_DH,SIG_RSA,ENC_AES128_GCM,4,128,128,DIG_SHA256,32,0}, + {49202,KEX_DH,SIG_RSA,ENC_AES256_GCM,4,256,256,DIG_SHA384,48,0}, // Missing: 49203-49211 {49266,KEX_DH,SIG_DSS,ENC_CAMELLIA128,16,128,128,DIG_SHA256,32,0}, {49267,KEX_DH,SIG_DSS,ENC_CAMELLIA256,16,256,256,DIG_SHA256,48,0}, diff --git a/ssl/ssl_rec.c b/ssl/ssl_rec.c index cdf946e..ab9ac6c 100644 --- a/ssl/ssl_rec.c +++ b/ssl/ssl_rec.c @@ -89,7 +89,9 @@ char *ciphers[]={ "CAMELLIA128", "CAMELLIA256", "SEED", - NULL + NULL, + "aes-128-gcm", + "aes-256-gcm" }; diff --git a/ssl/sslciphers.h b/ssl/sslciphers.h index 95e2939..a41aaf4 100644 --- a/ssl/sslciphers.h +++ b/ssl/sslciphers.h @@ -77,6 +77,8 @@ typedef struct SSL_CipherSuite_ { #define ENC_CAMELLIA256 0x38 #define ENC_SEED 0x39 #define ENC_NULL 0x3a +#define ENC_AES128_GCM 0x3b +#define ENC_AES256_GCM 0x3c #define DIG_MD5 0x40 #define DIG_SHA 0x41