summaryrefslogtreecommitdiff
path: root/databases/mysql56-server/files/patch-vio_viosslfactories.c
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2018-05-07 19:09:02 +0000
committerBernard Spil <brnrd@FreeBSD.org>2018-05-07 19:09:02 +0000
commite5ae6c3f38c409b090c966fb695b11d9e6e665c0 (patch)
tree118fed96a953a540d0850fc25025e79f123e4e52 /databases/mysql56-server/files/patch-vio_viosslfactories.c
parentwww/mod_memcache_block: Update to 1.0 (diff)
databases/mysql56-server: Fix build with LibreSSL
PR: 227178 Approved by: mmokhi (maintainer)
Notes
Notes: svn path=/head/; revision=469311
Diffstat (limited to 'databases/mysql56-server/files/patch-vio_viosslfactories.c')
-rw-r--r--databases/mysql56-server/files/patch-vio_viosslfactories.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/databases/mysql56-server/files/patch-vio_viosslfactories.c b/databases/mysql56-server/files/patch-vio_viosslfactories.c
new file mode 100644
index 000000000000..316be960c4ec
--- /dev/null
+++ b/databases/mysql56-server/files/patch-vio_viosslfactories.c
@@ -0,0 +1,27 @@
+--- vio/viosslfactories.c.orig 2017-12-09 07:33:37 UTC
++++ vio/viosslfactories.c
+@@ -68,13 +68,20 @@ static DH *get_dh2048(void)
+ DH *dh;
+ if ((dh=DH_new()))
+ {
+- dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
+- dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
+- if (! dh->p || ! dh->g)
+- {
++ 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(dh);
+ dh=0;
+ }
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ dh->p= p;
++ dh->g= g;
++#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ }
+ return(dh);
+ }