[Pkg-mysql-commits] r1403 - trunk/debian/patches
Norbert Tretkowski
nobse at alioth.debian.org
Tue Feb 3 15:02:49 UTC 2009
Author: nobse
Date: 2009-02-03 15:02:49 +0000 (Tue, 03 Feb 2009)
New Revision: 1403
Modified:
trunk/debian/patches/63_update_ssl_certs.dpatch
Log:
Forgot to update test and result in testsuite.
Modified: trunk/debian/patches/63_update_ssl_certs.dpatch
===================================================================
--- trunk/debian/patches/63_update_ssl_certs.dpatch 2009-02-03 14:45:32 UTC (rev 1402)
+++ trunk/debian/patches/63_update_ssl_certs.dpatch 2009-02-03 15:02:49 UTC (rev 1403)
@@ -5,9 +5,24 @@
## DP: http://bugs.mysql.com/bug.php?id=42366
@DPATCH@
-diff -Nur mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/cacert.pem mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/cacert.pem
---- mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/cacert.pem 2008-01-11 16:23:44.000000000 +0100
-+++ mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/cacert.pem 2009-02-03 15:38:13.000000000 +0100
+=== modified file 'mysql-test/r/openssl_1.result'
+--- mysql-test/r/openssl_1.result 2007-07-25 15:46:50 +0000
++++ mysql-test/r/openssl_1.result 2009-01-28 14:18:50 +0000
+@@ -3,8 +3,8 @@
+ insert into t1 values (5);
+ grant select on test.* to ssl_user1 at localhost require SSL;
+ grant select on test.* to ssl_user2 at localhost require cipher "DHE-RSA-AES256-SHA";
+-grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com";
+-grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
++grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com";
++grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
+ grant select on test.* to ssl_user5 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
+ flush privileges;
+ connect(localhost,ssl_user5,,test,MASTER_PORT,MASTER_SOCKET);
+
+=== modified file 'mysql-test/std_data/cacert.pem'
+--- mysql-test/std_data/cacert.pem 2007-07-27 15:39:07 +0000
++++ mysql-test/std_data/cacert.pem 2009-01-28 14:18:50 +0000
@@ -1,17 +1,17 @@
-----BEGIN CERTIFICATE-----
-MIICrTCCAhagAwIBAgIJAIAO/Ybiptv1MA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV
@@ -38,9 +53,10 @@
+aPyoenjY6UF8n7B4quWy3SIUk2LSHeJLW+kzJn2afN9gvipFhdVh/uU2TIyLGOur
+Z/vmJX2W7hF1uqPnbfa8Lrw=
-----END CERTIFICATE-----
-diff -Nur mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/client-cert.pem mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/client-cert.pem
---- mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/client-cert.pem 2008-01-11 16:23:44.000000000 +0100
-+++ mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/client-cert.pem 2009-02-03 15:38:22.000000000 +0100
+
+=== modified file 'mysql-test/std_data/client-cert.pem'
+--- mysql-test/std_data/client-cert.pem 2007-07-27 15:39:07 +0000
++++ mysql-test/std_data/client-cert.pem 2009-01-28 14:18:50 +0000
@@ -1,42 +1,55 @@
Certificate:
Data:
@@ -128,9 +144,10 @@
+R+FM+nTR4ovMoEuoJNGkw2sqxijNQeAGSObP8jzKN5XXKWRrkZGD56zIC4e82qaq
+8URDyHR7FSaRLgPEcVBs+GjcjA==
-----END CERTIFICATE-----
-diff -Nur mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/client-key.pem mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/client-key.pem
---- mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/client-key.pem 2008-01-11 16:23:44.000000000 +0100
-+++ mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/client-key.pem 2009-02-03 15:38:29.000000000 +0100
+
+=== modified file 'mysql-test/std_data/client-key.pem'
+--- mysql-test/std_data/client-key.pem 2007-07-27 15:39:07 +0000
++++ mysql-test/std_data/client-key.pem 2009-01-28 14:18:50 +0000
@@ -1,9 +1,9 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBANjbaChJhE3WD1y8PZqrcNU+9bUXuu/h+IdUMCIfgQe/+SR/ilQQ
@@ -148,9 +165,165 @@
+R6KcMiKiNQLRAiAcmHqlzFzFgisotai2Fc6VRkXHG7gmzOSvBJt1VjmpDQIge6jf
+2N7whTdvC4ferB+zUlgWQdyvx1c3T4gnt6PYdaY=
-----END RSA PRIVATE KEY-----
-diff -Nur mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/server8k-cert.pem mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/server8k-cert.pem
---- mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/server8k-cert.pem 2008-01-11 16:23:44.000000000 +0100
-+++ mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/server8k-cert.pem 2009-02-03 15:38:49.000000000 +0100
+
+=== removed file 'mysql-test/std_data/server-cert-des.pem'
+--- mysql-test/std_data/server-cert-des.pem 2006-09-25 14:44:15 +0000
++++ mysql-test/std_data/server-cert-des.pem 1970-01-01 00:00:00 +0000
+@@ -1,16 +0,0 @@
+------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-----
+
+=== modified file 'mysql-test/std_data/server-cert.pem'
+--- mysql-test/std_data/server-cert.pem 2007-07-27 15:39:07 +0000
++++ mysql-test/std_data/server-cert.pem 2009-01-28 14:18:50 +0000
+@@ -1,42 +1,55 @@
+ Certificate:
+ Data:
+- Version: 1 (0x0)
++ Version: 3 (0x2)
+ Serial Number: 1 (0x1)
+- Signature Algorithm: md5WithRSAEncryption
++ Signature Algorithm: sha1WithRSAEncryption
+ Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
+ Validity
+- Not Before: May 3 08:54:13 2006 GMT
+- Not After : Jan 27 08:54:13 2009 GMT
+- Subject: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB, CN=localhost/emailAddress=abstract.mysql.developer at mysql.com
++ Not Before: Jan 28 10:55:13 2009 GMT
++ Not After : Jan 28 10:55:13 2010 GMT
++ Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost/emailAddress=abstract.mysql.developer at mysql.com
+ Subject Public Key Info:
+ Public Key Algorithm: rsaEncryption
+ RSA Public Key: (512 bit)
+ Modulus (512 bit):
+- 00:d9:fd:da:b3:fb:7c:e0:b0:03:be:97:c6:a4:36:
+- ac:71:af:bb:2d:e5:84:ed:f3:8f:2b:eb:11:e5:aa:
+- 66:ed:bf:62:6b:e3:ce:fa:80:ed:90:ff:b9:4a:39:
+- 20:40:b6:f2:99:bf:2f:33:b5:f2:ec:3a:90:60:1d:
+- 9e:94:7e:a4:1b
++ 00:b6:8f:e5:b7:b4:86:83:13:8a:f9:bf:63:cb:64:
++ 2d:b9:51:d1:de:ab:7b:45:1f:aa:b5:66:73:13:f9:
++ a6:07:d5:ba:7c:fa:92:bd:37:e2:ad:87:db:3e:b6:
++ 6a:12:64:f8:ee:17:e3:15:06:2f:a8:82:68:bf:57:
++ 8d:c3:04:98:27
+ Exponent: 65537 (0x10001)
+- Signature Algorithm: md5WithRSAEncryption
+- de:5e:35:cd:7b:11:e6:7c:c5:7c:d6:27:4e:72:12:49:42:eb:
+- 6f:2c:96:f3:f4:00:78:a7:4f:9f:2d:7b:d7:30:39:af:49:4d:
+- df:b1:55:0d:30:be:23:6f:06:67:fd:dd:ba:98:66:36:c6:32:
+- b7:ed:63:fc:aa:49:cd:4f:72:98:3b:13:0e:f6:28:d7:d4:eb:
+- 04:6b:dc:e8:c7:04:80:92:e4:04:86:0b:ed:32:25:76:1d:a9:
+- 5c:a9:2c:18:2c:bd:bc:15:ed:e1:76:96:4d:bb:0d:41:44:06:
+- 2c:ad:45:bb:db:61:ad:17:11:cb:49:70:67:eb:c6:27:d3:91:
+- c8:f2
++ X509v3 extensions:
++ X509v3 Basic Constraints:
++ CA:FALSE
++ X509v3 Subject Key Identifier:
++ D9:9A:B8:5F:22:EA:04:10:C8:25:7D:82:57:E6:2E:FD:19:29:E7:DA
++ X509v3 Authority Key Identifier:
++ keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF
++ DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
++ serial:95:E9:78:F5:34:50:E4:D5
++
++ Signature Algorithm: sha1WithRSAEncryption
++ 54:07:2d:21:0b:a5:af:3b:58:23:32:5e:56:7f:ab:58:63:48:
++ 91:aa:38:90:89:16:f9:cc:bf:a4:0e:78:2b:9f:c5:1b:58:a6:
++ e6:08:8f:2e:ae:97:03:21:9b:f1:cd:c0:26:8f:1d:d7:28:27:
++ a0:8e:81:09:1b:1c:0f:c9:a5:41:3a:2d:44:3f:9c:fa:87:ff:
++ c8:4c:2b:44:f7:1b:c1:3e:4f:01:7f:e9:26:cc:9f:1c:06:b5:
++ 0b:27:d1:10:90:be:93:0c:9c:e7:b0:d1:ea:27:99:4e:06:14:
++ 0c:7a:e9:c1:52:c5:33:68:bc:61:0d:db:81:3b:57:48:57:bf:
++ 42:9a
+ -----BEGIN CERTIFICATE-----
+-MIIB+zCCAWQCAQEwDQYJKoZIhvcNAQEEBQAwRDELMAkGA1UEBhMCU0UxEDAOBgNV
+-BAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFC
+-MB4XDTA2MDUwMzA4NTQxM1oXDTA5MDEyNzA4NTQxM1owgYsxCzAJBgNVBAYTAlNF
+-MRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYDVQQKEwhN
+-eVNRTCBBQjESMBAGA1UEAxMJbG9jYWxob3N0MTEwLwYJKoZIhvcNAQkBFiJhYnN0
+-cmFjdC5teXNxbC5kZXZlbG9wZXJAbXlzcWwuY29tMFwwDQYJKoZIhvcNAQEBBQAD
+-SwAwSAJBANn92rP7fOCwA76XxqQ2rHGvuy3lhO3zjyvrEeWqZu2/YmvjzvqA7ZD/
+-uUo5IEC28pm/LzO18uw6kGAdnpR+pBsCAwEAATANBgkqhkiG9w0BAQQFAAOBgQDe
+-XjXNexHmfMV81idOchJJQutvLJbz9AB4p0+fLXvXMDmvSU3fsVUNML4jbwZn/d26
+-mGY2xjK37WP8qknNT3KYOxMO9ijX1OsEa9zoxwSAkuQEhgvtMiV2HalcqSwYLL28
+-Fe3hdpZNuw1BRAYsrUW722GtFxHLSXBn68Yn05HI8g==
++MIICkzCCAfygAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
++MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
++UUwgQUIwHhcNMDkwMTI4MTA1NTEzWhcNMTAwMTI4MTA1NTEzWjB5MQswCQYDVQQG
++EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNV
++BAMTCWxvY2FsaG9zdDExMC8GCSqGSIb3DQEJARYiYWJzdHJhY3QubXlzcWwuZGV2
++ZWxvcGVyQG15c3FsLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC2j+W3tIaD
++E4r5v2PLZC25UdHeq3tFH6q1ZnMT+aYH1bp8+pK9N+Kth9s+tmoSZPjuF+MVBi+o
++gmi/V43DBJgnAgMBAAGjgaMwgaAwCQYDVR0TBAIwADAdBgNVHQ4EFgQU2Zq4XyLq
++BBDIJX2CV+Yu/Rkp59owdAYDVR0jBG0wa4AU8uLqVWWkmuKsnZf1RWz294wRrd+h
++SKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdV
++cHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAJXpePU0UOTVMA0GCSqGSIb3DQEB
++BQUAA4GBAFQHLSELpa87WCMyXlZ/q1hjSJGqOJCJFvnMv6QOeCufxRtYpuYIjy6u
++lwMhm/HNwCaPHdcoJ6COgQkbHA/JpUE6LUQ/nPqH/8hMK0T3G8E+TwF/6SbMnxwG
++tQsn0RCQvpMMnOew0eonmU4GFAx66cFSxTNovGEN24E7V0hXv0Ka
+ -----END CERTIFICATE-----
+
+=== removed file 'mysql-test/std_data/server-key-des.pem'
+--- mysql-test/std_data/server-key-des.pem 2006-09-25 14:44:15 +0000
++++ mysql-test/std_data/server-key-des.pem 1970-01-01 00:00:00 +0000
+@@ -1,18 +0,0 @@
+------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-----
+
+=== modified file 'mysql-test/std_data/server-key.pem'
+--- mysql-test/std_data/server-key.pem 2007-07-27 15:39:07 +0000
++++ mysql-test/std_data/server-key.pem 2009-01-28 14:18:50 +0000
+@@ -1,9 +1,9 @@
+ -----BEGIN RSA PRIVATE KEY-----
+-MIIBOgIBAAJBANn92rP7fOCwA76XxqQ2rHGvuy3lhO3zjyvrEeWqZu2/YmvjzvqA
+-7ZD/uUo5IEC28pm/LzO18uw6kGAdnpR+pBsCAwEAAQJBAMieYdpmRoUaODf9wqh6
+-ULXH/sG8i1vaXRcUHcJ50oRVfVK8/tGGvUuTDu6MeINTdahNDlYfjwOjKWVXys1w
+-h6ECIQDs6s7DfczK2bKCLt0zqg24mZL3rOpGmDU+TatwN1yVgwIhAOuMzdVTX39p
+-328+5WxJvBOFfxmSmqdDhIFpnRMvgguJAiByvKjT/km+970+1OllyvaIL0AA2OpA
+-tBgdC0p6tyUMdwIgKuHAWzTJbu28UolVxQgLaFZmVCZ/ZzIAfnrWsLZ2a1kCIBq/
+-ywJ2cpyFlgazu8AH6KCQa0ok9s70ElaB6FEC85Al
++MIIBOQIBAAJBALaP5be0hoMTivm/Y8tkLblR0d6re0UfqrVmcxP5pgfVunz6kr03
++4q2H2z62ahJk+O4X4xUGL6iCaL9XjcMEmCcCAwEAAQJASA5VwgNb0CKHiPm0ntOk
++hG+54SRX3DmafEy6gRjZIl/bZ/asSLhXUZ+CeohyrQh7BZgYWvykd8pRISL9eKsU
++GQIhAOXkUrOtP/EtjyqNluEqZdG+RZi/7p61JS3Ce13Myu+LAiEAy0uMlV34AJpM
++b40FPKqlHxw8DD/Dt1iKhNVAg8+LDVUCIFjv7fbJDbW2VG63/Cj8CAwOukoP5rbL
++iaicVrHBKrllAiB9+MiaXeopZXNrxDS0jQFYr8Q9yt1aJVFgUkxx4Q9HKQIgZPs0
++KlF3NNNWw78INaAEkyf0IEssnLMsuoCWw0DIOak=
+ -----END RSA PRIVATE KEY-----
+
+=== modified file 'mysql-test/std_data/server8k-cert.pem'
+--- mysql-test/std_data/server8k-cert.pem 2007-07-17 18:43:56 +0000
++++ mysql-test/std_data/server8k-cert.pem 2009-01-28 14:18:50 +0000
@@ -1,51 +1,138 @@
+Certificate:
+ Data:
@@ -339,9 +512,10 @@
+shLVxla8E2A3M26g2K58iPlL7nsfyPBWGQdNu0VSHHiBB3wThriGcIXkcSVYeNG+
+3iKCbRpLBqzw6FCHx2lkwmFDzZYGpn4JqQIBKqJA880QgEjQNFVAuc4=
-----END CERTIFICATE-----
-diff -Nur mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/server8k-key.pem mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/server8k-key.pem
---- mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/server8k-key.pem 2008-01-11 16:23:44.000000000 +0100
-+++ mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/server8k-key.pem 2009-02-03 15:38:58.000000000 +0100
+
+=== modified file 'mysql-test/std_data/server8k-key.pem'
+--- mysql-test/std_data/server8k-key.pem 2007-07-17 18:43:56 +0000
++++ mysql-test/std_data/server8k-key.pem 2009-01-28 14:18:50 +0000
@@ -1,99 +1,99 @@
-----BEGIN RSA PRIVATE KEY-----
-MIISKQIBAAKCBAEA1BZYf95sKL+WGiAhVznSV4B1f7g5E41wevaMZYqbIUGmD1/C
@@ -539,154 +713,19 @@
+Pc/OshHZHeCVFUSXtcf1pfmmBtT6FHX0L4cgVqA5xO8RYapnLDAFLXq2/dRv3NwW
+W9CzZcZKh7jmJw4iSIY5IU1+ThgugWoxlkcmjs/egjBclL8BBfqRIwx/vOE=
-----END RSA PRIVATE KEY-----
-diff -Nur mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/server-cert-des.pem mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/server-cert-des.pem
---- mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/server-cert-des.pem 2008-01-11 16:23:44.000000000 +0100
-+++ mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/server-cert-des.pem 1970-01-01 01:00:00.000000000 +0100
-@@ -1,16 +0,0 @@
-------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-----
-diff -Nur mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/server-cert.pem mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/server-cert.pem
---- mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/server-cert.pem 2008-01-11 16:23:44.000000000 +0100
-+++ mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/server-cert.pem 2009-02-03 15:38:37.000000000 +0100
-@@ -1,42 +1,55 @@
- Certificate:
- Data:
-- Version: 1 (0x0)
-+ Version: 3 (0x2)
- Serial Number: 1 (0x1)
-- Signature Algorithm: md5WithRSAEncryption
-+ Signature Algorithm: sha1WithRSAEncryption
- Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
- Validity
-- Not Before: May 3 08:54:13 2006 GMT
-- Not After : Jan 27 08:54:13 2009 GMT
-- Subject: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB, CN=localhost/emailAddress=abstract.mysql.developer at mysql.com
-+ Not Before: Jan 28 10:55:13 2009 GMT
-+ Not After : Jan 28 10:55:13 2010 GMT
-+ Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost/emailAddress=abstract.mysql.developer at mysql.com
- Subject Public Key Info:
- Public Key Algorithm: rsaEncryption
- RSA Public Key: (512 bit)
- Modulus (512 bit):
-- 00:d9:fd:da:b3:fb:7c:e0:b0:03:be:97:c6:a4:36:
-- ac:71:af:bb:2d:e5:84:ed:f3:8f:2b:eb:11:e5:aa:
-- 66:ed:bf:62:6b:e3:ce:fa:80:ed:90:ff:b9:4a:39:
-- 20:40:b6:f2:99:bf:2f:33:b5:f2:ec:3a:90:60:1d:
-- 9e:94:7e:a4:1b
-+ 00:b6:8f:e5:b7:b4:86:83:13:8a:f9:bf:63:cb:64:
-+ 2d:b9:51:d1:de:ab:7b:45:1f:aa:b5:66:73:13:f9:
-+ a6:07:d5:ba:7c:fa:92:bd:37:e2:ad:87:db:3e:b6:
-+ 6a:12:64:f8:ee:17:e3:15:06:2f:a8:82:68:bf:57:
-+ 8d:c3:04:98:27
- Exponent: 65537 (0x10001)
-- Signature Algorithm: md5WithRSAEncryption
-- de:5e:35:cd:7b:11:e6:7c:c5:7c:d6:27:4e:72:12:49:42:eb:
-- 6f:2c:96:f3:f4:00:78:a7:4f:9f:2d:7b:d7:30:39:af:49:4d:
-- df:b1:55:0d:30:be:23:6f:06:67:fd:dd:ba:98:66:36:c6:32:
-- b7:ed:63:fc:aa:49:cd:4f:72:98:3b:13:0e:f6:28:d7:d4:eb:
-- 04:6b:dc:e8:c7:04:80:92:e4:04:86:0b:ed:32:25:76:1d:a9:
-- 5c:a9:2c:18:2c:bd:bc:15:ed:e1:76:96:4d:bb:0d:41:44:06:
-- 2c:ad:45:bb:db:61:ad:17:11:cb:49:70:67:eb:c6:27:d3:91:
-- c8:f2
-+ X509v3 extensions:
-+ X509v3 Basic Constraints:
-+ CA:FALSE
-+ X509v3 Subject Key Identifier:
-+ D9:9A:B8:5F:22:EA:04:10:C8:25:7D:82:57:E6:2E:FD:19:29:E7:DA
-+ X509v3 Authority Key Identifier:
-+ keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF
-+ DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
-+ serial:95:E9:78:F5:34:50:E4:D5
-+
-+ Signature Algorithm: sha1WithRSAEncryption
-+ 54:07:2d:21:0b:a5:af:3b:58:23:32:5e:56:7f:ab:58:63:48:
-+ 91:aa:38:90:89:16:f9:cc:bf:a4:0e:78:2b:9f:c5:1b:58:a6:
-+ e6:08:8f:2e:ae:97:03:21:9b:f1:cd:c0:26:8f:1d:d7:28:27:
-+ a0:8e:81:09:1b:1c:0f:c9:a5:41:3a:2d:44:3f:9c:fa:87:ff:
-+ c8:4c:2b:44:f7:1b:c1:3e:4f:01:7f:e9:26:cc:9f:1c:06:b5:
-+ 0b:27:d1:10:90:be:93:0c:9c:e7:b0:d1:ea:27:99:4e:06:14:
-+ 0c:7a:e9:c1:52:c5:33:68:bc:61:0d:db:81:3b:57:48:57:bf:
-+ 42:9a
- -----BEGIN CERTIFICATE-----
--MIIB+zCCAWQCAQEwDQYJKoZIhvcNAQEEBQAwRDELMAkGA1UEBhMCU0UxEDAOBgNV
--BAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFC
--MB4XDTA2MDUwMzA4NTQxM1oXDTA5MDEyNzA4NTQxM1owgYsxCzAJBgNVBAYTAlNF
--MRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYDVQQKEwhN
--eVNRTCBBQjESMBAGA1UEAxMJbG9jYWxob3N0MTEwLwYJKoZIhvcNAQkBFiJhYnN0
--cmFjdC5teXNxbC5kZXZlbG9wZXJAbXlzcWwuY29tMFwwDQYJKoZIhvcNAQEBBQAD
--SwAwSAJBANn92rP7fOCwA76XxqQ2rHGvuy3lhO3zjyvrEeWqZu2/YmvjzvqA7ZD/
--uUo5IEC28pm/LzO18uw6kGAdnpR+pBsCAwEAATANBgkqhkiG9w0BAQQFAAOBgQDe
--XjXNexHmfMV81idOchJJQutvLJbz9AB4p0+fLXvXMDmvSU3fsVUNML4jbwZn/d26
--mGY2xjK37WP8qknNT3KYOxMO9ijX1OsEa9zoxwSAkuQEhgvtMiV2HalcqSwYLL28
--Fe3hdpZNuw1BRAYsrUW722GtFxHLSXBn68Yn05HI8g==
-+MIICkzCCAfygAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
-+MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
-+UUwgQUIwHhcNMDkwMTI4MTA1NTEzWhcNMTAwMTI4MTA1NTEzWjB5MQswCQYDVQQG
-+EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNV
-+BAMTCWxvY2FsaG9zdDExMC8GCSqGSIb3DQEJARYiYWJzdHJhY3QubXlzcWwuZGV2
-+ZWxvcGVyQG15c3FsLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC2j+W3tIaD
-+E4r5v2PLZC25UdHeq3tFH6q1ZnMT+aYH1bp8+pK9N+Kth9s+tmoSZPjuF+MVBi+o
-+gmi/V43DBJgnAgMBAAGjgaMwgaAwCQYDVR0TBAIwADAdBgNVHQ4EFgQU2Zq4XyLq
-+BBDIJX2CV+Yu/Rkp59owdAYDVR0jBG0wa4AU8uLqVWWkmuKsnZf1RWz294wRrd+h
-+SKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdV
-+cHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAJXpePU0UOTVMA0GCSqGSIb3DQEB
-+BQUAA4GBAFQHLSELpa87WCMyXlZ/q1hjSJGqOJCJFvnMv6QOeCufxRtYpuYIjy6u
-+lwMhm/HNwCaPHdcoJ6COgQkbHA/JpUE6LUQ/nPqH/8hMK0T3G8E+TwF/6SbMnxwG
-+tQsn0RCQvpMMnOew0eonmU4GFAx66cFSxTNovGEN24E7V0hXv0Ka
- -----END CERTIFICATE-----
-diff -Nur mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/server-key-des.pem mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/server-key-des.pem
---- mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/server-key-des.pem 2008-01-11 16:23:44.000000000 +0100
-+++ mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/server-key-des.pem 1970-01-01 01:00:00.000000000 +0100
-@@ -1,18 +0,0 @@
-------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-----
-diff -Nur mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/server-key.pem mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/server-key.pem
---- mysql-dfsg-5.0-5.0.51a.orig/mysql-test/std_data/server-key.pem 2008-01-11 16:23:44.000000000 +0100
-+++ mysql-dfsg-5.0-5.0.51a/mysql-test/std_data/server-key.pem 2009-02-03 15:38:42.000000000 +0100
-@@ -1,9 +1,9 @@
- -----BEGIN RSA PRIVATE KEY-----
--MIIBOgIBAAJBANn92rP7fOCwA76XxqQ2rHGvuy3lhO3zjyvrEeWqZu2/YmvjzvqA
--7ZD/uUo5IEC28pm/LzO18uw6kGAdnpR+pBsCAwEAAQJBAMieYdpmRoUaODf9wqh6
--ULXH/sG8i1vaXRcUHcJ50oRVfVK8/tGGvUuTDu6MeINTdahNDlYfjwOjKWVXys1w
--h6ECIQDs6s7DfczK2bKCLt0zqg24mZL3rOpGmDU+TatwN1yVgwIhAOuMzdVTX39p
--328+5WxJvBOFfxmSmqdDhIFpnRMvgguJAiByvKjT/km+970+1OllyvaIL0AA2OpA
--tBgdC0p6tyUMdwIgKuHAWzTJbu28UolVxQgLaFZmVCZ/ZzIAfnrWsLZ2a1kCIBq/
--ywJ2cpyFlgazu8AH6KCQa0ok9s70ElaB6FEC85Al
-+MIIBOQIBAAJBALaP5be0hoMTivm/Y8tkLblR0d6re0UfqrVmcxP5pgfVunz6kr03
-+4q2H2z62ahJk+O4X4xUGL6iCaL9XjcMEmCcCAwEAAQJASA5VwgNb0CKHiPm0ntOk
-+hG+54SRX3DmafEy6gRjZIl/bZ/asSLhXUZ+CeohyrQh7BZgYWvykd8pRISL9eKsU
-+GQIhAOXkUrOtP/EtjyqNluEqZdG+RZi/7p61JS3Ce13Myu+LAiEAy0uMlV34AJpM
-+b40FPKqlHxw8DD/Dt1iKhNVAg8+LDVUCIFjv7fbJDbW2VG63/Cj8CAwOukoP5rbL
-+iaicVrHBKrllAiB9+MiaXeopZXNrxDS0jQFYr8Q9yt1aJVFgUkxx4Q9HKQIgZPs0
-+KlF3NNNWw78INaAEkyf0IEssnLMsuoCWw0DIOak=
- -----END RSA PRIVATE KEY-----
+
+=== modified file 'mysql-test/t/openssl_1.test'
+--- mysql-test/t/openssl_1.test 2007-04-11 21:42:53 +0000
++++ mysql-test/t/openssl_1.test 2009-01-28 14:18:50 +0000
+@@ -11,8 +11,8 @@
+
+ grant select on test.* to ssl_user1 at localhost require SSL;
+ grant select on test.* to ssl_user2 at localhost require cipher "DHE-RSA-AES256-SHA";
+-grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com";
+-grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
++grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com";
++grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
+ grant select on test.* to ssl_user5 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
+ flush privileges;
+
+
More information about the Pkg-mysql-commits
mailing list