Skip to content

Commit 2a6d12a

Browse files
committed
Fix HTTPS test pattern: use try-catch instead of checking start() return value
The webserver::start(false) method returns false when started successfully in non-blocking mode (by design). The tests were incorrectly interpreting this as a failure. Fixed by catching the exception that's thrown when the server actually fails to start. Also regenerated test certificates with valid dates (the old ones expired in 2009). Changes: - Fix https_webserver, tls_session_getters, and all client_cert tests - Regenerate cert.pem, key.pem, client_cert.pem, client_key.pem
1 parent 5ff1183 commit 2a6d12a

File tree

5 files changed

+210
-201
lines changed

5 files changed

+210
-201
lines changed

test/cert.pem

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
-----BEGIN CERTIFICATE-----
2-
MIICpjCCAZCgAwIBAgIESEPtjjALBgkqhkiG9w0BAQUwADAeFw0wODA2MDIxMjU0
3-
MzhaFw0wOTA2MDIxMjU0NDZaMAAwggEfMAsGCSqGSIb3DQEBAQOCAQ4AMIIBCQKC
4-
AQC03TyUvK5HmUAirRp067taIEO4bibh5nqolUoUdo/LeblMQV+qnrv/RNAMTx5X
5-
fNLZ45/kbM9geF8qY0vsPyQvP4jumzK0LOJYuIwmHaUm9vbXnYieILiwCuTgjaud
6-
3VkZDoQ9fteIo+6we9UTpVqZpxpbLulBMh/VsvX0cPJ1VFC7rT59o9hAUlFf9jX/
7-
GmKdYI79MtgVx0OPBjmmSD6kicBBfmfgkO7bIGwlRtsIyMznxbHu6VuoX/eVxrTv
8-
rmCwgEXLWRZ6ru8MQl5YfqeGXXRVwMeXU961KefbuvmEPccgCxm8FZ1C1cnDHFXh
9-
siSgAzMBjC/b6KVhNQ4KnUdZAgMBAAGjLzAtMAwGA1UdEwEB/wQCMAAwHQYDVR0O
10-
BBYEFJcUvpjvE5fF/yzUshkWDpdYiQh/MAsGCSqGSIb3DQEBBQOCAQEARP7eKSB2
11-
RNd6XjEjK0SrxtoTnxS3nw9sfcS7/qD1+XHdObtDFqGNSjGYFB3Gpx8fpQhCXdoN
12-
8QUs3/5ZVa5yjZMQewWBgz8kNbnbH40F2y81MHITxxCe1Y+qqHWwVaYLsiOTqj2/
13-
0S3QjEJ9tvklmg7JX09HC4m5QRYfWBeQLD1u8ZjA1Sf1xJriomFVyRLI2VPO2bNe
14-
JDMXWuP+8kMC7gEvUnJ7A92Y2yrhu3QI3bjPk8uSpHea19Q77tul1UVBJ5g+zpH3
15-
OsF5p0MyaVf09GTzcLds5nE/osTdXGUyHJapWReVmPm3Zn6gqYlnzD99z+DPIgIV
16-
RhZvQx74NQnS6g==
2+
MIIDCTCCAfGgAwIBAgIUFSkcZr3SpJgnSFZ7usAd7EHeL6YwDQYJKoZIhvcNAQEL
3+
BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI2MDIwNDE5MzQyMFoXDTM2MDIw
4+
MjE5MzQyMFowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF
5+
AAOCAQ8AMIIBCgKCAQEAotKw+oEWvVB3Gr5cQDeREfkrYz3wQr/iBXQcxieHgm2O
6+
+zddEKgGIzZGLWAFt4dERt9EIPuhyIs5cX70d7SDPZEkq9ne1qg8wxo9BoLj6pGq
7+
iLzbmfhjOsApSBIMEo9j461YPgJvmoPcR9WtJQwxtPCaBaDe/GuuQlE4c9Ocfn5c
8+
Y/cQ7r0LpIXpz+2I3IXeMJNPClNTEcOn3jM/mdCkechsyGgwTSxup019HPQNCefY
9+
27SRyjgKn476WTWP3HSzuz+vdJeeOsr3imCWAbLU0Y3g7bW9HddCKBpu+9Er7A8T
10+
7Tizuqid4ZxWCBjoUKW3PGZXb5GN27hamdOuYXuu+wIDAQABo1MwUTAdBgNVHQ4E
11+
FgQURWjt3upGzg4lwPOvAC5T6IIFjxAwHwYDVR0jBBgwFoAURWjt3upGzg4lwPOv
12+
AC5T6IIFjxAwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEADn3r
13+
keOKT0INpytFjwedeC9TNN0W0PFGoPCl6/aPQpRD5adY0xaOMaFMrfuew0I7dI0m
14+
Ro9HICBQ4DLHB/ZwjvuioJSQlwYJ6SnatKlZib0qAHMvnSLr/rWUKu5KzLIhvXHs
15+
6zG7/ZqRt6XlME4olJ/QzyhyPtXK2AumHdB/GJk9d//n4Qj+4cXSTA1KHxZPU67x
16+
0Ow0zI0CRgDN4sYlgOcLwMI0I59MwXlzIeMR6E2YSxow7P+89kFMRmaO5N1aCSXl
17+
PYOlkXbh4iZ2cBMj4dfQBA+cgkm+KjVr/jwpBlAZJswtkyDD+zJf+ua+z1eOczBv
18+
HsZIDEqIkkqH/ZuV7w==
1719
-----END CERTIFICATE-----

