Commit ce01b189 authored by Rich Salz's avatar Rich Salz
Browse files

Whitespace and indent fixes 



Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/4614)
parent bc4e831c

include/openssl/tls1.h

+34 −44
Original line number Diff line number Diff line
@@ -233,13 +233,14 @@ __owur int SSL_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain) 


# define SSL_set_tlsext_host_name(s,name) \

        SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_HOSTNAME,TLSEXT_NAMETYPE_host_name,\

         (char *)(name))

                (void *)name)



# define SSL_set_tlsext_debug_callback(ssl, cb) \

SSL_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_CB,(void (*)(void))(cb))

        SSL_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_CB,\

                (void (*)(void))cb)



# define SSL_set_tlsext_debug_arg(ssl, arg) \

SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_ARG,0, (void *)(arg))

        SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_ARG,0,arg)



# define SSL_get_tlsext_status_type(ssl) \

        SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE,0,NULL)
@@ -248,26 +249,26 @@ SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE,0, NULL) 
        SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE,type,NULL)



# define SSL_get_tlsext_status_exts(ssl, arg) \

SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS,0, (void *)(arg))

        SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS,0,arg)



# define SSL_set_tlsext_status_exts(ssl, arg) \

SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS,0, (void *)(arg))

        SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS,0,arg)



# define SSL_get_tlsext_status_ids(ssl, arg) \

SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS,0, (void *)(arg))

        SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS,0,arg)



# define SSL_set_tlsext_status_ids(ssl, arg) \

SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS,0, (void *)(arg))

        SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS,0,arg)



# define SSL_get_tlsext_status_ocsp_resp(ssl, arg) \

SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP,0, (void *)(arg))

        SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP,0,arg)



# define SSL_set_tlsext_status_ocsp_resp(ssl, arg, arglen) \

SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP,arglen, (void *)(arg))

        SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP,arglen,arg)



# define SSL_CTX_set_tlsext_servername_callback(ctx, cb) \

        SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_CB,\

                      (void (*)(void))(cb))

                (void (*)(void))cb)



# define SSL_TLSEXT_ERR_OK 0

# define SSL_TLSEXT_ERR_ALERT_WARNING 1
@@ -275,23 +276,23 @@ SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_CB, \ 
# define SSL_TLSEXT_ERR_NOACK 3



# define SSL_CTX_set_tlsext_servername_arg(ctx, arg) \

SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG,0, (void *)(arg))

        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG,0,arg)



# define SSL_CTX_get_tlsext_ticket_keys(ctx, keys, keylen) \

        SSL_CTX_ctrl((ctx),SSL_CTRL_GET_TLSEXT_TICKET_KEYS,(keylen),(keys))

        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_TLSEXT_TICKET_KEYS,keylen,keys)

# define SSL_CTX_set_tlsext_ticket_keys(ctx, keys, keylen) \

        SSL_CTX_ctrl((ctx),SSL_CTRL_SET_TLSEXT_TICKET_KEYS,(keylen),(keys))

        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_TICKET_KEYS,keylen,keys)



# define SSL_CTX_get_tlsext_status_cb(ssl, cb) \

SSL_CTX_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB,0, (void (**)(void))(cb))

        SSL_CTX_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB,0,(void *)cb)

# define SSL_CTX_set_tlsext_status_cb(ssl, cb) \

        SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB,\

                      (void (*)(void))(cb))

                (void (*)(void))cb)



# define SSL_CTX_get_tlsext_status_arg(ssl, arg) \

SSL_CTX_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG,0, (void *)(arg))

        SSL_CTX_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG,0,arg)

# define SSL_CTX_set_tlsext_status_arg(ssl, arg) \

SSL_CTX_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG,0, (void *)(arg))

        SSL_CTX_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG,0,arg)



# define SSL_CTX_set_tlsext_status_type(ssl, type) \

        SSL_CTX_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE,type,NULL)
@@ -301,16 +302,16 @@ SSL_CTX_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG,0, (void *)(arg)) 


# define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb) \

        SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,\

                      (void (*)(void))(cb))

                (void (*)(void))cb)



# ifndef OPENSSL_NO_HEARTBEATS

#  define SSL_DTLSEXT_HB_ENABLED                   0x01

#  define SSL_DTLSEXT_HB_DONT_SEND_REQUESTS        0x02

#  define SSL_DTLSEXT_HB_DONT_RECV_REQUESTS        0x04

#  define SSL_get_dtlsext_heartbeat_pending(ssl) \

        SSL_ctrl((ssl),SSL_CTRL_GET_DTLS_EXT_HEARTBEAT_PENDING,0,NULL)

        SSL_ctrl(ssl,SSL_CTRL_GET_DTLS_EXT_HEARTBEAT_PENDING,0,NULL)

