Skip to content

Commit 3c73903

Browse files
vsmurthysvsmurthys
committed
Merge branch 'mysql-5.5' into mysql-5.6
2 parents 4d41f28 + dbbe747 commit 3c73903

2 files changed

Lines changed: 57 additions & 17 deletions

File tree

‎include/violite.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights
2+
* reserved.
23
34
This program is free software; you can redistribute it and/or modify
45
it under the terms of the GNU General Public License as published by
@@ -147,7 +148,7 @@ enum enum_ssl_init_error
147148
{
148149
SSL_INITERR_NOERROR= 0, SSL_INITERR_CERT, SSL_INITERR_KEY,
149150
SSL_INITERR_NOMATCH, SSL_INITERR_BAD_PATHS, SSL_INITERR_CIPHERS,
150-
SSL_INITERR_MEMFAIL, SSL_INITERR_LASTERR
151+
SSL_INITERR_MEMFAIL, SSL_INITERR_DHFAIL, SSL_INITERR_LASTERR
151152
};
152153
const char* sslGetErrString(enum enum_ssl_init_error err);
153154

‎vio/viosslfactories.c‎

Lines changed: 54 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,56 @@
2020
static my_bool ssl_algorithms_added = FALSE;
2121
static my_bool ssl_error_strings_loaded= FALSE;
2222

23-
static unsigned char dh512_p[]=
23+
/*
24+
Diffie-Hellman key.
25+
Generated using: >openssl dhparam -5 -C 2048
26+
27+
-----BEGIN DH PARAMETERS-----
28+
MIIBCAKCAQEAil36wGZ2TmH6ysA3V1xtP4MKofXx5n88xq/aiybmGnReZMviCPEJ
29+
46+7VCktl/RZ5iaDH1XNG1dVQmznt9pu2G3usU+k1/VB4bQL4ZgW4u0Wzxh9PyXD
30+
glm99I9Xyj4Z5PVE4MyAsxCRGA1kWQpD9/zKAegUBPLNqSo886Uqg9hmn8ksyU9E
31+
BV5eAEciCuawh6V0O+Sj/C3cSfLhgA0GcXp3OqlmcDu6jS5gWjn3LdP1U0duVxMB
32+
h/neTSCSvtce4CAMYMjKNVh9P1nu+2d9ZH2Od2xhRIqMTfAS1KTqF3VmSWzPFCjG
33+
mjxx/bg6bOOjpgZapvB6ABWlWmRmAAWFtwIBBQ==
34+
-----END DH PARAMETERS-----
35+
*/
36+
static unsigned char dh2048_p[]=
2437
{
25-
0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75,
26-
0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F,
27-
0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,0x57,0x46,0x50,0xD3,
28-
0x69,0x99,0xDB,0x29,0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12,
29-
0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,0xD8,0x00,0x3E,0x7C,
30-
0x47,0x74,0xE8,0x33,
38+
0x8A, 0x5D, 0xFA, 0xC0, 0x66, 0x76, 0x4E, 0x61, 0xFA, 0xCA, 0xC0, 0x37,
39+
0x57, 0x5C, 0x6D, 0x3F, 0x83, 0x0A, 0xA1, 0xF5, 0xF1, 0xE6, 0x7F, 0x3C,
40+
0xC6, 0xAF, 0xDA, 0x8B, 0x26, 0xE6, 0x1A, 0x74, 0x5E, 0x64, 0xCB, 0xE2,
41+
0x08, 0xF1, 0x09, 0xE3, 0xAF, 0xBB, 0x54, 0x29, 0x2D, 0x97, 0xF4, 0x59,
42+
0xE6, 0x26, 0x83, 0x1F, 0x55, 0xCD, 0x1B, 0x57, 0x55, 0x42, 0x6C, 0xE7,
43+
0xB7, 0xDA, 0x6E, 0xD8, 0x6D, 0xEE, 0xB1, 0x4F, 0xA4, 0xD7, 0xF5, 0x41,
44+
0xE1, 0xB4, 0x0B, 0xE1, 0x98, 0x16, 0xE2, 0xED, 0x16, 0xCF, 0x18, 0x7D,
45+
0x3F, 0x25, 0xC3, 0x82, 0x59, 0xBD, 0xF4, 0x8F, 0x57, 0xCA, 0x3E, 0x19,
46+
0xE4, 0xF5, 0x44, 0xE0, 0xCC, 0x80, 0xB3, 0x10, 0x91, 0x18, 0x0D, 0x64,
47+
0x59, 0x0A, 0x43, 0xF7, 0xFC, 0xCA, 0x01, 0xE8, 0x14, 0x04, 0xF2, 0xCD,
48+
0xA9, 0x2A, 0x3C, 0xF3, 0xA5, 0x2A, 0x83, 0xD8, 0x66, 0x9F, 0xC9, 0x2C,
49+
0xC9, 0x4F, 0x44, 0x05, 0x5E, 0x5E, 0x00, 0x47, 0x22, 0x0A, 0xE6, 0xB0,
50+
0x87, 0xA5, 0x74, 0x3B, 0xE4, 0xA3, 0xFC, 0x2D, 0xDC, 0x49, 0xF2, 0xE1,
51+
0x80, 0x0D, 0x06, 0x71, 0x7A, 0x77, 0x3A, 0xA9, 0x66, 0x70, 0x3B, 0xBA,
52+
0x8D, 0x2E, 0x60, 0x5A, 0x39, 0xF7, 0x2D, 0xD3, 0xF5, 0x53, 0x47, 0x6E,
53+
0x57, 0x13, 0x01, 0x87, 0xF9, 0xDE, 0x4D, 0x20, 0x92, 0xBE, 0xD7, 0x1E,
54+
0xE0, 0x20, 0x0C, 0x60, 0xC8, 0xCA, 0x35, 0x58, 0x7D, 0x3F, 0x59, 0xEE,
55+
0xFB, 0x67, 0x7D, 0x64, 0x7D, 0x8E, 0x77, 0x6C, 0x61, 0x44, 0x8A, 0x8C,
56+
0x4D, 0xF0, 0x12, 0xD4, 0xA4, 0xEA, 0x17, 0x75, 0x66, 0x49, 0x6C, 0xCF,
57+
0x14, 0x28, 0xC6, 0x9A, 0x3C, 0x71, 0xFD, 0xB8, 0x3A, 0x6C, 0xE3, 0xA3,
58+
0xA6, 0x06, 0x5A, 0xA6, 0xF0, 0x7A, 0x00, 0x15, 0xA5, 0x5A, 0x64, 0x66,
59+
0x00, 0x05, 0x85, 0xB7,
3160
};
3261