test/client_cert.pem

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIDMzCCAhugAwIBAgIUVIu0IAY17b7zVLt1hypR3Ag3IuowDQYJKoZIhvcNAQEL
2+
MIIDMzCCAhugAwIBAgIUdGMRlO8Hu2eYWdVXgkHQ57NXeJ8wDQYJKoZIhvcNAQEL
33
BQAwKTEUMBIGA1UEAwwLVGVzdCBDbGllbnQxETAPBgNVBAoMCFRlc3QgT3JnMB4X
4-
DTI2MDIwNDE1NTY0MloXDTI3MDIwNDE1NTY0MlowKTEUMBIGA1UEAwwLVGVzdCBD
4+
DTI2MDIwNDE5MjEzOVoXDTM2MDIwMjE5MjEzOVowKTEUMBIGA1UEAwwLVGVzdCBD
55
bGllbnQxETAPBgNVBAoMCFRlc3QgT3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
6-
MIIBCgKCAQEAqAEN3dqOxRR+ViPZ/J/PMDS0BcCfEqHtQwaYs6/76sVimFzI3F5j
7-
LbdsSDNspB1MS3bCtJ4P8Lm1ET60MgZZeuRECEUYj45SAQlQRr92N+lZVd8nxbSe
8-
UN9vnx3fyG0iC7DLUBdVwDDiYUmZc4DlbyV3NcILI0j3cJY4Dnwj7ej6uvgPoVAt
9-
y3kvQ93EnOmhYaW+5X0A/LnSrHLyCdUHjv2GG1ZkXOOiwVT8D6ZDmAZaE0iUCjIx
10-
Y2qrSLk/qwKRStTaa8xfdta0zi+PLUkt5U2tGW6BboRO5IQ/B9JYZxQW2vP6eYym
11-
tFm/Bk/UsFI8QhXovu4bS9LbACeUHg/gUQIDAQABo1MwUTAdBgNVHQ4EFgQUftB/
12-
qPGr3h/ddP9RTh04BgK7LwMwHwYDVR0jBBgwFoAUftB/qPGr3h/ddP9RTh04BgK7
13-
LwMwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEARWW2yEKK1BMk
14-
948egHJ5Ab0YvKW0N9LuFPcTrP8Nnd7C4yF1xDFibtiy5vfRPzTbzrD1LRa3HZKX
15-
2wMX/NGcN+OOLlyXpPwPBZiQwNSRQ2XTYuX5sLArO8ePGj7Py1QqpFhV8hh5WDn2
16-
zmRZk9O8E/sxn+xXLFCRV70PQPZbcRHtsWLfpqOoYXnZFdhL7QWPsGLnMkJoR7kd
17-
Ao3U4vPHZuxM/zHViD+MF9713r/Ej8U3xZoeaLd0nvaK5fTYoKsomS6HW2fIeR05
18-
uD0wvf9Mnor60dGKTFCQyFwG1oGGhnMMicx3048erda7PgBsF7Hmf4MjHMRvOq3I
19-
dJEmHk3Iyg==
6+
MIIBCgKCAQEAuZ5JmKPRbM9UfeQ9cJMne6Lt084gQsw+yI2hHwvkeYm+8c/HdQ3E
7+
YKsCojON6X6gMInvblvvsJaRNtBOAUaHoOshDH9ZeZD3hsd3fmyxIqQKCOr1DoxZ
8+
+72FmHNHcGfcti1KVwrxMHhL5TUhDJfoVPcH0OO0Yo7JI0PzdZTkoUVZN1mqQ3M2
9+
zS5KqyyQ/+M02VmUdI7CQezextCzQj2BLgyy2/WJOuEUUtDn35VXTt0bvs95ICnm
10+
tWhKDHzIceJGCLUFbtVPmsj/zutYv6RUkg02nx3a+l3leD5kboLD41O8G1SwyAw2
11+
g7WfifFO0B0QDoAQ5sqgMrnHClAmc46FAwIDAQABo1MwUTAdBgNVHQ4EFgQUY6/3
12+
etxsZGycCVNS3/yVUP2mgOQwHwYDVR0jBBgwFoAUY6/3etxsZGycCVNS3/yVUP2m
13+
gOQwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAQxOYgHw3T+Ko
14+
BXmegtQGWSBUuu2ootg26zIDt4x2dwT3fPuitFJZnywG/1EHs9qVPPlPbtqMqpmT
15+
kxxcpanZPpTLwj+QbrrkqKfIq1qlXivrjsP+idALO4zouSJBTqpC+wksL2AxdegX
16+
FF3zCMtw+LVxgrwU4Ml/ydNu1Z1Zq1KDZOXEOug9C/CABEgngQfr3IO9M7wQIYvf
17+
pgieUOQxPM6O5kS0yBp/WGDwYjz0Ijbfp/yvel9eaQgvMT3rmKI8/fOCM5ax+IEk
18+
0eJaz4dS9GkSQT+mAkAT/PKurkDpSmPz/If/CyLScSr6f/s/+fC0YLfZ95/FjNqx
19+
O/ONgBdcbw==
2020
-----END CERTIFICATE-----

