diff options
author | Zoltan Fridrich <zfridric@redhat.com> | 2023-01-27 15:03:53 +0100 |
---|---|---|
committer | Zoltan Fridrich <zfridric@redhat.com> | 2023-01-27 15:11:28 +0100 |
commit | 50e0c39fc9b8e0ae493f42a3046db5e70f8ea044 (patch) | |
tree | 36d6eb0dde4d81527a07017d6df7d1dd4b7e436e /extra | |
parent | 21288eb0ce9d27f00c4f8ac8048b22f4003f65ac (diff) | |
download | gnutls-50e0c39fc9b8e0ae493f42a3046db5e70f8ea044.tar.gz |
Indent code
Co-authored-by: Simon Josefsson <simon@josefsson.org>
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
Diffstat (limited to 'extra')
-rw-r--r-- | extra/gnutls_openssl.c | 50 | ||||
-rw-r--r-- | extra/includes/gnutls/openssl.h | 143 | ||||
-rw-r--r-- | extra/openssl_compat.c | 12 | ||||
-rw-r--r-- | extra/openssl_compat.h | 4 |
4 files changed, 86 insertions, 123 deletions
diff --git a/extra/gnutls_openssl.c b/extra/gnutls_openssl.c index ba53733e1a..f61d09829a 100644 --- a/extra/gnutls_openssl.c +++ b/extra/gnutls_openssl.c @@ -33,7 +33,7 @@ * undefine it to avoid the conflict with openssl.h. */ #ifdef X509_NAME -#undef X509_NAME +# undef X509_NAME #endif #include <gnutls/openssl.h> @@ -62,7 +62,6 @@ void OpenSSL_add_all_algorithms(void) { } - /* SSL_CTX structure handling */ SSL_CTX *SSL_CTX_new(SSL_METHOD * method) @@ -89,10 +88,9 @@ int SSL_CTX_set_default_verify_paths(SSL_CTX * ctx) return 0; } -int -SSL_CTX_use_certificate_file(SSL_CTX * ctx, const char *certfile, int type) +int SSL_CTX_use_certificate_file(SSL_CTX * ctx, const char *certfile, int type) { - ctx->certfile = (char *) calloc(1, strlen(certfile) + 1); + ctx->certfile = (char *)calloc(1, strlen(certfile) + 1); if (!ctx->certfile) return -1; memcpy(ctx->certfile, certfile, strlen(certfile)); @@ -102,10 +100,9 @@ SSL_CTX_use_certificate_file(SSL_CTX * ctx, const char *certfile, int type) return 1; } -int -SSL_CTX_use_PrivateKey_file(SSL_CTX * ctx, const char *keyfile, int type) +int SSL_CTX_use_PrivateKey_file(SSL_CTX * ctx, const char *keyfile, int type) { - ctx->keyfile = (char *) calloc(1, strlen(keyfile) + 1); + ctx->keyfile = (char *)calloc(1, strlen(keyfile) + 1); if (!ctx->keyfile) return -1; memcpy(ctx->keyfile, keyfile, strlen(keyfile)); @@ -118,7 +115,7 @@ SSL_CTX_use_PrivateKey_file(SSL_CTX * ctx, const char *keyfile, int type) void SSL_CTX_set_verify(SSL_CTX * ctx, int verify_mode, - int (*verify_callback) (int, X509_STORE_CTX *)) + int (*verify_callback)(int, X509_STORE_CTX *)) { ctx->verify_mode = verify_mode; ctx->verify_callback = verify_callback; @@ -145,7 +142,6 @@ int SSL_CTX_set_cipher_list(SSL_CTX * ctx, const char *list) return 1; } - /* SSL_CTX statistics */ long SSL_CTX_sess_number(SSL_CTX * ctx) @@ -198,8 +194,6 @@ long SSL_CTX_sess_timeouts(SSL_CTX * ctx) return 0; } - - /* SSL structure handling */ SSL *SSL_new(SSL_CTX * ctx) @@ -267,8 +261,7 @@ int SSL_get_error(SSL * ssl, int ret) int SSL_set_fd(SSL * ssl, int fd) { - gnutls_transport_set_ptr(ssl->gnutls_state, - GNUTLS_INT_TO_POINTER(fd)); + gnutls_transport_set_ptr(ssl->gnutls_state, GNUTLS_INT_TO_POINTER(fd)); return 1; } @@ -311,7 +304,7 @@ int SSL_pending(SSL * ssl) void SSL_set_verify(SSL * ssl, int verify_mode, - int (*verify_callback) (int, X509_STORE_CTX *)) + int (*verify_callback)(int, X509_STORE_CTX *)) { ssl->verify_mode = verify_mode; ssl->verify_callback = verify_callback; @@ -480,7 +473,6 @@ int SSL_want(SSL * ssl) return SSL_NOTHING; } - /* SSL_METHOD functions */ SSL_METHOD *SSLv23_client_method(void) @@ -490,8 +482,7 @@ SSL_METHOD *SSLv23_client_method(void) if (!m) return NULL; - strcpy(m->priority_string, - "NORMAL"); + strcpy(m->priority_string, "NORMAL"); m->connend = GNUTLS_CLIENT; @@ -505,8 +496,7 @@ SSL_METHOD *SSLv23_server_method(void) if (!m) return NULL; - strcpy(m->priority_string, - "NORMAL"); + strcpy(m->priority_string, "NORMAL"); m->connend = GNUTLS_SERVER; return m; @@ -568,7 +558,6 @@ SSL_METHOD *TLSv1_server_method(void) return m; } - /* SSL_CIPHER functions */ SSL_CIPHER *SSL_get_current_cipher(SSL * ssl) @@ -583,8 +572,7 @@ SSL_CIPHER *SSL_get_current_cipher(SSL * ssl) ssl->ciphersuite.mac = gnutls_mac_get(ssl->gnutls_state); ssl->ciphersuite.compression = gnutls_compression_get(ssl->gnutls_state); - ssl->ciphersuite.cert = - gnutls_certificate_type_get(ssl->gnutls_state); + ssl->ciphersuite.cert = gnutls_certificate_type_get(ssl->gnutls_state); return &(ssl->ciphersuite); } @@ -638,7 +626,7 @@ char *SSL_CIPHER_description(SSL_CIPHER * cipher, char *buf, int size) tmpsize = size; local_alloc = 0; } else { - tmpbuf = (char *) malloc(128); + tmpbuf = (char *)malloc(128); tmpsize = 128; local_alloc = 1; } @@ -650,13 +638,12 @@ char *SSL_CIPHER_description(SSL_CIPHER * cipher, char *buf, int size) gnutls_mac_get_name(cipher->mac)) == -1) { if (local_alloc) free(tmpbuf); - return (char *) "Buffer too small"; + return (char *)"Buffer too small"; } return tmpbuf; } - /* X509 functions */ X509_NAME *X509_get_subject_name(const X509 * cert) @@ -706,13 +693,11 @@ void X509_free(const X509 * cert) /* only get certificates as const items */ } - /* BIO functions */ void BIO_get_fd(gnutls_session_t gnutls_state, int *fd) { - gnutls_transport_ptr_t tmp = - gnutls_transport_get_ptr(gnutls_state); + gnutls_transport_ptr_t tmp = gnutls_transport_get_ptr(gnutls_state); *fd = GNUTLS_POINTER_TO_INT(tmp); } @@ -729,7 +714,6 @@ BIO *BIO_new_socket(int sock, int close_flag) return bio; } - /* error handling */ unsigned long ERR_get_error(void) @@ -747,7 +731,6 @@ const char *ERR_error_string(unsigned long e, char *buf) return gnutls_strerror(-1 * e); } - /* RAND functions */ int RAND_status(void) @@ -792,13 +775,12 @@ int RAND_egd_bytes(const char *path, int bytes) return bytes; } - /* message digest functions */ void MD5_Init(MD5_CTX * ctx) { int ret; - ret = gnutls_hash_init((void *) &ctx->handle, GNUTLS_DIG_MD5); + ret = gnutls_hash_init((void *)&ctx->handle, GNUTLS_DIG_MD5); if (ret < 0) abort(); } @@ -827,7 +809,7 @@ unsigned char *MD5(const unsigned char *buf, unsigned long len, void RIPEMD160_Init(RIPEMD160_CTX * ctx) { int ret; - ret = gnutls_hash_init((void *) &ctx->handle, GNUTLS_DIG_RMD160); + ret = gnutls_hash_init((void *)&ctx->handle, GNUTLS_DIG_RMD160); if (ret < 0) abort(); } diff --git a/extra/includes/gnutls/openssl.h b/extra/includes/gnutls/openssl.h index 23ed6c1d02..aead126767 100644 --- a/extra/includes/gnutls/openssl.h +++ b/extra/includes/gnutls/openssl.h @@ -29,23 +29,23 @@ */ #ifndef GNUTLS_OPENSSL_H -#define GNUTLS_OPENSSL_H +# define GNUTLS_OPENSSL_H -#ifdef __cplusplus +# ifdef __cplusplus extern "C" { -#endif +# endif -#include <gnutls/gnutls.h> +# include <gnutls/gnutls.h> /* Extra definitions that no longer exist in gnutls. */ -#define GNUTLS_X509_CN_SIZE 256 -#define GNUTLS_X509_C_SIZE 3 -#define GNUTLS_X509_O_SIZE 256 -#define GNUTLS_X509_OU_SIZE 256 -#define GNUTLS_X509_L_SIZE 256 -#define GNUTLS_X509_S_SIZE 256 -#define GNUTLS_X509_EMAIL_SIZE 256 +# define GNUTLS_X509_CN_SIZE 256 +# define GNUTLS_X509_C_SIZE 3 +# define GNUTLS_X509_O_SIZE 256 +# define GNUTLS_X509_OU_SIZE 256 +# define GNUTLS_X509_L_SIZE 256 +# define GNUTLS_X509_S_SIZE 256 +# define GNUTLS_X509_EMAIL_SIZE 256 typedef struct { char common_name[GNUTLS_X509_CN_SIZE]; @@ -57,37 +57,36 @@ extern "C" { char email[GNUTLS_X509_EMAIL_SIZE]; } gnutls_x509_dn; +# define OPENSSL_VERSION_NUMBER (0x0090604F) +# define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER +# define OPENSSL_VERSION_TEXT ("GNUTLS " GNUTLS_VERSION " ") -#define OPENSSL_VERSION_NUMBER (0x0090604F) -#define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER -#define OPENSSL_VERSION_TEXT ("GNUTLS " GNUTLS_VERSION " ") - -#define SSL_ERROR_NONE (0) -#define SSL_ERROR_SSL (1) -#define SSL_ERROR_WANT_READ (2) -#define SSL_ERROR_WANT_WRITE (3) -#define SSL_ERROR_SYSCALL (5) -#define SSL_ERROR_ZERO_RETURN (6) +# define SSL_ERROR_NONE (0) +# define SSL_ERROR_SSL (1) +# define SSL_ERROR_WANT_READ (2) +# define SSL_ERROR_WANT_WRITE (3) +# define SSL_ERROR_SYSCALL (5) +# define SSL_ERROR_ZERO_RETURN (6) -#define SSL_FILETYPE_PEM (GNUTLS_X509_FMT_PEM) +# define SSL_FILETYPE_PEM (GNUTLS_X509_FMT_PEM) -#define SSL_VERIFY_NONE (0) +# define SSL_VERIFY_NONE (0) -#define SSL_ST_OK (1) +# define SSL_ST_OK (1) -#define X509_V_ERR_CERT_NOT_YET_VALID (1) -#define X509_V_ERR_CERT_HAS_EXPIRED (2) -#define X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT (3) +# define X509_V_ERR_CERT_NOT_YET_VALID (1) +# define X509_V_ERR_CERT_HAS_EXPIRED (2) +# define X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT (3) -#define SSL_OP_ALL (0x000FFFFF) -#define SSL_OP_NO_TLSv1 (0x0400000) +# define SSL_OP_ALL (0x000FFFFF) +# define SSL_OP_NO_TLSv1 (0x0400000) -#define SSL_MODE_ENABLE_PARTIAL_WRITE (0x1) -#define SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER (0x2) -#define SSL_MODE_AUTO_RETRY (0x4) +# define SSL_MODE_ENABLE_PARTIAL_WRITE (0x1) +# define SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER (0x2) +# define SSL_MODE_AUTO_RETRY (0x4) -#undef X509_NAME -#undef X509 +# undef X509_NAME +# undef X509 typedef gnutls_x509_dn X509_NAME; typedef gnutls_datum_t X509; @@ -115,10 +114,10 @@ extern "C" { SSL *ssl; int error; const gnutls_datum_t *cert_list; -#define current_cert cert_list +# define current_cert cert_list } X509_STORE_CTX; -#define X509_STORE_CTX_get_current_cert(ctx) ((ctx)->current_cert) +# define X509_STORE_CTX_get_current_cert(ctx) ((ctx)->current_cert) typedef struct _SSL_CTX { SSL_METHOD *method; @@ -128,7 +127,7 @@ extern "C" { int keyfile_type; unsigned long options; - int (*verify_callback) (int, X509_STORE_CTX *); + int (*verify_callback)(int, X509_STORE_CTX *); int verify_mode; } SSL_CTX; @@ -146,14 +145,14 @@ extern "C" { int state; unsigned long options; - int (*verify_callback) (int, X509_STORE_CTX *); + int (*verify_callback)(int, X509_STORE_CTX *); int verify_mode; gnutls_transport_ptr_t rfd; gnutls_transport_ptr_t wfd; }; -#define rbio gnutls_state +# define rbio gnutls_state typedef struct { void *handle; @@ -162,25 +161,23 @@ extern "C" { struct rsa_st; typedef struct rsa_st RSA; -#define MD5_CTX MD_CTX -#define RIPEMD160_CTX MD_CTX - -#define OpenSSL_add_ssl_algorithms() SSL_library_init() -#define SSLeay_add_ssl_algorithms() SSL_library_init() -#define SSLeay_add_all_algorithms() OpenSSL_add_all_algorithms() +# define MD5_CTX MD_CTX +# define RIPEMD160_CTX MD_CTX -#define SSL_get_cipher_name(ssl) SSL_CIPHER_get_name(SSL_get_current_cipher(ssl)) -#define SSL_get_cipher(ssl) SSL_get_cipher_name(ssl) -#define SSL_get_cipher_bits(ssl,bp) SSL_CIPHER_get_bits(SSL_get_current_cipher(ssl),(bp)) -#define SSL_get_cipher_version(ssl) SSL_CIPHER_get_version(SSL_get_current_cipher(ssl)) +# define OpenSSL_add_ssl_algorithms() SSL_library_init() +# define SSLeay_add_ssl_algorithms() SSL_library_init() +# define SSLeay_add_all_algorithms() OpenSSL_add_all_algorithms() +# define SSL_get_cipher_name(ssl) SSL_CIPHER_get_name(SSL_get_current_cipher(ssl)) +# define SSL_get_cipher(ssl) SSL_get_cipher_name(ssl) +# define SSL_get_cipher_bits(ssl,bp) SSL_CIPHER_get_bits(SSL_get_current_cipher(ssl),(bp)) +# define SSL_get_cipher_version(ssl) SSL_CIPHER_get_version(SSL_get_current_cipher(ssl)) /* Library initialisation functions */ int SSL_library_init(void); void OpenSSL_add_all_algorithms(void); - /* SSL_CTX structure handling */ SSL_CTX *SSL_CTX_new(SSL_METHOD * method); @@ -191,14 +188,11 @@ extern "C" { int SSL_CTX_use_PrivateKey_file(SSL_CTX * ctx, const char *keyfile, int type); void SSL_CTX_set_verify(SSL_CTX * ctx, int verify_mode, - int (*verify_callback) (int, - X509_STORE_CTX *)); - unsigned long SSL_CTX_set_options(SSL_CTX * ctx, - unsigned long options); + int (*verify_callback)(int, X509_STORE_CTX *)); + unsigned long SSL_CTX_set_options(SSL_CTX * ctx, unsigned long options); long SSL_CTX_set_mode(SSL_CTX * ctx, long mode); int SSL_CTX_set_cipher_list(SSL_CTX * ctx, const char *list); - /* SSL_CTX statistics */ long SSL_CTX_sess_number(SSL_CTX * ctx); @@ -212,7 +206,6 @@ extern "C" { long SSL_CTX_sess_misses(SSL_CTX * ctx); long SSL_CTX_sess_timeouts(SSL_CTX * ctx); - /* SSL structure handling */ SSL *SSL_new(SSL_CTX * ctx); @@ -226,8 +219,7 @@ extern "C" { void SSL_set_connect_state(SSL * ssl); int SSL_pending(SSL * ssl); void SSL_set_verify(SSL * ssl, int verify_mode, - int (*verify_callback) (int, - X509_STORE_CTX *)); + int (*verify_callback)(int, X509_STORE_CTX *)); const X509 *SSL_get_peer_certificate(SSL * ssl); /* SSL connection open/close/read/write functions */ @@ -240,16 +232,15 @@ extern "C" { int SSL_want(SSL * ssl); -#define SSL_NOTHING (1) -#define SSL_WRITING (2) -#define SSL_READING (3) -#define SSL_X509_LOOKUP (4) - -#define SSL_want_nothing(s) (SSL_want(s) == SSL_NOTHING) -#define SSL_want_read(s) (SSL_want(s) == SSL_READING) -#define SSL_want_write(s) (SSL_want(s) == SSL_WRITING) -#define SSL_want_x509_lookup(s) (SSL_want(s) == SSL_X509_LOOKUP) +# define SSL_NOTHING (1) +# define SSL_WRITING (2) +# define SSL_READING (3) +# define SSL_X509_LOOKUP (4) +# define SSL_want_nothing(s) (SSL_want(s) == SSL_NOTHING) +# define SSL_want_read(s) (SSL_want(s) == SSL_READING) +# define SSL_want_write(s) (SSL_want(s) == SSL_WRITING) +# define SSL_want_x509_lookup(s) (SSL_want(s) == SSL_X509_LOOKUP) /* SSL_METHOD functions */ @@ -260,16 +251,13 @@ extern "C" { SSL_METHOD *TLSv1_client_method(void); SSL_METHOD *TLSv1_server_method(void); - /* SSL_CIPHER functions */ SSL_CIPHER *SSL_get_current_cipher(SSL * ssl); const char *SSL_CIPHER_get_name(SSL_CIPHER * cipher); int SSL_CIPHER_get_bits(SSL_CIPHER * cipher, int *bits); const char *SSL_CIPHER_get_version(SSL_CIPHER * cipher); - char *SSL_CIPHER_description(SSL_CIPHER * cipher, char *buf, - int size); - + char *SSL_CIPHER_description(SSL_CIPHER * cipher, char *buf, int size); /* X509 functions */ @@ -278,7 +266,6 @@ extern "C" { char *X509_NAME_oneline(gnutls_x509_dn * name, char *buf, int len); void X509_free(const X509 * cert); - /* BIO functions */ void BIO_get_fd(gnutls_session_t gnutls_state, int *fd); @@ -289,7 +276,6 @@ extern "C" { unsigned long ERR_get_error(void); const char *ERR_error_string(unsigned long e, char *buf); - /* RAND functions */ int RAND_status(void); @@ -301,11 +287,11 @@ extern "C" { int RAND_write_file(const char *name); int RAND_egd_bytes(const char *path, int bytes); -#define RAND_egd(p) RAND_egd_bytes((p), 255) +# define RAND_egd(p) RAND_egd_bytes((p), 255) /* message digest functions */ -#define MD5_DIGEST_LENGTH 16 +# define MD5_DIGEST_LENGTH 16 void MD5_Init(MD5_CTX * ctx); void MD5_Update(MD5_CTX * ctx, const void *buf, int len); @@ -314,13 +300,12 @@ extern "C" { unsigned char *md); void RIPEMD160_Init(RIPEMD160_CTX * ctx); - void RIPEMD160_Update(RIPEMD160_CTX * ctx, const void *buf, - int len); + void RIPEMD160_Update(RIPEMD160_CTX * ctx, const void *buf, int len); void RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX * ctx); unsigned char *RIPEMD160(const unsigned char *buf, unsigned long len, unsigned char *md); -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif #endif diff --git a/extra/openssl_compat.c b/extra/openssl_compat.c index d8c60d4450..f50e8f61cd 100644 --- a/extra/openssl_compat.c +++ b/extra/openssl_compat.c @@ -86,8 +86,7 @@ gnutls_x509_extract_certificate_dn(const gnutls_datum_t * cert, len = sizeof(ret->state_or_province_name); gnutls_x509_crt_get_dn_by_oid(xcert, GNUTLS_OID_X520_STATE_OR_PROVINCE_NAME, - 0, 0, ret->state_or_province_name, - &len); + 0, 0, ret->state_or_province_name, &len); len = sizeof(ret->email); gnutls_x509_crt_get_dn_by_oid(xcert, GNUTLS_OID_PKCS9_EMAIL, 0, 0, @@ -134,8 +133,7 @@ gnutls_x509_extract_certificate_issuer_dn(const gnutls_datum_t * cert, len = sizeof(ret->organization); gnutls_x509_crt_get_issuer_dn_by_oid(xcert, GNUTLS_OID_X520_ORGANIZATION_NAME, - 0, 0, ret->organization, - &len); + 0, 0, ret->organization, &len); len = sizeof(ret->organizational_unit_name); gnutls_x509_crt_get_issuer_dn_by_oid(xcert, @@ -152,15 +150,13 @@ gnutls_x509_extract_certificate_issuer_dn(const gnutls_datum_t * cert, len = sizeof(ret->locality_name); gnutls_x509_crt_get_issuer_dn_by_oid(xcert, GNUTLS_OID_X520_LOCALITY_NAME, - 0, 0, ret->locality_name, - &len); + 0, 0, ret->locality_name, &len); len = sizeof(ret->state_or_province_name); gnutls_x509_crt_get_issuer_dn_by_oid(xcert, GNUTLS_OID_X520_STATE_OR_PROVINCE_NAME, 0, 0, - ret->state_or_province_name, - &len); + ret->state_or_province_name, &len); len = sizeof(ret->email); gnutls_x509_crt_get_issuer_dn_by_oid(xcert, GNUTLS_OID_PKCS9_EMAIL, diff --git a/extra/openssl_compat.h b/extra/openssl_compat.h index b05cacb606..f09897cdad 100644 --- a/extra/openssl_compat.h +++ b/extra/openssl_compat.h @@ -21,10 +21,10 @@ */ #ifndef GNUTLS_COMPAT8_H -#define GNUTLS_COMPAT8_H +# define GNUTLS_COMPAT8_H /* Extra definitions */ -#include <gnutls/openssl.h> +# include <gnutls/openssl.h> int gnutls_x509_extract_certificate_dn(const gnutls_datum_t *, gnutls_x509_dn *); |