From 8737e75639e38c5ea80b6eff1be8b0112a6f71eb Mon Sep 17 00:00:00 2001 From: Gautham Kuppuswamy Date: Wed, 7 Aug 2024 06:00:34 -0400 Subject: [PATCH 1/3] Curve definitions and setting them using gsk_attribute_set_buffer Signed-off-by: Gautham Kuppuswamy --- CHANGELOG.md | 3 ++ c/tls.c | 19 ++++++++++ h/tls.h | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48b28cf58..b5603b71b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Zowe Common C Changelog +## `2.18.0` +- As a part of curve customization support, supported curves and their mapping to iana numbers are defined in tls.h. They are set using 'gsk_attribute_set_buffer' in tls.c. Currently, the list of supported curves can be seen here https://www.ibm.com/docs/en/zos/3.1.0?topic=programming-cipher-suite-definitions#csdcwh__tttcsd (#466). + ## `2.17.0` - Fixed `xplatform.loadFileUTF8` when trying to open nonexistent file (#454) - Bugfix: fix an incorrect check in the recovery router code which might lead to diff --git a/c/tls.c b/c/tls.c index 70af67fbe..6720a81e6 100644 --- a/c/tls.c +++ b/c/tls.c @@ -125,6 +125,16 @@ int tlsInit(TlsEnvironment **outEnv, TlsSettings *settings) { rc = rc || gsk_attribute_set_enum(env->envHandle, GSK_PROTOCOL_TLSV1, GSK_PROTOCOL_TLSV1_OFF); rc = rc || gsk_attribute_set_enum(env->envHandle, GSK_PROTOCOL_TLSV1_1, GSK_PROTOCOL_TLSV1_1_OFF); + char *curves = settings->curves; + if (curves) { + rc = rc || gsk_attribute_set_buffer(env->envHandle, GSK_CLIENT_ECURVE_LIST, curves, 0); + if (!rc) { + zowelog(NULL, LOG_COMP_HTTPSERVER, ZOWE_LOG_DEBUG, "Curves set using gsk_attribute_set_buffer\n"); + } else { + zowelog(NULL, LOG_COMP_HTTPSERVER, ZOWE_LOG_DEBUG, "Failure to set curves using gsk_attribute_set_buffer\n"); + } + } + int tlsMin = getTlsMin(settings); int tlsMax = getTlsMax(settings); if (tlsMax < tlsMin) { @@ -236,6 +246,15 @@ int tlsSocketInit(TlsEnvironment *env, TlsSocket **outSocket, int fd, bool isSer rc = rc || gsk_attribute_set_buffer(socket->socketHandle, GSK_V3_CIPHER_SPECS_EXPANDED, ciphers, 0); rc = rc || gsk_attribute_set_enum(socket->socketHandle, GSK_V3_CIPHERS, GSK_V3_CIPHERS_CHAR4); } + char *curves = env->settings->curves; + if (curves) { + rc = rc || gsk_attribute_set_buffer(socket->socketHandle, GSK_CLIENT_ECURVE_LIST, curves, 0); + if (!rc) { + zowelog(NULL, LOG_COMP_HTTPSERVER, ZOWE_LOG_DEBUG, "Curves set using gsk_attribute_set_buffer\n"); + } else { + zowelog(NULL, LOG_COMP_HTTPSERVER, ZOWE_LOG_DEBUG, "Failure to set curves using gsk_attribute_set_buffer\n"); + } + } rc = rc || gsk_attribute_set_enum(socket->socketHandle, GSK_SESSION_TYPE, isServer ? GSK_SERVER_SESSION_WITH_CL_AUTH : GSK_CLIENT_SESSION); int tlsMin = getTlsMin(env->settings); diff --git a/h/tls.h b/h/tls.h index e70c90091..79fb05897 100644 --- a/h/tls.h +++ b/h/tls.h @@ -136,6 +136,41 @@ typedef struct TlsSettings_tag { */ char *maxTls; char *minTls; +#define TLS_CURVE_RESERVED_DEFAULT "0000" +#define TLS_CURVE_SECT163K1 "0001" +#define TLS_CURVE_SECT163R1 "0002" +#define TLS_CURVE_SECT163R2 "0003" +#define TLS_CURVE_SECT193R1 "0004" +#define TLS_CURVE_SECT193R2 "0005" +#define TLS_CURVE_SECT233K1 "0006" +#define TLS_CURVE_SECT233R1 "0007" +#define TLS_CURVE_SECT239K1 "0008" +#define TLS_CURVE_SECT283K1 "0009" +#define TLS_CURVE_SECT283R1 "0010" +#define TLS_CURVE_SECT409K1 "0011" +#define TLS_CURVE_SECT409R1 "0012" +#define TLS_CURVE_SECT571K1 "0013" +#define TLS_CURVE_SECT571R1 "0014" +#define TLS_CURVE_SECP160K1 "0015" +#define TLS_CURVE_SECP160R1 "0016" +#define TLS_CURVE_SECP160R2 "0017" +#define TLS_CURVE_SECP192K1 "0018" +#define TLS_CURVE_PRIME192V "0019" +#define TLS_CURVE_SECP224K1 "0020" +#define TLS_CURVE_SECP224R1 "0021" +#define TLS_CURVE_SECP256K1 "0022" +#define TLS_CURVE_SECP384R1 "0024" +#define TLS_CURVE_PRIME256V1 "0023" +#define TLS_CURVE_SECP521R1 "0025" +#define TLS_CURVE_BRAINPOOLP256R1 "0026" +#define TLS_CURVE_BRAINPOOLP384R1 "0027" +#define TLS_CURVE_BRAINPOOLP512R1 "0028" +#define TLS_CURVE_X25519 "0029" +#define TLS_CURVE_X448 "0030" +#define TLS_CURVE_BRAINPOOLP256R1TLS13 "0031" +#define TLS_CURVE_BRAINPOOLP384R1TLS13 "0032" +#define TLS_CURVE_BRAINPOOLP512R1TLS13 "0033" + char *curves; } TlsSettings; typedef struct TlsEnvironment_tag { @@ -244,6 +279,75 @@ typedef struct CipherMap_tag { {0, NULL}\ }; + typedef struct CurveMap_tag { + const char* name; + const char* groupId; //number string +} CurveMap; + +#define TLS_IANA_CURVE_MAP(ianaCurveMap)\ + static const CurveMap ianaCurveMap[] = {\ + {"secp192r1",TLS_CURVE_PRIME192V},\ + {"NIST P-192",TLS_CURVE_PRIME192V},\ + {"prime192v",TLS_CURVE_PRIME192V},\ + {"secp224r1", TLS_CURVE_SECP224R1},\ + {"NIST P-224", TLS_CURVE_SECP224R1},\ + {"NIST P-256",TLS_CURVE_PRIME256V1},\ + {"secp256r1",TLS_CURVE_PRIME256V1},\ + {"prime256v1",TLS_CURVE_PRIME256V1},\ + {"NIST P-384", TLS_CURVE_SECP384R1},\ + {"secp384r1", TLS_CURVE_SECP384R1},\ + {"NIST P-521", TLS_CURVE_SECP521R1},\ + {"secp521r1", TLS_CURVE_SECP521R1},\ + {"x25519", TLS_CURVE_X25519},\ + {"x448", TLS_CURVE_X448},\ + {0, NULL}\ +}; + +/* + Currently, only the curves mentioned https://www.ibm.com/docs/en/zos/3.1.0?topic=programming-cipher-suite-definitions#csdcwh__tttcsd + are supported, if any curves are added in the future they should be added to the above array. + + {"NIST K-163", TLS_CURVE_SECT163K1},\ + {"NIST K-283", TLS_CURVE_SECT283K1},\ + {"brainpoolP256r1", TLS_CURVE_BRAINPOOLP256R1},\ + {"sect163k1", TLS_CURVE_SECT163K1},\ + {"NIST K-163", TLS_CURVE_SECT163K1},\ + {"sect163r2", TLS_CURVE_SECT163R2},\ + {"NIST B-163", TLS_CURVE_SECT163R2},\ + {"sect233k1", TLS_CURVE_SECT233K1},\ + {"NIST K-233", TLS_CURVE_SECT233K1},\ + {"sect233r1", TLS_CURVE_SECT233R1},\ + {"NIST K-233", TLS_CURVE_SECT233R1},\ + {"sect283k1", TLS_CURVE_SECT283K1},\ + {"NIST K-283", TLS_CURVE_SECT283K1},\ + {"sect283r1", TLS_CURVE_SECT283R1},\ + {"NIST B-283", TLS_CURVE_SECT283R1},\ + {"sect409k1", TLS_CURVE_SECT409K1},\ + {"NIST K-409", TLS_CURVE_SECT409K1},\ + {"sect409r1", TLS_CURVE_SECT409R1},\ + {"NIST B-409", TLS_CURVE_SECT409R1},\ + {"sect571k1", TLS_CURVE_SECT571K1},\ + {"NIST K-571", TLS_CURVE_SECT571K1},\ + {"sect571r1", TLS_CURVE_SECT571R1},\ + {"NIST B-571", TLS_CURVE_SECT571R1},\ + {"sect163r1", TLS_CURVE_SECT163R1},\ + {"sect193r1", TLS_CURVE_SECT193R1},\ + {"sect193r2", TLS_CURVE_SECT193R2},\ + {"sect239k1", TLS_CURVE_SECT239K1},\ + {"secp160k1", TLS_CURVE_SECP160K1},\ + {"secp160r1", TLS_CURVE_SECP160R1},\ + {"secp160r2", TLS_CURVE_SECP160R2},\ + {"secp192k1", TLS_CURVE_SECP192K1},\ + {"secp224k1", TLS_CURVE_SECP224K1},\ + {"secp256k1", TLS_CURVE_SECP256K1},\ + {"brainpoolP256r1", TLS_CURVE_BRAINPOOLP256R1},\ + {"brainpoolP384r1", TLS_CURVE_BRAINPOOLP384R1},\ + {"brainpoolP512r1", TLS_CURVE_BRAINPOOLP512R1},\ + {"brainpoolP256r1tls13", TLS_CURVE_BRAINPOOLP256R1TLS13},\ + {"brainpoolP384r1tls13", TLS_CURVE_BRAINPOOLP384R1TLS13},\ + {"brainpoolP512r1tls13", TLS_CURVE_BRAINPOOLP512R1TLS13},\ +*/ + int tlsInit(TlsEnvironment **outEnv, TlsSettings *settings); int tlsDestroy(TlsEnvironment *env); int tlsSocketInit(TlsEnvironment *env, TlsSocket **outSocket, int fd, bool isServer); From e08ad780d0beff6435760465fe3185556fbb17f0 Mon Sep 17 00:00:00 2001 From: Gautham Kuppuswamy Date: Thu, 8 Aug 2024 05:02:30 -0400 Subject: [PATCH 2/3] Treating the return code we get from setting the curves separately Signed-off-by: Gautham Kuppuswamy --- c/tls.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/c/tls.c b/c/tls.c index 6720a81e6..7e39f6de3 100644 --- a/c/tls.c +++ b/c/tls.c @@ -126,13 +126,15 @@ int tlsInit(TlsEnvironment **outEnv, TlsSettings *settings) { rc = rc || gsk_attribute_set_enum(env->envHandle, GSK_PROTOCOL_TLSV1_1, GSK_PROTOCOL_TLSV1_1_OFF); char *curves = settings->curves; + int curveRC = 0; if (curves) { - rc = rc || gsk_attribute_set_buffer(env->envHandle, GSK_CLIENT_ECURVE_LIST, curves, 0); - if (!rc) { + curveRC = gsk_attribute_set_buffer(env->envHandle, GSK_CLIENT_ECURVE_LIST, curves, 0); + if (!curveRC) { zowelog(NULL, LOG_COMP_HTTPSERVER, ZOWE_LOG_DEBUG, "Curves set using gsk_attribute_set_buffer\n"); } else { zowelog(NULL, LOG_COMP_HTTPSERVER, ZOWE_LOG_DEBUG, "Failure to set curves using gsk_attribute_set_buffer\n"); } + rc = rc || curveRC; } int tlsMin = getTlsMin(settings); @@ -247,13 +249,15 @@ int tlsSocketInit(TlsEnvironment *env, TlsSocket **outSocket, int fd, bool isSer rc = rc || gsk_attribute_set_enum(socket->socketHandle, GSK_V3_CIPHERS, GSK_V3_CIPHERS_CHAR4); } char *curves = env->settings->curves; + int curveRC = 0; if (curves) { - rc = rc || gsk_attribute_set_buffer(socket->socketHandle, GSK_CLIENT_ECURVE_LIST, curves, 0); - if (!rc) { + curveRC = gsk_attribute_set_buffer(socket->socketHandle, GSK_CLIENT_ECURVE_LIST, curves, 0); + if (!curveRC) { zowelog(NULL, LOG_COMP_HTTPSERVER, ZOWE_LOG_DEBUG, "Curves set using gsk_attribute_set_buffer\n"); } else { zowelog(NULL, LOG_COMP_HTTPSERVER, ZOWE_LOG_DEBUG, "Failure to set curves using gsk_attribute_set_buffer\n"); } + rc = rc || curveRC; } rc = rc || gsk_attribute_set_enum(socket->socketHandle, GSK_SESSION_TYPE, isServer ? GSK_SERVER_SESSION_WITH_CL_AUTH : GSK_CLIENT_SESSION); From 654c8da6007b994879fde6e05f43f3861e9e093f Mon Sep 17 00:00:00 2001 From: Gautham Kuppuswamy Date: Fri, 16 Aug 2024 10:03:30 -0400 Subject: [PATCH 3/3] Changed description of IANA number string in Curve map structure Signed-off-by: Gautham Kuppuswamy --- h/tls.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/h/tls.h b/h/tls.h index 79fb05897..5bd6c5d25 100644 --- a/h/tls.h +++ b/h/tls.h @@ -281,7 +281,7 @@ typedef struct CipherMap_tag { typedef struct CurveMap_tag { const char* name; - const char* groupId; //number string + const char* groupId; //I.A.N.A Elliptic curve enumerator (number string) } CurveMap; #define TLS_IANA_CURVE_MAP(ianaCurveMap)\