summaryrefslogtreecommitdiff
path: root/databases/mysql57-client/patches/patch-vio_viosslfactories.c
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql57-client/patches/patch-vio_viosslfactories.c')
-rw-r--r--databases/mysql57-client/patches/patch-vio_viosslfactories.c58
1 files changed, 0 insertions, 58 deletions
diff --git a/databases/mysql57-client/patches/patch-vio_viosslfactories.c b/databases/mysql57-client/patches/patch-vio_viosslfactories.c
deleted file mode 100644
index 7afec8b14ea..00000000000
--- a/databases/mysql57-client/patches/patch-vio_viosslfactories.c
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-vio_viosslfactories.c,v 1.1 2018/02/25 01:15:22 markd Exp $
-
-support openssl 1.1
-from https://bugs.mysql.com/bug.php?id=83814
-
---- vio/viosslfactories.c.orig 2017-12-28 03:46:26.000000000 +0000
-+++ vio/viosslfactories.c
-@@ -86,7 +86,7 @@ static my_bool ssl_initialized
- mjxx/bg6bOOjpgZapvB6ABWlWmRmAAWFtwIBBQ==
- -----END DH PARAMETERS-----
- */
--static unsigned char dh2048_p[]=
-+static unsigned char dhp_2048[]=
- {
- 0x8A, 0x5D, 0xFA, 0xC0, 0x66, 0x76, 0x4E, 0x61, 0xFA, 0xCA, 0xC0, 0x37,
- 0x57, 0x5C, 0x6D, 0x3F, 0x83, 0x0A, 0xA1, 0xF5, 0xF1, 0xE6, 0x7F, 0x3C,
-@@ -112,20 +112,38 @@ static unsigned char dh2048_p[]=
- 0x00, 0x05, 0x85, 0xB7,
- };
-
--static unsigned char dh2048_g[]={
-+static unsigned char dhg_2048[]={
- 0x05,
- };
-
- static DH *get_dh2048(void)
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- DH *dh;
- if ((dh=DH_new()))
-+#else
-+ DH *dh = DH_new();
-+ BIGNUM *dhp_bn, *dhg_bn;
-+
-+ if (dh != NULL)
-+#endif
- {
-- dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-- dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ dh->p=BN_bin2bn(dhp_2048,sizeof(dhp_2048),NULL);
-+ dh->g=BN_bin2bn(dhg_2048,sizeof(dhg_2048),NULL);
- if (! dh->p || ! dh->g)
-+#else
-+ dhp_bn = BN_bin2bn(dhp_2048, sizeof (dhp_2048), NULL);
-+ dhg_bn = BN_bin2bn(dhg_2048, sizeof (dhg_2048), NULL);
-+ if (dhp_bn == NULL || dhg_bn == NULL
-+ || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn))
-+#endif
- {
- DH_free(dh);
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+ BN_free(dhp_bn);
-+ BN_free(dhg_bn);
-+#endif
- dh=0;
- }
- }