#  define SSL_set_dtlsext_heartbeat_no_requests(ssl, arg) \

        SSL_ctrl((ssl),SSL_CTRL_SET_DTLS_EXT_HEARTBEAT_NO_REQUESTS,arg,NULL)

        SSL_ctrl(ssl,SSL_CTRL_SET_DTLS_EXT_HEARTBEAT_NO_REQUESTS,arg,NULL)



#  if OPENSSL_API_COMPAT < 0x10100000L

#   define SSL_CTRL_TLS_EXT_SEND_HEARTBEAT \
@@ -337,12 +338,10 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB, \ 
# define TLS1_CK_PSK_WITH_3DES_EDE_CBC_SHA               0x0300008B

# 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
@@ -355,17 +354,14 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB, \ 
# define TLS1_CK_DHE_PSK_WITH_AES_256_GCM_SHA384         0x030000AB

# define TLS1_CK_RSA_PSK_WITH_AES_128_GCM_SHA256         0x030000AC

# define TLS1_CK_RSA_PSK_WITH_AES_256_GCM_SHA384         0x030000AD



# define TLS1_CK_PSK_WITH_AES_128_CBC_SHA256             0x030000AE

# define TLS1_CK_PSK_WITH_AES_256_CBC_SHA384             0x030000AF

# define TLS1_CK_PSK_WITH_NULL_SHA256                    0x030000B0

# define TLS1_CK_PSK_WITH_NULL_SHA384                    0x030000B1



# define TLS1_CK_DHE_PSK_WITH_AES_128_CBC_SHA256         0x030000B2

# define TLS1_CK_DHE_PSK_WITH_AES_256_CBC_SHA384         0x030000B3

# define TLS1_CK_DHE_PSK_WITH_NULL_SHA256                0x030000B4

# define TLS1_CK_DHE_PSK_WITH_NULL_SHA384                0x030000B5



# define TLS1_CK_RSA_PSK_WITH_AES_128_CBC_SHA256         0x030000B6

# define TLS1_CK_RSA_PSK_WITH_AES_256_CBC_SHA384         0x030000B7

# define TLS1_CK_RSA_PSK_WITH_NULL_SHA256                0x030000B8
@@ -383,7 +379,6 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB, \ 
# define TLS1_CK_DHE_DSS_WITH_AES_128_SHA                0x03000032

# define TLS1_CK_DHE_RSA_WITH_AES_128_SHA                0x03000033

# define TLS1_CK_ADH_WITH_AES_128_SHA                    0x03000034



# define TLS1_CK_RSA_WITH_AES_256_SHA                    0x03000035

# define TLS1_CK_DH_DSS_WITH_AES_256_SHA                 0x03000036

# define TLS1_CK_DH_RSA_WITH_AES_256_SHA                 0x03000037
@@ -528,7 +523,6 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB, \ 
# define TLS1_CK_SRP_SHA_DSS_WITH_AES_256_CBC_SHA        0x0300C022



/* ECDH HMAC based ciphersuites from RFC5289 */



# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_SHA256         0x0300C023

# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_SHA384         0x0300C024

# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_SHA256          0x0300C025
@@ -558,7 +552,6 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB, \ 
# define TLS1_CK_ECDHE_PSK_WITH_AES_256_CBC_SHA384       0x0300C038



/* NULL PSK ciphersuites from RFC4785 */



# define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA                 0x0300C039

# define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA256              0x0300C03A

# define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA384              0x0300C03B
@@ -1002,7 +995,6 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB, \ 
# define TLS1_TXT_ADH_WITH_AES_256_GCM_SHA384            "ADH-AES256-GCM-SHA384"



/* CCM ciphersuites from RFC6655 */



# define TLS1_TXT_RSA_WITH_AES_128_CCM                   "AES128-CCM"

# define TLS1_TXT_RSA_WITH_AES_256_CCM                   "AES256-CCM"

# define TLS1_TXT_DHE_RSA_WITH_AES_128_CCM               "DHE-RSA-AES128-CCM"
@@ -1024,14 +1016,12 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB, \ 
# define TLS1_TXT_DHE_PSK_WITH_AES_256_CCM_8             "DHE-PSK-AES256-CCM8"



/* CCM ciphersuites from RFC7251 */



# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CCM       "ECDHE-ECDSA-AES128-CCM"

# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CCM       "ECDHE-ECDSA-AES256-CCM"

# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CCM_8     "ECDHE-ECDSA-AES128-CCM8"

# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CCM_8     "ECDHE-ECDSA-AES256-CCM8"



/* ECDH HMAC based ciphersuites from RFC5289 */



# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_SHA256    "ECDHE-ECDSA-AES128-SHA256"

# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_SHA384    "ECDHE-ECDSA-AES256-SHA384"

# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_SHA256     "ECDH-ECDSA-AES128-SHA256"