Commit 3240e7cf authored by Alessandro Ghedini's avatar Alessandro Ghedini Committed by Richard Levitte
Browse files

Fix references to various RFCs 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent d900a015

include/openssl/tls1.h

+12 −25
Original line number Diff line number Diff line
@@ -237,25 +237,19 @@ extern "C" { 
/* ExtensionType value from RFC5620 */

# define TLSEXT_TYPE_heartbeat   15



/* ExtensionType value from draft-ietf-tls-applayerprotoneg-00 */

/* ExtensionType value from RFC7301 */

# define TLSEXT_TYPE_application_layer_protocol_negotiation 16



/*

 * ExtensionType value for TLS padding extension.

 * http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml

 * http://tools.ietf.org/html/draft-agl-tls-padding-03

 * http://tools.ietf.org/html/draft-agl-tls-padding

 */

# define TLSEXT_TYPE_padding     21

/*

 * Extension type for Encrypt-then-MAC

 * http://www.ietf.org/id/draft-ietf-tls-encrypt-then-mac-02.txt

 */



/* ExtensionType value from RFC7366 */

# define TLSEXT_TYPE_encrypt_then_mac    22

/*

 * Extended master secret extension.

 * http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml

 * https://tools.ietf.org/id/draft-ietf-tls-session-hash-03.txt

 */



/* ExtensionType value from RFC7627 */

# define TLSEXT_TYPE_extended_master_secret      23



/* ExtensionType value from RFC4507 */
@@ -274,7 +268,7 @@ extern "C" { 
/* status request value from RFC3546 */

# define TLSEXT_STATUSTYPE_ocsp 1



/* ECPointFormat values from draft-ietf-tls-ecc-12 */

/* ECPointFormat values from RFC4492 */

# define TLSEXT_ECPOINTFORMAT_first                      0

# define TLSEXT_ECPOINTFORMAT_uncompressed               0

# define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime  1
@@ -282,7 +276,6 @@ extern "C" { 
# define TLSEXT_ECPOINTFORMAT_last                       2



/* Signature and hash algorithms from RFC5246 */



# define TLSEXT_signature_anonymous                      0

# define TLSEXT_signature_rsa                            1

# define TLSEXT_signature_dsa                            2
@@ -443,13 +436,11 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) 
# define TLS1_CK_RSA_PSK_WITH_NULL_SHA384                0x030000B9



/* NULL PSK ciphersuites from RFC4785 */



# define TLS1_CK_PSK_WITH_NULL_SHA                       0x0300002C

# define TLS1_CK_DHE_PSK_WITH_NULL_SHA                   0x0300002D

# define TLS1_CK_RSA_PSK_WITH_NULL_SHA                   0x0300002E



/* AES ciphersuites from RFC3268 */



# define TLS1_CK_RSA_WITH_AES_128_SHA                    0x0300002F

# define TLS1_CK_DH_DSS_WITH_AES_128_SHA                 0x03000030

# define TLS1_CK_DH_RSA_WITH_AES_128_SHA                 0x03000031
@@ -538,7 +529,6 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) 
# define TLS1_CK_DHE_PSK_WITH_AES_256_CCM_8              0x0300C0AB



/* CCM ciphersuites from RFC7251 */



# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CCM            0x0300C0AC

# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CCM            0x0300C0AD

# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CCM_8          0x0300C0AE
@@ -559,10 +549,7 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) 
# define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256            0x030000C4

# define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA256                0x030000C5



/*

 * ECC ciphersuites from draft-ietf-tls-ecc-12.txt with changes soon to be in

 * draft 13

 */

/* ECC ciphersuites from RFC4492 */

# define TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA                0x0300C001

# define TLS1_CK_ECDH_ECDSA_WITH_RC4_128_SHA             0x0300C002

# define TLS1_CK_ECDH_ECDSA_WITH_DES_192_CBC3_SHA        0x0300C003
@@ -692,7 +679,7 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) 
# define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA               "DHE-RSA-AES256-SHA"

# define TLS1_TXT_ADH_WITH_AES_256_SHA                   "ADH-AES256-SHA"



/* ECC ciphersuites from draft-ietf-tls-ecc-01.txt (Mar 15, 2001) */

/* ECC ciphersuites from RFC4492 */

# define TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA               "ECDH-ECDSA-NULL-SHA"

# define TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA            "ECDH-ECDSA-RC4-SHA"

# define TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA       "ECDH-ECDSA-DES-CBC3-SHA"