BUG #25835833: SHOW STATUS SSL CRASHES GPL SRVR WHEN SRVR STARED WITH XPLUGIN,EXPIRED SSL CERTS

Tomasz Stepniak · Tomasz Stepniak · commit f1fe79a67e71 · 2017-05-26T12:33:33.000+02:00
Description
===========
Crash in community version of server with X plugin loaded when checking
for SSL system variables and using expired certificates.

Fix
===
Add validation if certificate is not null when checking for certificate
details.

RB: 16362
Reviewed by: Grzegorz Szwarc &lt;grzegorz.szwarc@oracle.com&gt;
Reviewed by: Lukasz Kotula &lt;lukasz.kotula@oracle.com&gt;
diff --git a/mysql-test/std_data/expired-ca-key.pem b/mysql-test/std_data/expired-ca-key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEArDQKlHgmN6/LmCijrg6JfApae6fAdusvQhZPPCQnsG3sDlWo
+qdYizbvV+4Ytqt6h+ez3GEULv+mCwzNSyl34i0X4zkL/YibPWrgL8eKRU8+uQQMt
+EZsLV7/93o9ab9opFTdZ9VzixToBTKrPHheMdrfn8vGLuqNl8DHdWJE+0ANi5kb9
+ouQEXVv80F0p7ud5r+hfGa0vtJrijL5xySxkQxcTZp6ju2CgbYiS17EL3xhRTvRk
+RDPh3ThpsmkIVI71LMDlLImuSdE4t/gdqsKUkCAA24CX7yVIF4tOd2gy3uD/8251
+pBVbEtPdZb51GWTwLozo1bv5qk//Ft2qS39TqwIDAQABAoIBAFoCmcUhSFizOug9
+1dCVKKf9gW5BMQj3xav1nVUCUPyXeFvFynN7ypVfKWpfqF84H9JTWpUFAi8+D2uY
+2B2PIOsrl/G4c2UKhDgXG6dDllMIqzywPE6HjFZBtKEwrUTp869zT0JBWwdcWnGI
+ltpT1Mf5OPRz7WWRIyd56QjyYrK3NtLw9O3DJPsNmOueCQudcaHRE7cdUsSUdKyz
+VoAGV2jDIPBZUX4gDVJLvkeWM6pKKj8JTBMcLmvXmQ+5V1C8RM7+rowaaCbHhSNs
+Eo3bZS50hnxQRp2AzqqR+rfYOT5hDUMzN+2+LQvE/b/dkkkoYIEfYFmUvsNvVnmI
+58QSuwECgYEA2EmqlrycCNqJzcvLqAlUZNLyc0WiOO94X+WdxRnbtmRxbib/rilc
+SSiutYYXJhCaz8V7iR1hrA5f0qFNXBbjGpe7I+Pi+TA4nhdUucJFyArvDValm80N
+L/FTUKa6wi1GfQ51kvWzfKw9c/AdHrSx+V4CSHTbh4KBr9Y9ayep8bkCgYEAy9I9
+Z4HIJC2q71ZsDAxETiSQICOMn7Vqx/62eOLBBQsMZ0j9ho2zbQNg2ucH0XnZx8aL
+yOJdf4Xc+kFlg8A3HJ7NGNklD7m0BCBUjHzjuenL/zsHrqsQ8uC+WVUjr+WoxdJv
+aoF/cQoGYNBrRo9OVVLfv+DHZLPWPynpiJQmsoMCgYEAuZh1HsYYKuzEpWjEiJwA
+5EezrsDJFIxBQiD6AkFPLTMBtuEWM6/gNhMH4FKBGLPU9Idkm2MwBgGLrmWlyWkG
+VjJvbrvFb8k2PEqO9JvFX4QqX8rDb29Eaqhtst5vkeJiAzveHk5iR5BRZ2RayJeL
+xQ0rbluAacbOXEG+EG5HwVkCgYBgtL0LumkyuTRMYM3dHYjfJrv3c8aKFHK4t6Lu
+UnBQq0BUVS5tRBho1dyDoHB2NIFfJ1Y1lynTkrkZSCQZUf8UJkibzJOoFW1TM9/J
+1IvcLxDqZaCsgGAHTRkjm6DWGXptef4BI7ZK9P23u8vaa644D504FjelESrLR2CV
+u+1sbwKBgD2HTzBzAm7U4kdO74+vu9NBOGnRusjiPyu12D8XMId7p9+HKXO0GOAR
+0XdpCcQE6zQTTng9EF350Dhteqkr2paynyNXsdO49tZObWqJ98qfZRXe04dlWafW
+NqfaJcjSD9MGlJ7FGgqBj/hiwhCzaiESadHKI4VGy13xTcPgg24P
+-----END RSA PRIVATE KEY-----
diff --git a/mysql-test/std_data/expired-ca.pem b/mysql-test/std_data/expired-ca.pem
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID4TCCAsmgAwIBAgIJAP6f6GLx6M0VMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYD
+VQQGEwJJTjESMBAGA1UECAwJS2FybmF0YWthMRIwEAYDVQQHDAlCYW5nYWxvcmUx
+DzANBgNVBAoMBk9yYWNsZTEOMAwGA1UECwwFTXlTUUwxEjAQBgNVBAMMCWxvY2Fs
+aG9zdDEaMBgGCSqGSIb3DQEJARYLckBsb2NhbGhvc3QwHhcNMTUxMDMwMTAzNjE3
+WhcNMTUxMDMxMTAzNjE3WjCBhjELMAkGA1UEBhMCSU4xEjAQBgNVBAgMCUthcm5h
+dGFrYTESMBAGA1UEBwwJQmFuZ2Fsb3JlMQ8wDQYDVQQKDAZPcmFjbGUxDjAMBgNV
+BAsMBU15U1FMMRIwEAYDVQQDDAlsb2NhbGhvc3QxGjAYBgkqhkiG9w0BCQEWC3JA
+bG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArDQKlHgm
+N6/LmCijrg6JfApae6fAdusvQhZPPCQnsG3sDlWoqdYizbvV+4Ytqt6h+ez3GEUL
+v+mCwzNSyl34i0X4zkL/YibPWrgL8eKRU8+uQQMtEZsLV7/93o9ab9opFTdZ9Vzi
+xToBTKrPHheMdrfn8vGLuqNl8DHdWJE+0ANi5kb9ouQEXVv80F0p7ud5r+hfGa0v
+tJrijL5xySxkQxcTZp6ju2CgbYiS17EL3xhRTvRkRDPh3ThpsmkIVI71LMDlLImu
+SdE4t/gdqsKUkCAA24CX7yVIF4tOd2gy3uD/8251pBVbEtPdZb51GWTwLozo1bv5
+qk//Ft2qS39TqwIDAQABo1AwTjAdBgNVHQ4EFgQURKy0Ak+V2wZhxciE9xUvs6ex
+YaIwHwYDVR0jBBgwFoAURKy0Ak+V2wZhxciE9xUvs6exYaIwDAYDVR0TBAUwAwEB
+/zANBgkqhkiG9w0BAQUFAAOCAQEAEzCGjChhqd6e9o0T36aAIvHfWmJWcYPkdzhl
+PJUlxe/xzFLowIZRYYS9bRcwSL8uDEVMbTabiVSuqCk9rKJqbVneqffgqsfHG8Ac
+pdjf01VfVM3Eqt5MBS9fDApjrCs/ZVLeIF/eb914DokPJeZT0FIZ3K1jW+METfhD
+m9Tv3lwenWlbV9L8c6tlYrYR6cyxriFcqBLpLoVSLsXAvPttrLXgMltIZJ5+5vNt
+5H3YWWkzEUD2mRwYFusxYo9pLxlm2zbsVuFprm3KHqGJrqoD+oqulER+d1BL3wEV
+nIkdZ9yYz5WDOtzrOeqCCE9T12v741IBKjK1P6U4MZrYDtdF/A==
+-----END CERTIFICATE-----
diff --git a/mysql-test/std_data/expired-client-cert.pem b/mysql-test/std_data/expired-client-cert.pem
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDgzCCAmsCAQEwDQYJKoZIhvcNAQEFBQAwgYYxCzAJBgNVBAYTAklOMRIwEAYD
+VQQIDAlLYXJuYXRha2ExEjAQBgNVBAcMCUJhbmdhbG9yZTEPMA0GA1UECgwGT3Jh
+Y2xlMQ4wDAYDVQQLDAVNeVNRTDESMBAGA1UEAwwJbG9jYWxob3N0MRowGAYJKoZI
+hvcNAQkBFgtyQGxvY2FsaG9zdDAeFw0xNTEwMzAxMDM2MTdaFw0xNTEwMzExMDM2
+MTdaMIGHMQswCQYDVQQGEwJJTjESMBAGA1UECAwJS2FybmF0YWthMRIwEAYDVQQH
+DAlCYW5nYWxvcmUxDzANBgNVBAoMBk9yYWNsZTEOMAwGA1UECwwFTXlTUUwxEzAR
+BgNVBAMMCmxvY2FsaG9zdDIxGjAYBgkqhkiG9w0BCQEWC3JAbG9jYWxob3N0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuYQ8QWo1jgO+0mEymJMQVTa2
+YzAbu3nONYSpVxp+v2hH2NZYpu4qZlG2Cc0+iIxm++psoMrdUTJZboQig1AmzuXc
+0aXChLMUdza8Ia0ejBekevzFPg6fHW93abA4g2/QOnIbXtmB9t4DQdsPKzR4wsWj
+beEuSxCU1BV/nViYP682jBdYXNqjLINSMYqYH9dozN4rUVL/QAmQLDFyYgeYYJuD
+riI7HvBDG6wgyWeqk7wOpkoxq0igO/BxB/qn+OL7n5jAFuK3dHYBb60wJjoTR3Zz
+iaia9qvZo0lw3nSsrmCbnrSCc5Lq95FN0IaTYjSmt/06BhqAyx8hRsC61b/3TwID
+AQABMA0GCSqGSIb3DQEBBQUAA4IBAQAReviXrpqYo1RlTHUkcpSzgYNEc2+X/tHo
+wkiVXBmhlLg6Yphdl/aYznhszI/M5DVxftlgbMxS3wHQSxJXNkIfoxkYNMAfW7Ac
+1vJ4PhMZT27sM2yaALJFtJVNVbi5ETl1957Ml6MbtEAGDNn1ETSDc3ZHtgPgvnXF
+GvWIQyizmN2gDjVJO6mqtKHlzTx1GOs4no8AUnJRfqPrerpLcU3UgDfrz0mrjtrw
+8dpKSxqtw837Rmtw73467iG6SCBfKt8cCAoqzbnwzmpIoKu4mW4uyazl2JOm/yFK
+x7HqrogplRjVHskFmBAaP3nltq01OT75q+IQpwu62om4b1Fp4EQy
+-----END CERTIFICATE-----
diff --git a/mysql-test/std_data/expired-client-key.pem b/mysql-test/std_data/expired-client-key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAuYQ8QWo1jgO+0mEymJMQVTa2YzAbu3nONYSpVxp+v2hH2NZY
+pu4qZlG2Cc0+iIxm++psoMrdUTJZboQig1AmzuXc0aXChLMUdza8Ia0ejBekevzF
+Pg6fHW93abA4g2/QOnIbXtmB9t4DQdsPKzR4wsWjbeEuSxCU1BV/nViYP682jBdY
+XNqjLINSMYqYH9dozN4rUVL/QAmQLDFyYgeYYJuDriI7HvBDG6wgyWeqk7wOpkox
+q0igO/BxB/qn+OL7n5jAFuK3dHYBb60wJjoTR3Zziaia9qvZo0lw3nSsrmCbnrSC
+c5Lq95FN0IaTYjSmt/06BhqAyx8hRsC61b/3TwIDAQABAoIBACghi+tWr2keNExM
+TGanAZR9dmz0fjtK+Smonf1CtQJw64HjtF/AC5oAuRFbvdhKDwkVyBPsbn3fF2uJ
+1/FyCEMfhGoxomeUWawEQiRCz+XcQ297eKuY/CCg+UL6pO8B5BiQkI0vHicqFahM
+W/arrifsGxNs79e7KYbLc8S04pJ71NQmlDAtbowBl+gAyppNtsfHLGWBj/BFOoNY
+MrV1UuERDHUY0CuAhfzWYcR+b3RTEo8A1rDY0oC05wYNNXpF34N3ROStvVTh36W8
+OLpDMv/OHdOMUwINBf8zm6qXOSs04M55yIEFguwOPwbN60OfVuh5OdBAMUA/tqaO
+8XfecMkCgYEA8c/iwAt1ttayZHaw6+5sjSLyb0jHDfgspDNPOvMCHujSLfX+v4tu
+T1blx1Fq8o684RfjwKhqVkCoU5I78oJXtiSzVd7ybkVnBOjVJj5LT3XGp/xw5gCT
+ipCVHk7eVHF+XnHl8F+aBU6P1JnmqzWvJqDvNz2SeCh1u4CfB9JvAiUCgYEAxGbE
+uSH22aNMR8odQCdfLGO7hJ73Nq2q7LhjRZ1tqOEwXGp8oJs0o7tOWNbEU5IIpGQH
+wP5BIQSOTyMAbaPYAFBkljmyYoZz5lda8lUSsceXK+Tdlx+pnbWEZodfhtYU/4VH
+EXDE3+z9KAIdWb7LMUE3ZK6Zz6yhSqWU2db8p2MCgYAKtR/fTSKbRAqGNFNFPzuD
+TGbb0qct0S143+TEQXp4j+quqlPre2sZDEoEd3B66SMn/HzTTSHYS+ioOrN425iy
+shFW3hZyF5SmPQEjPmLrU9XGHoGJTcE6w4g23Vsu9g+YcwaxjCovzfjEe0QhlLD6
+zumI0qsnsvLzqJBiMklEGQKBgQCfXfDFdOz0XxCXtEaV9xzATVEs5T0ejj+DBH/x
+TjRcdBYk93eXbzmAno2NgwAd/AKtOkocbXP10deUGYfQb8HnR1THnZvFXOqQ/1Na
+DnQz9AwT3wt8BIJC6ba85545MGArkz8+xK3MMmad31FnsGz607uaJB/FJ4RdqQym
+00+ClwKBgFrP92XzebzEJZ7tgUwkzJ7CWEPom1xeRffe2rms+BhHILg74tK/AAgU
+ISKRPL0aCYbY4hg8JRz1yi/YNH4p6zYRcZXy4BLH/5hlgn0WgRIuL5Otvs12XfOy
+OvBKaTZCJJiem2gVmFs6XQW8bKsFrtcuEcS5csOd31kF0Hj06a3U
+-----END RSA PRIVATE KEY-----
diff --git a/mysql-test/std_data/expired-server-cert.pem b/mysql-test/std_data/expired-server-cert.pem
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDgjCCAmoCAQEwDQYJKoZIhvcNAQEFBQAwgYYxCzAJBgNVBAYTAklOMRIwEAYD
+VQQIDAlLYXJuYXRha2ExEjAQBgNVBAcMCUJhbmdhbG9yZTEPMA0GA1UECgwGT3Jh
+Y2xlMQ4wDAYDVQQLDAVNeVNRTDESMBAGA1UEAwwJbG9jYWxob3N0MRowGAYJKoZI
+hvcNAQkBFgtyQGxvY2FsaG9zdDAeFw0xNTEwMzAxMDM2MTdaFw0xNTEwMzExMDM2
+MTdaMIGGMQswCQYDVQQGEwJJTjESMBAGA1UECAwJS2FybmF0YWthMRIwEAYDVQQH
+DAlCYW5nYWxvcmUxDzANBgNVBAoMBk9yYWNsZTEOMAwGA1UECwwFTXlTUUwxEjAQ
+BgNVBAMMCTEyNy4wLjAuMTEaMBgGCSqGSIb3DQEJARYLckBsb2NhbGhvc3QwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDikghTApsIp7LV21Xm6WuwHcJU
+oowP/1OM91JWmAOp8EzsKmg2ZX3JHCIJ21aVwVWRyCTzOa5iB96q705u6mcq1a8u
+GwSvirYga8zwJBn5CXlTA4x32H6hdFRWN2yvBKySem7YleGQl/2yu2jnGk1Ji4ml
+r7T4MMnI7eCfl10mdkTTxOoER24yPd8VItqnSD4+wvZytIeDrDfwjWZzmaEDYEBM
+fgqBd4tZCLtVg/fJhrLZSWoizaEmKtR+OurKJreEUbcePFRMPwEw/fp472Ci4k1u
+BTqFhFwPxXAQyt1JAZayanAL3kshAWDaLJUoQKbCv52/edQ0Arno+66kELMHAgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAGqmzjtPrAeK5nDfWcZvIUAZOwQabk15SZT8
+3KehzS1ExDQVuCBJkNiHkqE1TGDnQ9UAN8FCvExf4aGogM9TAB6iWh6EX4B6kGdo
+tMtuqXJH4MrZmgBjMtHHr/SAawHJwe2ykq5jzrsjBplGczOxAzfRz57IKnutNX3j
+53DPOL5z+C0Eu9o79EflfAy6Zbb2ZU63O6DlXfoY3u/6pKesmVZdkTs+OT4A0P2N
+FZojAyXiKsCSEcTTVZNmnY3u6JWQxw3GM6fwXZda+HZwUR+LQDoc++A1rruEaGF5
+PRjEDTGJHMn9a+gY02tGwWD7yaY2mk6JMl5V8Ynmep88AGfiDRY=
+-----END CERTIFICATE-----
diff --git a/mysql-test/std_data/expired-server-key.pem b/mysql-test/std_data/expired-server-key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA4pIIUwKbCKey1dtV5ulrsB3CVKKMD/9TjPdSVpgDqfBM7Cpo
+NmV9yRwiCdtWlcFVkcgk8zmuYgfequ9ObupnKtWvLhsEr4q2IGvM8CQZ+Ql5UwOM
+d9h+oXRUVjdsrwSsknpu2JXhkJf9srto5xpNSYuJpa+0+DDJyO3gn5ddJnZE08Tq
+BEduMj3fFSLap0g+PsL2crSHg6w38I1mc5mhA2BATH4KgXeLWQi7VYP3yYay2Ulq
+Is2hJirUfjrqyia3hFG3HjxUTD8BMP36eO9gouJNbgU6hYRcD8VwEMrdSQGWsmpw
+C95LIQFg2iyVKECmwr+dv3nUNAK56PuupBCzBwIDAQABAoIBABH9rpOI3W6uglDg
+/c08M8TkWA4Iaj7K84N6EBu4LnJMFo+aPnQzUu2pQjquJA34MCdHUUfPCL3YCiJg
+pkXAbzjDhwmOM60MwrGIXdmjxDw2OGATJBBQLJ39csT12bd8E4f+GNcx75tftlF+
++DGBsSlp3yA8943Nsfg2i2OgzVDEZSmKMg91H0XzlRSxK1+/FBwSLCEw8oB0cEQV
+Itg8b33EN7KKteMVtUxdnTddcdPHNLGyIGjDEf0A1ez8p6rITGBwHC+HrUyjj46s
+Zlgt4+R20s/mW6BsVPDzjJD1ZQpZw/hYPSt4M2qnAyYOinNBCxNxnT7n3JSr8hNs
+6t0sCGECgYEA9V3F2CKHt2wTFgt4mf1Sk0aymyij6WBuHeQUWKQOeIbwzM3gv+HH
+taNkkzuHnFPfLP1BrBi3cXIp/ImeNIEdgJl64W4JrYJi+1yPhvMHLj4DLZRHhtHR
+6OxQCCOZQv+hxotez2eP9QLuFBYadEeXcOIdPnuO6WmA9DVpIjogZ9MCgYEA7GO6
+aotoBCakPbW6xzXwwXFcGpUtwUpzyPQBE3MYpoIn83UNCWduGB3JdyfTXr6bGmC2
+X0AHGK1e9AEUHsx7L8webc99xwslNlKQcVSBen5RfACk7pi9y59mksw8hgga1C5Q
+0Q/faXUgMr1MJrFDj8c3fb1FdRhnEquN6P2SW30CgYBL2TAGjy4K+mKwBt3CJHf5
+RPqDUj3RL9j6bn4HpLdAdN5NQTs/tajJsnett9JE9fxgaO17KKzUaekmwtff/SXE
+ki1VMHHXbB3y+/r2SXwnxE2xMkwmFghgi2R2D6MZ/fHhcUXesXHj2IMGPIry9QqQ
+f6VwojtcVhvh4fzc8sD/twKBgQDC4l03pYK1mV3iekZoIfJAqMJ0L/Su3ECktXWF
+oWf7Lmbdceyzig/b1gLYN38tJxscHgt8b37qO1SC+biqw43zk+aqRVu+k1O0e1EV
+/cNZR3bKMoXHJymiC+I2uCZVoazsrNp34QwhFyzaZ/G2HIJEsMrw4O+4X8vqOoEe
+Sp80yQKBgEXtRH5EFMYxNM3Z3XJA7pz8UogLj+MT+B6JFAmPFwadq6dUQPSoMaLv
+rh74qDI6+8SWGaY6V1JssGuSbMzirQYToK3S7sU9BSGr1fF7J3xlwzouZdPMHpCW
+kHOWs5r9chRx8EDj9fmz+6e26G9AXVefzCpUHKbcIVx0X6Fbgv41
+-----END RSA PRIVATE KEY-----
diff --git a/rapid/plugin/x/tests/mtr/r/connection_expired_certs.result b/rapid/plugin/x/tests/mtr/r/connection_expired_certs.result
@@ -0,0 +1,12 @@
+install plugin mysqlx soname "mysqlx.so";
+call mtr.add_suppression("Plugin mysqlx reported: .Failed at SSL configuration: .SSL context is not usable without certificate and private key..");
+call mtr.add_suppression("Plugin mysqlx reported: .SSL_CTX_load_verify_locations failed.");
+Variable_name	Value
+Mysqlx_ssl_server_not_after	
+Mysqlx_ssl_server_not_before	
+0 rows affected
+Mysqlx.Ok {
+  msg: "bye!"
+}
+ok
+UNINSTALL PLUGIN mysqlx;
diff --git a/rapid/plugin/x/tests/mtr/t/connection_expired_certs-master.opt b/rapid/plugin/x/tests/mtr/t/connection_expired_certs-master.opt
@@ -0,0 +1,3 @@
+--ssl-key=$MYSQL_TEST_DIR/std_data/expired-server-key.pem
+--ssl-cert=$MYSQL_TEST_DIR/std_data/expired-server-cert.pem
+--ssl-ca=$MYSQL_TEST_DIR/std_data/expired-ca.pem
diff --git a/rapid/plugin/x/tests/mtr/t/connection_expired_certs.test b/rapid/plugin/x/tests/mtr/t/connection_expired_certs.test
@@ -0,0 +1,22 @@
+## Tests for checking xplugin behaviour when server is using expired ssl certificates.
+
+## Preamble
+--source ../include/xplugin_preamble.inc
+
+# Tests
+--write_file $MYSQL_TMP_DIR/expired_ssl_certs.tmp
+-->quiet
+
+-->stmtsql show global status like 'Mysqlx_ssl_server_not%';
+-->recvresult
+
+EOF
+
+--replace_regex /Mysqlx_ssl_server_not_after([[:space:]]*)[-a-zA-Z0-9: ]*/Mysqlx_ssl_server_not_after\1/ /Mysqlx_ssl_server_not_before([[:space:]]*)[a-zA-Z0-9: ]*/Mysqlx_ssl_server_not_before\1/
+--exec $MYSQLXTEST -uroot --password='' --file=$MYSQL_TMP_DIR/expired_ssl_certs.tmp 2>&1
+
+## Cleanup
+--remove_file $MYSQL_TMP_DIR/expired_ssl_certs.tmp
+
+## Postamble
+UNINSTALL PLUGIN mysqlx;
diff --git a/sql/ssl_wrapper_service.cc b/sql/ssl_wrapper_service.cc
@@ -1,4 +1,4 @@
-/*  Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -46,6 +46,8 @@ extern "C"
 static char *
 my_asn1_time_to_string(ASN1_TIME *time, char *buf, size_t len)
 {
+  if (!time)
+      return NULL;
   return yaSSL_ASN1_TIME_to_string(time, buf, len);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+--ssl-key=$MYSQL_TEST_DIR/std_data/expired-server-key.pem`
	`2`	`+--ssl-cert=$MYSQL_TEST_DIR/std_data/expired-server-cert.pem`
	`3`	`+--ssl-ca=$MYSQL_TEST_DIR/std_data/expired-ca.pem`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.`
	`1`	`+/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.`
`2`	`2`
`3`	`3`	`This program is free software; you can redistribute it and/or`
`4`	`4`	`modify it under the terms of the GNU General Public License as`
`@@ -46,6 +46,8 @@ extern "C"`
`46`	`46`	`static char *`
`47`	`47`	`my_asn1_time_to_string(ASN1_TIME time, char buf, size_t len)`
`48`	`48`	`{`
	`49`	`+ if (!time)`
	`50`	`+ return NULL;`
`49`	`51`	`return yaSSL_ASN1_TIME_to_string(time, buf, len);`
`50`	`52`	`}`
`51`	`53`