Commit 81522072 authored by unknown's avatar unknown
Browse files

Bug#21868 Server crashes if encrypted certificate key provided 

 - Add test case which runs the same tests as ssl.test but with a different DES encrypted key 


mysql-test/std_data/server-key-des.pem:
  BitKeeper file /home/msvensson/mysql/bug21868/my50-bug21868/mysql-test/std_data/server-key-des.pem
mysql-test/std_data/server-cert-des.pem:
  BitKeeper file /home/msvensson/mysql/bug21868/my50-bug21868/mysql-test/std_data/server-cert-des.pem
mysql-test/r/ssl_des.result:
  New BitKeeper file ``mysql-test/r/ssl_des.result''
mysql-test/t/ssl_des-master.opt:
  New BitKeeper file ``mysql-test/t/ssl_des-master.opt''
mysql-test/t/ssl_des.test:
  New BitKeeper file ``mysql-test/t/ssl_des.test''
parent f3172a89

mysql-test/r/ssl_des.result

0 → 100644
+2159 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/std_data/server-cert-des.pem

0 → 100644
+16 −0
Original line number Diff line number Diff line 
-----BEGIN CERTIFICATE-----

MIICljCCAX4CAQEwDQYJKoZIhvcNAQEEBQAwUTELMAkGA1UEBhMCU0UxEDAOBgNV

BAgTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCMRAwDgYDVQQLEwdTdXBwb3J0

MQswCQYDVQQDEwJDQTAeFw0wNjA4MjgxMTA4NTlaFw0wOTA1MjQxMTA4NTlaMFUx

CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBB

QjEQMA4GA1UECxMHU3VwcG9ydDEPMA0GA1UEAxMGc2VydmVyMIGfMA0GCSqGSIb3

DQEBAQUAA4GNADCBiQKBgQDEiOVZcWYzZe7I8xhhUwCzvmkZifAXeMTH+8XKGLHX

NWF3FLduAmeAad9oOZgBKb+oWTdRDWXqwu6nYYUBfrUpaY27/wLkgWRgewL3LZnw

W2FjhNsjx3gI2NK+Pix47q9d+a+5T4AW5+lK499l0K0k2cvyFdIerhDW8R0t8Uru

twIDAQABMA0GCSqGSIb3DQEBBAUAA4IBAQC2LQcqLg52RbelWrKutlJ5E6rzugnJ

ZAlbN9sM98O2xFiIGDA3tb5j9LAEjE0E+RqdptEYnvy9b3szhLYXtIILZTkClf9r

Uwu1nUYPTyp+9ZYCa4fovOU5h1Ogv+9UZPds/LPDwWEn8K+lvscB4X57wJyuoEck

1Mu41OA6h77181MydSdgZo0oquJDWhdCsYHXVFVs0F6naMm2uPMCTDiQVlhHJuTO

VQMNIwxRFtvsv2tpsXsaP/8sT32d5CFebfxxSVnqQvJ4ZdIrphl6L43XU01rsEcE

K8KYujZQ6SKws+HVcGqsr7TPgJfJE6D+5RazvvIQISPvx4eduebqzqdC

-----END CERTIFICATE-----

mysql-test/std_data/server-key-des.pem

0 → 100644
+18 −0
Original line number Diff line number Diff line 
-----BEGIN RSA PRIVATE KEY-----

Proc-Type: 4,ENCRYPTED

DEK-Info: DES-EDE3-CBC,D2BE7598C7E3BDA5



1W3qPgw5ut80OhaAGVZZe/tfFiBAlwpX1SohdApWj+QYP+dK/mdEBhgI3BXTFNLW

pJqDTzGlKtft7hHN6QDFEdZMKxej5+2iLu14V62o+5yQgUoqswoXcmmqJCJ7AvyJ

yMBmGAzxRFlQsT8lf6o5TS1/efBvjvWhh3NG2Zq2LpyhWRRqA3kNhzktzt2WjDZe

ZkKmZJJnArr/Aw7jEBC4sH+nmgxoR18GzDddRG12hv1AWyHc3+VisTBpyNzeBy17

rxuQtqLzkAJmId723ddw83RVNSvBUUS3G0rx5O3HPobvZK89UqVxcXtIgc11WTVU

N3DbcJq5it43Loo0W3gAngtESDm2E3rTadrmdUSDGv2wQ5dNFl6cQ1f397Sdd/WC

A0grn1tKjJ6COp80Ymdyvn+stjv/+Rl1/KHSeG0lNeZxqjPPOJ7NHaKv7qjYsJ6W

LT35/Xc3oCo5qk9FOlq/0tGjHxf6RcFr5U7k5ILKZs+RmvJ4Sv/VYShLfLTcfGbJ

wBNfRKvcHZBQJQBb1+s/kRrjFFtvhrUwLz4+c9kskp+t4qRVYywUAnGGGsMs/GPm

wYsLQZO6Bs5/taaVUyaJQW015J7FGGv+/7/A1dIhu73S/Xl/YcFbX/CMEVq2Lxxd

hZdFIuaZ7LE+0MDQWsvYMYPDPLDH11diczb/jeKBdLPOzk/FUqVx3Fin1PpcaBxY

b+7oZJhYdg/rAWDeQ/nji9qnEG8waK6x1hdkYPOrqqWQPfgM/LPsSrgWeuTSdx2B

Ixi01UlBb5UP4K7UrjyddPobmcVjXaQLNe7zaq0+OS3UnIG85GtHrQ==

-----END RSA PRIVATE KEY-----

mysql-test/t/ssl_des-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--ssl-cert=std_data/server-cert-des.pem --ssl-key=std_data/server-key-des.pem

mysql-test/t/ssl_des.test

0 → 100644
+19 −0
Original line number Diff line number Diff line 
# Tell the server to use a DES-encrypted cert

# then turn on ssl between the client and server

# and run a number of standard tests



-- source include/have_openssl.inc



# Connect by ip to avoid turning on "ssl-verify-server-cert"

connect (ssl_con,127.0.0.1,root,,,,$MASTER_MYPORT,SSL);



# Check ssl turned on

SHOW STATUS LIKE 'Ssl_cipher';



# Source select test case

-- source include/common-tests.inc



# Check ssl turned on

SHOW STATUS LIKE 'Ssl_cipher';