Commit f40ecbc3 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Initial new PSK ciphersuite defines 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 2a1a04e1

include/openssl/tls1.h

+31 −0
Original line number Diff line number Diff line
@@ -409,6 +409,16 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) 
# define TLS1_CK_PSK_WITH_AES_128_CBC_SHA                0x0300008C

# define TLS1_CK_PSK_WITH_AES_256_CBC_SHA                0x0300008D



# define TLS1_CK_DHE_PSK_WITH_RC4_128_SHA                0x0300008E

# define TLS1_CK_DHE_PSK_WITH_3DES_EDE_CBC_SHA           0x0300008F

# define TLS1_CK_DHE_PSK_WITH_AES_128_CBC_SHA            0x03000090

# define TLS1_CK_DHE_PSK_WITH_AES_256_CBC_SHA            0x03000091



# define TLS1_CK_RSA_PSK_WITH_RC4_128_SHA                0x03000092

# define TLS1_CK_RSA_PSK_WITH_3DES_EDE_CBC_SHA           0x03000093

# define TLS1_CK_RSA_PSK_WITH_AES_128_CBC_SHA            0x03000094

# define TLS1_CK_RSA_PSK_WITH_AES_256_CBC_SHA            0x03000095



/* AES ciphersuites from RFC3268 */



# define TLS1_CK_RSA_WITH_AES_128_SHA                    0x0300002F
@@ -565,6 +575,12 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) 
# define TLS1_CK_ECDH_RSA_WITH_AES_128_GCM_SHA256        0x0300C031

# define TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384        0x0300C032



/* ECDHE PSK ciphersuites from RFC5489 */

# define TLS1_CK_ECDHE_PSK_WITH_RC4_128_SHA              0x0300C033

# define TLS1_CK_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA         0x0300C034

# define TLS1_CK_ECDHE_PSK_WITH_AES_128_CBC_SHA          0x0300C035

# define TLS1_CK_ECDHE_PSK_WITH_AES_256_CBC_SHA          0x0300C036



/* Camellia-CBC ciphersuites from RFC6367 */

# define TLS1_CK_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 0x0300C072

# define TLS1_CK_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 0x0300C073
@@ -641,6 +657,15 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) 
# define TLS1_TXT_PSK_WITH_AES_128_CBC_SHA               "PSK-AES128-CBC-SHA"

# define TLS1_TXT_PSK_WITH_AES_256_CBC_SHA               "PSK-AES256-CBC-SHA"



# define TLS1_TXT_DHE_PSK_WITH_RC4_128_SHA               "DHE-PSK-RC4-SHA"

# define TLS1_TXT_DHE_PSK_WITH_3DES_EDE_CBC_SHA          "DHE-PSK-3DES-EDE-CBC-SHA"

# define TLS1_TXT_DHE_PSK_WITH_AES_128_CBC_SHA           "DHE-PSK-AES128-CBC-SHA"

# define TLS1_TXT_DHE_PSK_WITH_AES_256_CBC_SHA           "DHE-PSK-AES256-CBC-SHA"

# define TLS1_TXT_RSA_PSK_WITH_RC4_128_SHA               "RSA-PSK-RC4-SHA"

# define TLS1_TXT_RSA_PSK_WITH_3DES_EDE_CBC_SHA          "RSA-PSK-3DES-EDE-CBC-SHA"

# define TLS1_TXT_RSA_PSK_WITH_AES_128_CBC_SHA           "RSA-PSK-AES128-CBC-SHA"

# define TLS1_TXT_RSA_PSK_WITH_AES_256_CBC_SHA           "RSA-PSK-AES256-CBC-SHA"



/* SRP ciphersuite from RFC 5054 */

# define TLS1_TXT_SRP_SHA_WITH_3DES_EDE_CBC_SHA          "SRP-3DES-EDE-CBC-SHA"

# define TLS1_TXT_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA      "SRP-RSA-3DES-EDE-CBC-SHA"
@@ -744,6 +769,12 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) 
# define TLS1_TXT_PSK_WITH_AES_128_GCM_SHA256            "PSK-AES128-GCM-SHA256"

# define TLS1_TXT_PSK_WITH_AES_256_GCM_SHA384            "PSK-AES256-GCM-SHA384"



/* ECDHE PSK ciphersuites from RFC 5489 */

# define TLS1_TXT_ECDHE_PSK_WITH_RC4_128_SHA               "ECDHE-PSK-RC4-SHA"

# define TLS1_TXT_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA          "ECDHE-PSK-3DES-EDE-CBC-SHA"

# define TLS1_TXT_ECDHE_PSK_WITH_AES_128_CBC_SHA           "ECDHE-PSK-AES128-CBC-SHA"

# define TLS1_TXT_ECDHE_PSK_WITH_AES_256_CBC_SHA           "ECDHE-PSK-AES256-CBC-SHA"



/* Camellia-CBC ciphersuites from RFC6367 */

# define TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 "ECDHE-ECDSA-CAMELLIA128-SHA256"

# define TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 "ECDHE-ECDSA-CAMELLIA256-SHA384"