test/client_key.pem

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
-----BEGIN PRIVATE KEY-----
2-
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCoAQ3d2o7FFH5W
3-
I9n8n88wNLQFwJ8Soe1DBpizr/vqxWKYXMjcXmMtt2xIM2ykHUxLdsK0ng/wubUR
4-
PrQyBll65EQIRRiPjlIBCVBGv3Y36VlV3yfFtJ5Q32+fHd/IbSILsMtQF1XAMOJh
5-
SZlzgOVvJXc1wgsjSPdwljgOfCPt6Pq6+A+hUC3LeS9D3cSc6aFhpb7lfQD8udKs
6-
cvIJ1QeO/YYbVmRc46LBVPwPpkOYBloTSJQKMjFjaqtIuT+rApFK1NprzF921rTO
7-
L48tSS3lTa0ZboFuhE7khD8H0lhnFBba8/p5jKa0Wb8GT9SwUjxCFei+7htL0tsA
8-
J5QeD+BRAgMBAAECggEAG3HEo/Zf4TZGUb2x4/CakMY4luykRQ/E/vB/wca1++A6
9-
XtJgEOOtsZpSQCnVDarS5kxPD+ChkPz9OlpzEZhI8L2DluhBVAjMlj/BEzWT/caK
10-
90So2MVMdsCb7t3F9etMpvqT/pA5TAKQUJKMfzpSAInvGI3gx5GpXi/OliCAYWIs
11-
esP/LkMlemZQGMmXcbULFSW/Yi1H/ekHsm31imjVUgtqG9R1oRYXRSCOreT55QjV
12-
wpp8TgU5KI8WoiNKZRSw4lkF/XHPq14F8PP+0+N6umV0aDrioO2FrQnZl1b27Xec
13-
KNejXQL7I9JK+5bbW43onV0ebKINOf7bhm3sLNf5IwKBgQDQZwOQERaD9KiGS2ib
14-
M+cFDdnctx53ep35gg9J7u9dyYG/WQhnrUtrYaOo7ptpMJ5WlxVcNTuGu0bpu8nI
15-
SAL7GG0O2vESROqs+Wlab5orxR5u3MUNk5FGlgIxgUsILiXD4xzTCe83oe4ZwlJX
16-
yoDdFGNu6cMUP6wLa0McAz3ThwKBgQDOYALpISlFFX94Ye4LWXKYtD0F+bsJldoN
17-
I8QPNKVGKgI9LqtKGLkpq77dGHtquMUg7jYnTOoXroOr1z+VWQhtVYG8XtM7gPF2
18-
lsqWUkle5mmLtkjJcgr9b+ee60kHFKGfaJlpbRR8Lz6IK9a2J1OxdjqvUn4S70eT
19-
+0gg801TZwKBgQCJLbXfqA/dDje8JnkV6GVCI2rr6THJzdGcwmrT7M5tOs4IKU/q
20-
Bt0lMuEqut1bsWAYeVzbFEM5nZ7BDhZ1mkk0BVEMPTwAHZMoBwi9OccO1rMAoJup
21-
IyC2iNmqwoOkP9QmDCIWHGz1fsae+BWBqk+Gtvv4rzD07DCQV6uWDeAtkwKBgHwM
22-
SBObpDPrXSieLLjTtkdFp5yM5Lk5Qs09H19IdMO9AoWGJN2wCLSckGhTi/O1RoCp
23-
zxFGcTt04Z6MDqMV1jPp/sacdPnCYuG2d+VtZr7NXsnk8tFrZGG8PwxOPyIra47n
24-
D7fIIlUXDM5LE4+AChWUjGfP/Qoim/K+SzfLJ0KnAoGBAIWCVT72zBoN37zOmLEp
25-
9nPCEyx6MVMOLddcRLQC6rz1I37CY+q7rbV4/5k6wGWM+yFLL3t4YBLkYBqWlUJF
26-
O24Vv9bYn+ZoIuaTVw0DS/gWl7UsWrffC66qbxYBexNRFSfpCY2IRrIObM9bsn2t
27-
f9k/lqYi0OhZKo1M2UU4GIm2
2+
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC5nkmYo9Fsz1R9
3+
5D1wkyd7ou3TziBCzD7IjaEfC+R5ib7xz8d1DcRgqwKiM43pfqAwie9uW++wlpE2
4+
0E4BRoeg6yEMf1l5kPeGx3d+bLEipAoI6vUOjFn7vYWYc0dwZ9y2LUpXCvEweEvl
5+
NSEMl+hU9wfQ47RijskjQ/N1lOShRVk3WapDczbNLkqrLJD/4zTZWZR0jsJB7N7G
6+
0LNCPYEuDLLb9Yk64RRS0OfflVdO3Ru+z3kgKea1aEoMfMhx4kYItQVu1U+ayP/O
7+
61i/pFSSDTafHdr6XeV4PmRugsPjU7wbVLDIDDaDtZ+J8U7QHRAOgBDmyqAyuccK
8+
UCZzjoUDAgMBAAECggEABpAV/7txuPxUUJvZykRXBd7ltB1FHxIpTsj8fzmvQIGC
9+
H/rzN+xz2uEhAjV6w9yHcxU6wyGlW2PaIDXZlDT3WwAFQUkIE61wUF0hbfW6MO8w
10+
2vjdD5XJzAX668AjsKc+HVjY7d6ZVtfiAxQk+3+Be5jnt1czC7W1tIqqAyhvtFNN
11+
Ga7JLHbybxSi5batdsZXdlchCOtD0ZQYd0fS/WpB+RSyVj01j0trkg+uL/ok0XFj
12+
Y9SYIWKIdPn2gPs9oUXhxjoTUQYi6iqZD8lp/4qDbCw4nidz/rVCu1UuCtEV44it
13+
00AqSO3NadRLpTmxi7TKDj+IekzXKJUEKzlNtscXIQKBgQDn4C5q8k2r2wwV+uJ9
14+
hU0d0YDCAzyUlOPjXBv6/dj62hRKvmo0fbisTXKyrSMLoXNOQdkYAASQoRYUqoL9
15+
feKpDU+luCfGnr9hg/odM4ESP16UZbJirajHll/RQp4yYAi3vhvEvzgQKiUInGwI
16+
G4BC6/Ah+9YTSyNMDnN2Uf45IwKBgQDM7hQUswlrH+a7utmuHnMBPvwUMPOsbpF5
17+
lHjYwjOmWSAwQa846n5bJvHMuJZohX0ntR/skl0lYAuh72sFsKQvnQtiIhZ6rkbf
18+
YMh9RPgVfAXFJlFAV53iw+u3pghSnkeIugbCoYn2Lz8To4RYD9mlj4pr0K5hxVaT
19+
tGvp2QlyoQKBgGfW4FKqghgVN3tcaDN4D8nruXKpCmcrqkZ2SF2FcrccFHxIe71Y
20+
E+ytnlDf8lLSEZYZLQRvdZvjV8UXeyPUTT4RpPp81us+ykv8U3TiTMoEMPHZ/SHt
21+
zSjccbp/z+KVWTIX482fKJcsmHsbudGDp1PQ3zAI3Jy1SHBWBGUXYPbrAoGBALtD
22+
R0hO/mlMonyj1uzcWD0oQBN3VAQamYbfHLr+Y1I8GUTfkO3SohpLcSOg/ZiPevmA
23+
8qYsbT+ND7QvYr21V6NGv7Mx8Ra0EIFpIGwQTR7c0S0BwbepGNayL8EG0I4mormX
24+
PDw4fyheriYVAwexnDJFA7lX3THssRuSABaVxKNhAoGAY0ejNhVt4pXTeXWH3l/Z
25+
TFPg+EKFCvn9dM8YeN+X1hMurRUb7cg9blx71mQmcYRZtnqQ1EmLSe1iMT1dXTi9
26+
xLdK5M7LR+rMF0FGHmj8po3tLzkQwYqDjVoEa8cMJun0sZdjP4npP7XA/9T6LMdj
27+
7kCN3QfCVwW6uHLA27zbDKc=
2828
-----END PRIVATE KEY-----

0 commit comments

Comments
 (0)