Skip to content

Commit ccf6ec0

Browse files
author
Davi Arnaut
committed
Bug#53463: YaSSL patch appears to be reverted
The problem is that the fix Bug#29784 was mistakenly reverted when updating YaSSL to a newer version. The solution is to re-apply the fix and this time actually add a meaningful test case so that possible regressions are caught.
1 parent 2aee4d8 commit ccf6ec0

File tree

4 files changed

+148
-221
lines changed

4 files changed

+148
-221
lines changed

extra/yassl/taocrypt/src/coding.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ void Base64Decoder::Decode()
185185
{
186186
word32 bytes = coded_.size();
187187
word32 plainSz = bytes - ((bytes + (pemLineSz - 1)) / pemLineSz);
188-
plainSz = (plainSz * 3 + 3) / 4;
188+
plainSz = ((plainSz * 3) / 4) + 3;
189189
decoded_.New(plainSz);
190190

191191
word32 i = 0;

mysql-test/std_data/server8k-cert.pem

+49-123
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,51 @@
1-
Certificate:
2-
Data:
3-
Version: 1 (0x0)
4-
Serial Number: 1048579 (0x100003)
5-
Signature Algorithm: md5WithRSAEncryption
6-
Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
7-
Validity
8-
Not Before: Jan 29 12:01:53 2010 GMT
9-
Not After : Jan 28 12:01:53 2015 GMT
10-
Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=server
11-
Subject Public Key Info:
12-
Public Key Algorithm: rsaEncryption
13-
Public-Key: (8192 bit)
14-
Modulus:
15-
00:ca:aa:1d:c4:11:ec:91:f0:c7:ff:5f:90:92:fc:
16-
40:0c:5e:b7:3d:00:c5:20:d5:0f:89:31:07:d7:41:
17-
4c:8b:60:80:aa:38:14:de:93:6b:9c:74:88:41:68:
18-
b5:02:41:01:2d:86:a2:7a:95:53:5e:7b:67:2f:6c:
19-
1e:29:51:f9:44:fd:4a:80:be:b2:23:a1:3e:1b:38:
20-
cf:88:c4:71:ee:f8:6b:41:c5:2d:c0:c3:52:ac:59:
21-
7d:81:34:19:95:32:b8:9a:51:b6:41:36:d4:c4:a1:
22-
ae:84:e6:38:b9:e8:bf:96:be:19:7a:6b:77:4d:e0:
23-
de:e6:b3:b6:6b:bc:3d:dd:68:bc:4b:c4:eb:f5:36:
24-
93:ed:56:a2:15:50:8a:10:e8:d6:22:ed:6c:b1:cd:
25-
c3:18:c9:f6:0a:e1:de:61:65:62:d6:14:41:8c:b5:
26-
fb:14:68:c1:cf:12:5d:41:21:9d:57:11:43:7d:bb:
27-
43:2c:21:bb:c3:44:7d:a8:cf:1f:c3:71:75:b5:47:
28-
c2:7d:ce:38:3c:73:64:9e:15:d8:a7:27:cf:bd:40:
29-
c8:45:08:e3:c8:39:a8:0b:8e:c2:5b:7b:f1:47:91:
30-
12:91:cc:e1:00:e0:94:5b:bd:32:e4:0c:8d:c3:be:
31-
cc:76:32:52:12:69:b0:18:e0:b0:c2:76:34:5a:5f:
32-
79:d9:f6:81:9d:02:0a:61:69:1c:33:ce:49:fa:76:
33-
03:1e:07:5b:27:0b:bf:34:9e:34:96:b8:03:9b:50:
34-
3a:6a:2f:17:7a:14:cf:65:63:00:37:52:a8:73:ce:
35-
4b:14:40:f4:d2:9a:56:54:33:b8:77:2e:42:5b:8f:
36-
ec:1f:18:f4:ad:ab:8a:4a:8d:6d:70:25:f3:58:e7:
37-
cb:66:51:14:7d:16:f4:eb:6d:56:76:76:51:6e:d6:
38-
1d:da:d3:8d:c0:64:5a:67:4e:af:e2:bf:33:d1:b8:
39-
f6:2a:fc:57:87:a7:35:5e:80:c9:ac:fc:87:c9:71:
40-
17:91:bf:b7:4d:a3:ed:3c:1b:27:f4:66:a0:f9:46:
41-
03:27:cc:ea:80:f6:4b:40:f6:41:94:cd:bd:0a:b3:
42-
ef:26:be:de:6f:69:ae:0f:3f:1c:55:63:33:90:9b:
43-
ed:ca:5a:12:4d:de:4b:06:c2:a2:92:b0:42:3d:31:
44-
af:a4:15:12:15:f8:8a:e9:88:8d:cf:fd:85:66:50:
45-
6f:11:f1:9f:48:f3:b5:ba:9d:86:68:24:a2:5d:a8:
46-
7c:54:42:fa:d8:b5:c5:f2:dd:0e:0f:d0:68:e4:54:
47-
7e:c5:b9:a0:9b:65:2d:77:f4:8f:b9:30:0a:d5:86:
48-
5c:ed:c9:7c:d1:da:9d:0d:63:50:ee:e5:1e:92:63:
49-
cc:a2:0c:e8:4a:96:02:4d:dc:8f:df:7c:8f:08:18:
50-
a8:30:88:d7:af:89:ad:fc:57:4b:10:f9:f1:cb:48:
51-
e8:b6:3b:c8:3f:fc:c2:d3:d1:4a:10:3c:1b:6b:64:
52-
dc:e5:65:1e:5b:b2:da:b1:e2:24:97:8f:ee:c0:4b:
53-
8e:18:83:7c:17:a6:3c:45:b3:60:06:23:f2:2f:18:
54-
13:9e:17:8a:c6:72:79:8c:4d:04:f3:9d:ea:e0:25:
55-
d3:33:8c:1e:11:47:63:1f:a5:45:3f:bd:85:b3:fe:
56-
a5:68:ee:48:b7:0c:a4:c9:7f:72:d0:75:66:9b:6a:
57-
f9:a0:50:f3:a8:59:6d:a3:dd:38:4f:70:2b:bb:ff:
58-
92:2e:71:ab:ef:e9:00:ed:0d:d1:b4:6f:f0:8e:b2:
59-
09:fb:4d:61:0d:d9:10:d5:54:11:cd:03:94:84:fd:
60-
a8:68:e4:45:6e:1e:6a:1e:2f:85:a1:6d:f5:b6:c0:
61-
f1:ee:f7:36:e9:fe:c2:f7:ad:cc:13:46:5b:88:42:
62-
f0:2d:1f:b5:0e:7e:b5:2b:e4:8d:ab:b9:87:30:6a:
63-
3d:12:f4:ad:f3:1c:ac:cc:1a:48:29:2a:96:7b:80:
64-
00:0b:6e:59:87:bf:a3:ca:70:99:1b:1c:fd:72:3d:
65-
b2:d3:94:4a:cf:55:75:be:1f:40:ec:55:35:48:2d:
66-
55:f0:00:da:3c:b0:60:ba:11:32:66:54:0b:be:06:
67-
a4:5e:b7:c9:59:bb:4d:f4:92:06:26:48:6e:c2:12:
68-
d4:7c:f0:20:b8:a2:e1:bc:6a:b6:19:0e:37:47:55:
69-
c9:f2:49:0d:96:75:a2:84:64:bf:34:fc:be:b2:41:
70-
e4:f5:88:eb:e1:b7:26:a5:e5:41:c2:20:0c:f6:e2:
71-
a8:a5:e7:76:54:a5:fb:4b:80:05:7d:18:85:7a:ba:
72-
bc:b7:ad:c0:2f:60:85:cc:15:12:1c:2f:0a:9e:f3:
73-
7c:40:cf:f4:3e:23:d2:95:ca:d0:06:58:52:f0:84:
74-
d8:0f:3d:eb:ff:12:68:94:79:8f:be:40:29:5f:98:
75-
c8:90:6c:05:2f:99:8c:2a:63:78:1f:23:b1:29:c5:
76-
e7:49:c9:b2:92:0f:53:0b:d5:71:28:17:c2:19:bf:
77-
60:bf:7c:87:a8:ab:c1:f4:0a:c1:b8:d2:68:ee:c1:
78-
ce:a7:13:13:17:6d:24:5d:a2:37:a6:d7:7d:48:8b:
79-
2b:74:2d:40:2e:ca:19:d5:b6:3e:6c:42:71:fa:cf:
80-
85:87:f9:de:80:73:8b:89:f4:70:f0:d8:d7:ff:40:
81-
41:9c:c7:15:6d:9b:6e:4c:b5:52:02:99:79:32:73:
82-
ca:26:a0:ac:31:6f:c4:b0:f5:da:bb:c2:1f:e0:9f:
83-
44:ba:25:f7:9f
84-
Exponent: 65537 (0x10001)
85-
Signature Algorithm: md5WithRSAEncryption
86-
08:75:dc:b9:3f:aa:b6:7e:81:7a:39:d1:ee:ed:44:b6:ce:1b:
87-
37:c4:4c:19:d0:66:e6:eb:b5:4f:2a:ef:95:58:64:21:55:01:
88-
12:30:ac:8a:95:d1:06:de:29:46:a4:f1:7d:7f:b0:1e:d2:4e:
89-
fb:f6:fa:9a:74:be:85:62:db:0b:82:90:58:62:c5:5f:f1:80:
90-
02:9f:c5:fb:f3:6b:b0:b4:3b:04:b1:e5:53:c2:d0:00:a1:1a:
91-
9d:65:60:6f:73:98:67:e0:9c:c8:12:94:79:59:bf:43:7b:f5:
92-
77:c8:8f:df:b1:cd:11:1c:01:19:99:c2:22:42:f7:41:ae:b4:
93-
b8:1a
941
-----BEGIN CERTIFICATE-----
95-
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
124-
sc0RHAEZmcIiQvdBrrS4Gg==
2+
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
50+
/w8pMRr8gEuRqpL2WdJiKGG6lhMHLVFo
12551
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)