diff options
| author | Jochen Neumeister <joneum@FreeBSD.org> | 2020-05-04 09:44:07 +0000 |
|---|---|---|
| committer | Jochen Neumeister <joneum@FreeBSD.org> | 2020-05-04 09:44:07 +0000 |
| commit | 83a764499000bc7dd5d8819c94805003c9089248 (patch) | |
| tree | 50bb3291e770a9bd894c0c46b78fb7697e065649 /databases/mysql57-client/files/patch-vio_viosslfactories.c | |
| parent | - Switch to share/man (diff) | |
In file included from /usr/obj/usr/ports/databases/mysql57-client/work/mysql-5.7.30/vio/viosslfactories.c:29:
/usr/obj/usr/ports/databases/mysql57-client/work/mysql-5.7.30/include/my_openssl.h:55:30: error: use of undeclared identifier 'OPENSSL_INIT_NO_ATEXIT'
return OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL);
This fix a problem with libressl
PR: 246070
MFH: 2020Q2
Sponsored by: Netzkommune GmbH
Notes
Notes:
svn path=/head/; revision=533909
Diffstat (limited to 'databases/mysql57-client/files/patch-vio_viosslfactories.c')
| -rw-r--r-- | databases/mysql57-client/files/patch-vio_viosslfactories.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/databases/mysql57-client/files/patch-vio_viosslfactories.c b/databases/mysql57-client/files/patch-vio_viosslfactories.c new file mode 100644 index 000000000000..c114c25c07cd --- /dev/null +++ b/databases/mysql57-client/files/patch-vio_viosslfactories.c @@ -0,0 +1,35 @@ +--- vio/viosslfactories.c ++++ vio/viosslfactories.c +@@ -123,21 +123,19 @@ static DH *get_dh2048(void) + DH *dh; + if ((dh=DH_new())) + { +- BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL); +- BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL); +- if (!p || !g +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L +- || !DH_set0_pqg(dh, p, NULL, g) +-#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ +- ) { +- /* DH_free() will free 'p' and 'g' at once. */ ++ BIGNUM *p = BN_bin2bn(dh2048_p,sizeof(dh2048_p), NULL); ++ BIGNUM *g = BN_bin2bn(dh2048_g,sizeof(dh2048_g), NULL); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++ dh->p=p; ++ dh->g=g; ++ if (! dh->p || ! dh->g) ++#else ++ if (!DH_set0_pqg(dh, p, NULL, g)) ++#endif ++ { + DH_free(dh); +- return NULL; ++ dh = NULL; + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L +- dh->p= p; +- dh->g= g; +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + } + return(dh); + } |