33-
static unsigned char dh512_g[]={
34-
0x02,
62+
static unsigned char dh2048_g[]={
63+
0x05,
3564
};
3665

37-
static DH *get_dh512(void)
66+
static DH *get_dh2048(void)
3867
{
3968
DH *dh;
4069
if ((dh=DH_new()))
4170
{
42-
dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL);
43-
dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL);
71+
dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
72+
dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
4473
if (! dh->p || ! dh->g)
4574
{
4675
DH_free(dh);
@@ -81,7 +110,8 @@ ssl_error_string[] =
81110
"Private key does not match the certificate public key",
82111
"SSL_CTX_set_default_verify_paths failed",
83112
"Failed to set ciphers to use",
84-
"SSL_CTX_new failed"
113+
"SSL_CTX_new failed",
114+
"SSL_CTX_set_tmp_dh failed"
85115
};
86116

87117
const char*
@@ -285,8 +315,17 @@ new_VioSSLFd(const char *key_file, const char *cert_file,
285315
}
286316

287317
/* DH stuff */
288-
dh=get_dh512();
289-
SSL_CTX_set_tmp_dh(ssl_fd->ssl_context, dh);
318+
dh= get_dh2048();
319+
if (SSL_CTX_set_tmp_dh(ssl_fd->ssl_context, dh) == 0)
320+
{
321+
*error= SSL_INITERR_DHFAIL;
322+
DBUG_PRINT("error", ("%s", sslGetErrString(*error)));
323+
report_errors();
324+
DH_free(dh);
325+
SSL_CTX_free(ssl_fd->ssl_context);
326+
my_free(ssl_fd);
327+
DBUG_RETURN(0);
328+
}
290329
DH_free(dh);
291330

292331
DBUG_PRINT("exit", ("OK 1"));

0 commit comments

Comments
 (0)