Commit 2f8271eb authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Matt Caswell
Browse files

Style: ssl.h 



fix some indents, and restrict to 80 cols some lines.

Reviewed-by: default avatarBen Kaduk <kaduk@mit.edu>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4466)
parent be93b0e8

include/openssl/ssl.h

+157 −149
Original line number Diff line number Diff line
@@ -227,11 +227,9 @@ typedef struct srtp_protection_profile_st { 


DEFINE_STACK_OF(SRTP_PROTECTION_PROFILE)



typedef int (*tls_session_ticket_ext_cb_fn) (SSL *s,

                                             const unsigned char *data,

typedef int (*tls_session_ticket_ext_cb_fn)(SSL *s, const unsigned char *data,

                                            int len, void *arg);

typedef int (*tls_session_secret_cb_fn) (SSL *s, void *secret,

                                         int *secret_len,

typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len,

                                        STACK_OF(SSL_CIPHER) *peer_ciphers,

                                        const SSL_CIPHER **cipher, void *arg);
@@ -263,15 +261,15 @@ typedef int (*tls_session_secret_cb_fn) (SSL *s, void *secret, 
/* Typedefs for handling custom extensions */



typedef int (*custom_ext_add_cb)(SSL *s, unsigned int ext_type,

                                  const unsigned char **out,

                                  size_t *outlen, int *al, void *add_arg);

                                 const unsigned char **out, size_t *outlen,

                                 int *al, void *add_arg);



typedef void (*custom_ext_free_cb)(SSL *s, unsigned int ext_type,

                                   const unsigned char *out, void *add_arg);



typedef int (*custom_ext_parse_cb)(SSL *s, unsigned int ext_type,

                                    const unsigned char *in,

                                    size_t inlen, int *al, void *parse_arg);

                                   const unsigned char *in, size_t inlen,

                                   int *al, void *parse_arg);





typedef int (*SSL_custom_ext_add_cb_ex)(SSL *s, unsigned int ext_type,
@@ -698,8 +696,7 @@ int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx)) (struct ssl_st *ssl, 
void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx,

                                void (*remove_session_cb) (struct ssl_ctx_st

                                                           *ctx,

                                                           SSL_SESSION

                                                           *sess));

                                                           SSL_SESSION *sess));

void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx)) (struct ssl_ctx_st *ctx,

                                                  SSL_SESSION *sess);

void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx,
@@ -712,8 +709,7 @@ SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx)) (struct ssl_st *ssl, 
                                                       const unsigned char *data,

                                                       int len, int *copy);

void SSL_CTX_set_info_callback(SSL_CTX *ctx,

                               void (*cb) (const SSL *ssl, int type,

                                           int val));

                               void (*cb) (const SSL *ssl, int type, int val));

void (*SSL_CTX_get_info_callback(SSL_CTX *ctx)) (const SSL *ssl, int type,

                                                 int val);

void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx,
@@ -732,8 +728,8 @@ void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx, 
                                                              *cookie_len));

void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx,

                                  int (*app_verify_cookie_cb) (SSL *ssl,

                                                               const unsigned char

                                                               *cookie,

                                                               const unsigned

                                                               char *cookie,

                                                               unsigned int

                                                               cookie_len));
