eet emile - cipher - add braces for if defines to be clear on order of op
This commit is contained in:
parent
bdd5b244e6
commit
0e22417f45
|
@ -27,7 +27,7 @@
|
||||||
static int
|
static int
|
||||||
efl_net_socket_bio_create(BIO *b)
|
efl_net_socket_bio_create(BIO *b)
|
||||||
{
|
{
|
||||||
#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL || OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
|
||||||
BIO_set_init(b, 1);
|
BIO_set_init(b, 1);
|
||||||
BIO_set_data(b, NULL);
|
BIO_set_data(b, NULL);
|
||||||
BIO_set_flags(b, 0);
|
BIO_set_flags(b, 0);
|
||||||
|
@ -44,7 +44,7 @@ static int
|
||||||
efl_net_socket_bio_destroy(BIO *b)
|
efl_net_socket_bio_destroy(BIO *b)
|
||||||
{
|
{
|
||||||
if (!b) return 0;
|
if (!b) return 0;
|
||||||
#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL || OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
|
||||||
BIO_set_init(b, 0);
|
BIO_set_init(b, 0);
|
||||||
BIO_set_data(b, NULL);
|
BIO_set_data(b, NULL);
|
||||||
BIO_set_flags(b, 0);
|
BIO_set_flags(b, 0);
|
||||||
|
@ -63,7 +63,7 @@ efl_net_socket_bio_read(BIO *b, char *buf, int len)
|
||||||
.mem = buf,
|
.mem = buf,
|
||||||
.len = len
|
.len = len
|
||||||
};
|
};
|
||||||
#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL || OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
|
||||||
Eo *sock = BIO_get_data(b);
|
Eo *sock = BIO_get_data(b);
|
||||||
#else
|
#else
|
||||||
Eo *sock = b->ptr;
|
Eo *sock = b->ptr;
|
||||||
|
@ -99,7 +99,7 @@ efl_net_socket_bio_write(BIO *b, const char *buf, int len)
|
||||||
.mem = buf,
|
.mem = buf,
|
||||||
.len = len
|
.len = len
|
||||||
};
|
};
|
||||||
#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL || OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
|
||||||
Eo *sock = BIO_get_data(b);
|
Eo *sock = BIO_get_data(b);
|
||||||
#else
|
#else
|
||||||
Eo *sock = b->ptr;
|
Eo *sock = b->ptr;
|
||||||
|
@ -146,7 +146,7 @@ efl_net_socket_bio_puts(BIO *b, const char *str)
|
||||||
static BIO_METHOD *
|
static BIO_METHOD *
|
||||||
__efl_net_socket_bio_get(void)
|
__efl_net_socket_bio_get(void)
|
||||||
{
|
{
|
||||||
#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL || OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
|
||||||
static BIO_METHOD *efl_net_socket_bio = NULL;
|
static BIO_METHOD *efl_net_socket_bio = NULL;
|
||||||
|
|
||||||
if (efl_net_socket_bio) return efl_net_socket_bio;
|
if (efl_net_socket_bio) return efl_net_socket_bio;
|
||||||
|
@ -359,7 +359,7 @@ efl_net_ssl_conn_setup(Efl_Net_Ssl_Conn *conn, Eina_Bool is_dialer, Efl_Net_Sock
|
||||||
conn->bio = BIO_new(__efl_net_socket_bio_get());
|
conn->bio = BIO_new(__efl_net_socket_bio_get());
|
||||||
EINA_SAFETY_ON_NULL_GOTO(conn->bio, error_bio);
|
EINA_SAFETY_ON_NULL_GOTO(conn->bio, error_bio);
|
||||||
|
|
||||||
#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL || OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
|
||||||
BIO_set_data(conn->bio, sock);
|
BIO_set_data(conn->bio, sock);
|
||||||
#else
|
#else
|
||||||
conn->bio->ptr = sock;
|
conn->bio->ptr = sock;
|
||||||
|
|
|
@ -472,7 +472,7 @@ eet_identity_sign(FILE *fp,
|
||||||
gnutls_datum_t signum = { NULL, 0 };
|
gnutls_datum_t signum = { NULL, 0 };
|
||||||
gnutls_privkey_t privkey;
|
gnutls_privkey_t privkey;
|
||||||
# else /* ifdef HAVE_GNUTLS */
|
# else /* ifdef HAVE_GNUTLS */
|
||||||
# if LIBRESSL_VERSION_NUMBER >= 0x3050000fL || OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
# if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
|
||||||
EVP_MD_CTX *md_ctx;
|
EVP_MD_CTX *md_ctx;
|
||||||
# else
|
# else
|
||||||
EVP_MD_CTX md_ctx;
|
EVP_MD_CTX md_ctx;
|
||||||
|
@ -562,7 +562,7 @@ eet_identity_sign(FILE *fp,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Do the signature. */
|
/* Do the signature. */
|
||||||
#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL || OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && (!defined(LIBRESSL_VERSION_NUMBER)))
|
||||||
md_ctx = EVP_MD_CTX_new();
|
md_ctx = EVP_MD_CTX_new();
|
||||||
if (!md_ctx)
|
if (!md_ctx)
|
||||||
{
|
{
|
||||||
|
@ -756,7 +756,7 @@ eet_identity_check(const void *data_base,
|
||||||
const unsigned char *tmp;
|
const unsigned char *tmp;
|
||||||
EVP_PKEY *pkey;
|
EVP_PKEY *pkey;
|
||||||
X509 *x509;
|
X509 *x509;
|
||||||
#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL || OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
|
||||||
EVP_MD_CTX *md_ctx;
|
EVP_MD_CTX *md_ctx;
|
||||||
#else
|
#else
|
||||||
EVP_MD_CTX md_ctx;
|
EVP_MD_CTX md_ctx;
|
||||||
|
@ -779,7 +779,7 @@ eet_identity_check(const void *data_base,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Verify the signature */
|
/* Verify the signature */
|
||||||
#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL || OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
|
||||||
md_ctx = EVP_MD_CTX_new();
|
md_ctx = EVP_MD_CTX_new();
|
||||||
if (!md_ctx)
|
if (!md_ctx)
|
||||||
{
|
{
|
||||||
|
|
|
@ -45,7 +45,7 @@ struct _Emile_SSL
|
||||||
Eina_Bool
|
Eina_Bool
|
||||||
_emile_cipher_init(void)
|
_emile_cipher_init(void)
|
||||||
{
|
{
|
||||||
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x3050000fL
|
#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
|
||||||
ERR_load_crypto_strings();
|
ERR_load_crypto_strings();
|
||||||
SSL_library_init();
|
SSL_library_init();
|
||||||
SSL_load_error_strings();
|
SSL_load_error_strings();
|
||||||
|
@ -73,7 +73,7 @@ emile_binbuf_sha1(const Eina_Binbuf * data, unsigned char digest[20])
|
||||||
{
|
{
|
||||||
const EVP_MD *md = EVP_sha1();
|
const EVP_MD *md = EVP_sha1();
|
||||||
Eina_Slice slice = eina_binbuf_slice_get(data);
|
Eina_Slice slice = eina_binbuf_slice_get(data);
|
||||||
#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL || OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
|
||||||
EVP_MD_CTX *ctx = EVP_MD_CTX_new();
|
EVP_MD_CTX *ctx = EVP_MD_CTX_new();
|
||||||
if (!ctx) return EINA_FALSE;
|
if (!ctx) return EINA_FALSE;
|
||||||
|
|
||||||
|
@ -196,7 +196,7 @@ on_error:
|
||||||
memset(ik, 0, sizeof (ik));
|
memset(ik, 0, sizeof (ik));
|
||||||
|
|
||||||
/* Openssl error */
|
/* Openssl error */
|
||||||
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x3050000fL
|
#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
|
||||||
if (ctx)
|
if (ctx)
|
||||||
EVP_CIPHER_CTX_cleanup(ctx);
|
EVP_CIPHER_CTX_cleanup(ctx);
|
||||||
#else
|
#else
|
||||||
|
@ -331,7 +331,7 @@ emile_cipher_server_listen(Emile_Cipher_Type t)
|
||||||
SSL_CTX_set_options(r->ssl_ctx,
|
SSL_CTX_set_options(r->ssl_ctx,
|
||||||
options | SSL_OP_NO_SSLv2 | SSL_OP_SINGLE_DH_USE);
|
options | SSL_OP_NO_SSLv2 | SSL_OP_SINGLE_DH_USE);
|
||||||
break;
|
break;
|
||||||
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x3050000fL
|
#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
|
||||||
case EMILE_TLSv1:
|
case EMILE_TLSv1:
|
||||||
r->ssl_ctx = SSL_CTX_new(TLSv1_server_method());
|
r->ssl_ctx = SSL_CTX_new(TLSv1_server_method());
|
||||||
break;
|
break;
|
||||||
|
@ -780,7 +780,7 @@ emile_cipher_server_connect(Emile_Cipher_Type t)
|
||||||
options | SSL_OP_NO_SSLv2 | SSL_OP_SINGLE_DH_USE);
|
options | SSL_OP_NO_SSLv2 | SSL_OP_SINGLE_DH_USE);
|
||||||
break;
|
break;
|
||||||
case EMILE_TLSv1:
|
case EMILE_TLSv1:
|
||||||
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x3050000fL
|
#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
|
||||||
r->ssl_ctx = SSL_CTX_new(TLSv1_client_method());
|
r->ssl_ctx = SSL_CTX_new(TLSv1_client_method());
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue