Lines 81-87
Link Here
|
81 |
static void (*K_X509_LOOKUP_free)(X509_LOOKUP *) = nullptr; |
81 |
static void (*K_X509_LOOKUP_free)(X509_LOOKUP *) = nullptr; |
82 |
static int (*K_X509_LOOKUP_ctrl)(X509_LOOKUP *, int, const char *, long, char **) = nullptr; |
82 |
static int (*K_X509_LOOKUP_ctrl)(X509_LOOKUP *, int, const char *, long, char **) = nullptr; |
83 |
static void (*K_X509_STORE_CTX_init)(X509_STORE_CTX *, X509_STORE *, X509 *, STACK_OF(X509) *) = nullptr; |
83 |
static void (*K_X509_STORE_CTX_init)(X509_STORE_CTX *, X509_STORE *, X509 *, STACK_OF(X509) *) = nullptr; |
84 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
84 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
85 |
static void (*K_CRYPTO_free)(void *) = nullptr; |
85 |
static void (*K_CRYPTO_free)(void *) = nullptr; |
86 |
#else |
86 |
#else |
87 |
static void (*K_CRYPTO_free)(void *, const char *, int) = nullptr; |
87 |
static void (*K_CRYPTO_free)(void *, const char *, int) = nullptr; |
Lines 430-436
Link Here
|
430 |
K_RAND_load_file = (int (*)(const char *, long)) d->cryptoLib->resolve("RAND_load_file"); |
430 |
K_RAND_load_file = (int (*)(const char *, long)) d->cryptoLib->resolve("RAND_load_file"); |
431 |
K_RAND_file_name = (const char *(*)(char *, size_t)) d->cryptoLib->resolve("RAND_file_name"); |
431 |
K_RAND_file_name = (const char *(*)(char *, size_t)) d->cryptoLib->resolve("RAND_file_name"); |
432 |
K_RAND_write_file = (int (*)(const char *)) d->cryptoLib->resolve("RAND_write_file"); |
432 |
K_RAND_write_file = (int (*)(const char *)) d->cryptoLib->resolve("RAND_write_file"); |
433 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
433 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
434 |
K_CRYPTO_free = (void (*)(void *)) d->cryptoLib->resolve("CRYPTO_free"); |
434 |
K_CRYPTO_free = (void (*)(void *)) d->cryptoLib->resolve("CRYPTO_free"); |
435 |
#else |
435 |
#else |
436 |
K_CRYPTO_free = (void (*)(void *, const char *, int)) d->cryptoLib->resolve("CRYPTO_free"); |
436 |
K_CRYPTO_free = (void (*)(void *, const char *, int)) d->cryptoLib->resolve("CRYPTO_free"); |
Lines 485-491
Link Here
|
485 |
K_X509_STORE_CTX_get_current_cert = (X509 * (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_current_cert"); |
485 |
K_X509_STORE_CTX_get_current_cert = (X509 * (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_current_cert"); |
486 |
K_X509_STORE_CTX_set_error = (void (*)(X509_STORE_CTX *, int)) d->cryptoLib->resolve("X509_STORE_CTX_set_error"); |
486 |
K_X509_STORE_CTX_set_error = (void (*)(X509_STORE_CTX *, int)) d->cryptoLib->resolve("X509_STORE_CTX_set_error"); |
487 |
K_X509_STORE_CTX_get_error = (int (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_error"); |
487 |
K_X509_STORE_CTX_get_error = (int (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_error"); |
488 |
#if OPENSSL_VERSION_NUMBER >= 0x10100000L |
488 |
#if OPENSSL_VERSION_NUMBER >= 0x10100000L || LIBRESSL_VERSION_NUMBER |
489 |
K_OPENSSL_sk_free = (void (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_free"); |
489 |
K_OPENSSL_sk_free = (void (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_free"); |
490 |
K_OPENSSL_sk_num = (int (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_num"); |
490 |
K_OPENSSL_sk_num = (int (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_num"); |
491 |
K_OPENSSL_sk_pop = (char *(*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_pop"); |
491 |
K_OPENSSL_sk_pop = (char *(*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_pop"); |
Lines 979-985
Link Here
|
979 |
|
979 |
|
980 |
void KOpenSSLProxy::X509_STORE_set_verify_cb(X509_STORE *store, int (*verify_cb)(int, X509_STORE_CTX *)) |
980 |
void KOpenSSLProxy::X509_STORE_set_verify_cb(X509_STORE *store, int (*verify_cb)(int, X509_STORE_CTX *)) |
981 |
{ |
981 |
{ |
982 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
982 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
983 |
X509_STORE_set_verify_cb_func(store, verify_cb); |
983 |
X509_STORE_set_verify_cb_func(store, verify_cb); |
984 |
#else |
984 |
#else |
985 |
if (K_X509_STORE_set_verify_cb) { |
985 |
if (K_X509_STORE_set_verify_cb) { |
Lines 1044-1050
Link Here
|
1044 |
|
1044 |
|
1045 |
void KOpenSSLProxy::X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **algor, const X509 *x) |
1045 |
void KOpenSSLProxy::X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **algor, const X509 *x) |
1046 |
{ |
1046 |
{ |
1047 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
1047 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
1048 |
if (psig) { |
1048 |
if (psig) { |
1049 |
*psig = x->signature; |
1049 |
*psig = x->signature; |
1050 |
} |
1050 |
} |
Lines 1096-1102
Link Here
|
1096 |
} |
1096 |
} |
1097 |
} |
1097 |
} |
1098 |
|
1098 |
|
1099 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
1099 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
1100 |
void KOpenSSLProxy::CRYPTO_free(void *x) |
1100 |
void KOpenSSLProxy::CRYPTO_free(void *x) |
1101 |
{ |
1101 |
{ |
1102 |
if (K_CRYPTO_free) { |
1102 |
if (K_CRYPTO_free) { |
Lines 1122-1128
Link Here
|
1122 |
|
1122 |
|
1123 |
ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x) |
1123 |
ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x) |
1124 |
{ |
1124 |
{ |
1125 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
1125 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
1126 |
return X509_get_notBefore(x); |
1126 |
return X509_get_notBefore(x); |
1127 |
#else |
1127 |
#else |
1128 |
if (K_X509_getm_notBefore) { |
1128 |
if (K_X509_getm_notBefore) { |
Lines 1135-1141
Link Here
|
1135 |
|
1135 |
|
1136 |
ASN1_TIME *KOpenSSLProxy::X509_getm_notAfter(const X509 *x) |
1136 |
ASN1_TIME *KOpenSSLProxy::X509_getm_notAfter(const X509 *x) |
1137 |
{ |
1137 |
{ |
1138 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
1138 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
1139 |
return X509_get_notAfter(x); |
1139 |
return X509_get_notAfter(x); |
1140 |
#else |
1140 |
#else |
1141 |
if (K_X509_getm_notAfter) { |
1141 |
if (K_X509_getm_notAfter) { |
Lines 1413-1419
Link Here
|
1413 |
|
1413 |
|
1414 |
X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v) |
1414 |
X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v) |
1415 |
{ |
1415 |
{ |
1416 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
1416 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
1417 |
return v->current_cert; |
1417 |
return v->current_cert; |
1418 |
#else |
1418 |
#else |
1419 |
if (K_X509_STORE_CTX_get_current_cert) { |
1419 |
if (K_X509_STORE_CTX_get_current_cert) { |
Lines 1426-1432
Link Here
|
1426 |
|
1426 |
|
1427 |
void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error) |
1427 |
void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error) |
1428 |
{ |
1428 |
{ |
1429 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
1429 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
1430 |
v->error = error; |
1430 |
v->error = error; |
1431 |
#else |
1431 |
#else |
1432 |
if (K_X509_STORE_CTX_set_error) { |
1432 |
if (K_X509_STORE_CTX_set_error) { |
Lines 1437-1443
Link Here
|
1437 |
|
1437 |
|
1438 |
int KOpenSSLProxy::X509_STORE_CTX_get_error(X509_STORE_CTX *v) |
1438 |
int KOpenSSLProxy::X509_STORE_CTX_get_error(X509_STORE_CTX *v) |
1439 |
{ |
1439 |
{ |
1440 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
1440 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
1441 |
return v->error; |
1441 |
return v->error; |
1442 |
#else |
1442 |
#else |
1443 |
if (K_X509_STORE_CTX_get_error) { |
1443 |
if (K_X509_STORE_CTX_get_error) { |
Lines 1894-1900
Link Here
|
1894 |
|
1894 |
|
1895 |
int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey) |
1895 |
int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey) |
1896 |
{ |
1896 |
{ |
1897 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
1897 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
1898 |
return pkey->type; |
1898 |
return pkey->type; |
1899 |
#else |
1899 |
#else |
1900 |
if (K_EVP_PKEY_base_id) { |
1900 |
if (K_EVP_PKEY_base_id) { |
Lines 1907-1913
Link Here
|
1907 |
|
1907 |
|
1908 |
RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey) |
1908 |
RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey) |
1909 |
{ |
1909 |
{ |
1910 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
1910 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
1911 |
return pkey->pkey.rsa; |
1911 |
return pkey->pkey.rsa; |
1912 |
#else |
1912 |
#else |
1913 |
if (K_EVP_PKEY_get0_RSA) { |
1913 |
if (K_EVP_PKEY_get0_RSA) { |
Lines 1920-1926
Link Here
|
1920 |
|
1920 |
|
1921 |
void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) |
1921 |
void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) |
1922 |
{ |
1922 |
{ |
1923 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
1923 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
1924 |
if (n) { |
1924 |
if (n) { |
1925 |
*n = rsa->n; |
1925 |
*n = rsa->n; |
1926 |
} |
1926 |
} |
Lines 1939-1945
Link Here
|
1939 |
|
1939 |
|
1940 |
DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey) |
1940 |
DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey) |
1941 |
{ |
1941 |
{ |
1942 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
1942 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
1943 |
return pkey->pkey.dsa; |
1943 |
return pkey->pkey.dsa; |
1944 |
#else |
1944 |
#else |
1945 |
if (K_EVP_PKEY_get0_DSA) { |
1945 |
if (K_EVP_PKEY_get0_DSA) { |
Lines 1952-1958
Link Here
|
1952 |
|
1952 |
|
1953 |
void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) |
1953 |
void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) |
1954 |
{ |
1954 |
{ |
1955 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
1955 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
1956 |
if (p) { |
1956 |
if (p) { |
1957 |
*p = dsa->p; |
1957 |
*p = dsa->p; |
1958 |
} |
1958 |
} |
Lines 1971-1977
Link Here
|
1971 |
|
1971 |
|
1972 |
void KOpenSSLProxy::DSA_get0_key(DSA *dsa, const BIGNUM **pub_key, const BIGNUM **priv_key) |
1972 |
void KOpenSSLProxy::DSA_get0_key(DSA *dsa, const BIGNUM **pub_key, const BIGNUM **priv_key) |
1973 |
{ |
1973 |
{ |
1974 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
1974 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER |
1975 |
if (pub_key) { |
1975 |
if (pub_key) { |
1976 |
*pub_key = dsa->pub_key; |
1976 |
*pub_key = dsa->pub_key; |
1977 |
} |
1977 |
} |