@@ -849,14 +845,16 @@ void SSL_CTX_set_psk_use_session_callback(SSL_CTX *ctx, 
__owur int SSL_CTX_has_client_custom_ext(const SSL_CTX *ctx,

                                         unsigned int ext_type);



__owur int SSL_CTX_add_client_custom_ext(SSL_CTX *ctx, unsigned int ext_type,

__owur int SSL_CTX_add_client_custom_ext(SSL_CTX *ctx,

                                         unsigned int ext_type,

                                         custom_ext_add_cb add_cb,

                                         custom_ext_free_cb free_cb,

                                         void *add_arg,

                                         custom_ext_parse_cb parse_cb,

                                         void *parse_arg);



__owur int SSL_CTX_add_server_custom_ext(SSL_CTX *ctx, unsigned int ext_type,

__owur int SSL_CTX_add_server_custom_ext(SSL_CTX *ctx,

                                         unsigned int ext_type,

                                         custom_ext_add_cb add_cb,

                                         custom_ext_free_cb free_cb,

                                         void *add_arg,
@@ -1455,7 +1453,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) 
#  define SSL_CTX_set_tmp_rsa_callback(ctx, cb)    while(0) (cb)(NULL, 0, 0)

#  define SSL_set_tmp_rsa_callback(ssl, cb)        while(0) (cb)(NULL, 0, 0)

# endif



__owur const BIO_METHOD *BIO_f_ssl(void);

__owur BIO *BIO_new_ssl(SSL_CTX *ctx, int client);

__owur BIO *BIO_new_ssl_connect(SSL_CTX *ctx);
@@ -1521,7 +1518,8 @@ void SSL_set_verify_depth(SSL *s, int depth); 
void SSL_set_cert_cb(SSL *s, int (*cb) (SSL *ssl, void *arg), void *arg);

# ifndef OPENSSL_NO_RSA

__owur int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa);

__owur int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, const unsigned char *d, long len);

__owur int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, const unsigned char *d,

                                      long len);

# endif

__owur int SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey);

__owur int SSL_use_PrivateKey_ASN1(int pk, SSL *ssl, const unsigned char *d,
@@ -1552,10 +1550,13 @@ __owur int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type); 
__owur int SSL_use_certificate_file(SSL *ssl, const char *file, int type);



#ifndef OPENSSL_NO_RSA

__owur int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type);

__owur int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file,

                                          int type);

#endif

__owur int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type);

__owur int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type);

__owur int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file,

                                       int type);

__owur int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file,

                                        int type);

/* PEM type */

__owur int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file);

__owur int SSL_use_certificate_chain_file(SSL *ssl, const char *file);
@@ -1601,7 +1602,8 @@ __owur int SSL_SESSION_set_max_early_data(SSL_SESSION *s, 
                                          uint32_t max_early_data);

__owur int SSL_copy_session_id(SSL *to, const SSL *from);

__owur X509 *SSL_SESSION_get0_peer(SSL_SESSION *s);

__owur int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned char *sid_ctx,

__owur int SSL_SESSION_set1_id_context(SSL_SESSION *s,

                                       const unsigned char *sid_ctx,

                                       unsigned int sid_ctx_len);

__owur int SSL_SESSION_set1_id(SSL_SESSION *s, const unsigned char *sid,

                               unsigned int sid_len);
@@ -1623,11 +1625,12 @@ int SSL_SESSION_up_ref(SSL_SESSION *ses); 
void SSL_SESSION_free(SSL_SESSION *ses);

__owur int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp);

__owur int SSL_set_session(SSL *to, SSL_SESSION *session);

int SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c);

int SSL_CTX_remove_session(SSL_CTX *, SSL_SESSION *c);

__owur int SSL_CTX_set_generate_session_id(SSL_CTX *, GEN_SESSION_CB);

__owur int SSL_set_generate_session_id(SSL *, GEN_SESSION_CB);

__owur int SSL_has_matching_session_id(const SSL *ssl, const unsigned char *id,

int SSL_CTX_add_session(SSL_CTX *ctx, SSL_SESSION *session);

int SSL_CTX_remove_session(SSL_CTX *ctx, SSL_SESSION *session);

__owur int SSL_CTX_set_generate_session_id(SSL_CTX *ctx, GEN_SESSION_CB cb);

__owur int SSL_set_generate_session_id(SSL *s, GEN_SESSION_CB cb);

__owur int SSL_has_matching_session_id(const SSL *s,

                                       const unsigned char *id,

                                       unsigned int id_len);

SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,

                             long length);
@@ -1674,7 +1677,8 @@ void *SSL_get_default_passwd_cb_userdata(SSL *s); 
__owur int SSL_CTX_check_private_key(const SSL_CTX *ctx);

__owur int SSL_check_private_key(const SSL *ctx);



__owur int SSL_CTX_set_session_id_context(SSL_CTX *ctx, const unsigned char *sid_ctx,

__owur int SSL_CTX_set_session_id_context(SSL_CTX *ctx,

                                          const unsigned char *sid_ctx,

                                          unsigned int sid_ctx_len);



SSL *SSL_new(SSL_CTX *ctx);
@@ -1683,10 +1687,10 @@ int SSL_is_dtls(const SSL *s); 
__owur int SSL_set_session_id_context(SSL *ssl, const unsigned char *sid_ctx,

                                      unsigned int sid_ctx_len);



__owur int SSL_CTX_set_purpose(SSL_CTX *s, int purpose);

__owur int SSL_set_purpose(SSL *s, int purpose);

__owur int SSL_CTX_set_trust(SSL_CTX *s, int trust);

__owur int SSL_set_trust(SSL *s, int trust);

__owur int SSL_CTX_set_purpose(SSL_CTX *ctx, int purpose);

__owur int SSL_set_purpose(SSL *ssl, int purpose);

__owur int SSL_CTX_set_trust(SSL_CTX *ctx, int trust);

__owur int SSL_set_trust(SSL *ssl, int trust);



__owur int SSL_set1_host(SSL *s, const char *hostname);

__owur int SSL_add1_host(SSL *s, const char *hostname);
@@ -1817,8 +1821,8 @@ __owur int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth); 


# ifndef OPENSSL_NO_SSL3_METHOD

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *SSLv3_method(void)) /* SSLv3 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *SSLv3_server_method(void)) /* SSLv3 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *SSLv3_client_method(void)) /* SSLv3 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *SSLv3_server_method(void))

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *SSLv3_client_method(void))

# endif



#define SSLv23_method           TLS_method
@@ -1832,32 +1836,33 @@ __owur const SSL_METHOD *TLS_client_method(void); 


# ifndef OPENSSL_NO_TLS1_METHOD

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_method(void)) /* TLSv1.0 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_server_method(void)) /* TLSv1.0 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_client_method(void)) /* TLSv1.0 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_server_method(void))

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_client_method(void))

# endif



# ifndef OPENSSL_NO_TLS1_1_METHOD

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_method(void)) /* TLSv1.1 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_server_method(void)) /* TLSv1.1 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_client_method(void)) /* TLSv1.1 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_server_method(void))

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_client_method(void))

# endif



# ifndef OPENSSL_NO_TLS1_2_METHOD

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_method(void)) /* TLSv1.2 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_server_method(void)) /* TLSv1.2 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_client_method(void)) /* TLSv1.2 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_server_method(void))

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_client_method(void))

# endif



# ifndef OPENSSL_NO_DTLS1_METHOD

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_method(void)) /* DTLSv1.0 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_server_method(void)) /* DTLSv1.0 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_client_method(void)) /* DTLSv1.0 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_server_method(void))

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_client_method(void))

# endif



# ifndef OPENSSL_NO_DTLS1_2_METHOD

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_2_method(void)) /* DTLSv1.2 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_2_server_method(void)) /* DTLSv1.2 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_2_client_method(void)) /* DTLSv1.2 */

/* DTLSv1.2 */

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_2_method(void))

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_2_server_method(void))

DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_2_client_method(void))

# endif



__owur const SSL_METHOD *DTLS_method(void); /* DTLS 1.0 and 1.2 */
@@ -1921,7 +1926,8 @@ __owur SSL *SSL_dup(SSL *ssl); 
__owur X509 *SSL_get_certificate(const SSL *ssl);

/*

 * EVP_PKEY

 */ struct evp_pkey_st *SSL_get_privatekey(const SSL *ssl);

 */

struct evp_pkey_st *SSL_get_privatekey(const SSL *ssl);



__owur X509 *SSL_CTX_get0_certificate(const SSL_CTX *ctx);

__owur EVP_PKEY *SSL_CTX_get0_privatekey(const SSL_CTX *ctx);
@@ -2052,12 +2058,13 @@ int SSL_bytes_to_cipher_list(SSL *s, const unsigned char *bytes, size_t len, 
/* TLS extensions functions */

__owur int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len);



__owur int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,

__owur int SSL_set_session_ticket_ext_cb(SSL *s,

                                         tls_session_ticket_ext_cb_fn cb,

                                         void *arg);



/* Pre-shared secret session resumption functions */

__owur int SSL_set_session_secret_cb(SSL *s,

                              tls_session_secret_cb_fn tls_session_secret_cb,

                                     tls_session_secret_cb_fn session_secret_cb,

                                     void *arg);



void SSL_CTX_set_not_resumable_session_callback(SSL_CTX *ctx,
@@ -2067,8 +2074,7 @@ void SSL_CTX_set_not_resumable_session_callback(SSL_CTX *ctx, 


void SSL_set_not_resumable_session_callback(SSL *ssl,

                                            int (*cb) (SSL *ssl,

                                                       int

                                                       is_forward_secure));

                                                       int is_forward_secure));



void SSL_CTX_set_record_padding_callback(SSL_CTX *ctx,

                                         size_t (*cb) (SSL *ssl, int type,
@@ -2095,7 +2101,8 @@ __owur __owur SSL_CONF_CTX *SSL_CONF_CTX_new(void); 
int SSL_CONF_CTX_finish(SSL_CONF_CTX *cctx);

void SSL_CONF_CTX_free(SSL_CONF_CTX *cctx);

unsigned int SSL_CONF_CTX_set_flags(SSL_CONF_CTX *cctx, unsigned int flags);

__owur unsigned int SSL_CONF_CTX_clear_flags(SSL_CONF_CTX *cctx, unsigned int flags);

__owur unsigned int SSL_CONF_CTX_clear_flags(SSL_CONF_CTX *cctx,

                                             unsigned int flags);

__owur int SSL_CONF_CTX_set1_prefix(SSL_CONF_CTX *cctx, const char *pre);



void SSL_CONF_CTX_set_ssl(SSL_CONF_CTX *cctx, SSL *ssl);
@@ -2277,21 +2284,22 @@ const CTLOG_STORE *SSL_CTX_get0_ctlog_store(const SSL_CTX *ctx); 
void SSL_set_security_level(SSL *s, int level);

__owur int SSL_get_security_level(const SSL *s);

void SSL_set_security_callback(SSL *s,

                               int (*cb) (const SSL *s, const SSL_CTX *ctx, int op,

                               int (*cb) (const SSL *s, const SSL_CTX *ctx,

                                          int op, int bits, int nid,

                                          void *other, void *ex));

int (*SSL_get_security_callback(const SSL *s)) (const SSL *s,

                                                const SSL_CTX *ctx, int op,

                                                int bits, int nid, void *other,

                                          void *ex));

int (*SSL_get_security_callback(const SSL *s)) (const SSL *s, const SSL_CTX *ctx, int op,

                                                int bits, int nid,

                                                void *other, void *ex);

                                                void *ex);

void SSL_set0_security_ex_data(SSL *s, void *ex);

__owur void *SSL_get0_security_ex_data(const SSL *s);



void SSL_CTX_set_security_level(SSL_CTX *ctx, int level);

__owur int SSL_CTX_get_security_level(const SSL_CTX *ctx);

void SSL_CTX_set_security_callback(SSL_CTX *ctx,

                                   int (*cb) (const SSL *s, const SSL_CTX *ctx, int op,

                                              int bits, int nid, void *other,

                                              void *ex));

                                   int (*cb) (const SSL *s, const SSL_CTX *ctx,

                                              int op, int bits, int nid,

                                              void *other, void *ex));

int (*SSL_CTX_get_security_callback(const SSL_CTX *ctx)) (const SSL *s,

                                                          const SSL_CTX *ctx,

                                                          int op, int bits,

util/indent.pro

+1 −0
Original line number Diff line number Diff line
@@ -636,3 +636,4 @@ 
-T ossl_intmax_t

-T ossl_uintmax_t

-T ossl_uintmax_t

-T CT_POLICY_EVAL_CTX