Merge pull request #237 from embhorn/mosquitto_update

Fix mosquitto patch for v2.0.18 expired certs

Author: rizlik

mosquitto/2.0.18.patch

@@ -11,7 +11,6 @@ Changes:
 - `net_mosq_ocsp.c`: safestack.h not implemented in wolfSSL
 - Makefiles to use either OpenSSL or wolfSSL
 - Test scripts for non-passing tests (TODO fix tests)
-- `server.crt` created chain with CA since wolfSSL only sends a single cert
 - Tests to not specify invalid CA dir
 
 ---
@@ -34,6 +33,10 @@ git clone https://github.com/eclipse/mosquitto.git
 cd mosquitto
 git checkout v2.0.18
 patch -p1 < <path/to/patch/file>
+cd test/ssl
+./gen.sh
+cat all-ca.crt >> server.crt
+cd ../..
 make WITH_TLS=wolfssl
 make WITH_TLS=wolfssl ptest
 ```
@@ -473,116 +476,6 @@ index 6f06c3f7..c3743fd6 100755
      (1, ['./08-ssl-connect-cert-auth.py', 'cpp/08-ssl-connect-cert-auth.test']),
      (1, ['./08-ssl-connect-no-auth.py', 'cpp/08-ssl-connect-no-auth.test']),
 
-diff --git a/test/ssl/server.crt b/test/ssl/server.crt
-index d8db1d0d..46ba89ce 100644
---- a/test/ssl/server.crt
-+++ b/test/ssl/server.crt
-@@ -80,3 +80,105 @@ JJcw9qtnDu6NahG6S7EfYb3ZoMc4sVpM5lE2A1rWVoWzLzIPjZbaWkKFELq7z3XJ
- /3OVvDTBmXbKsbVjiCyYUbS1YeoOIGoizwllJrjcctOh+nhctQnZtubXBRs1cuDY
- 7qM5lV4kVYwefocXQLNPTJDJK/JD
- -----END CERTIFICATE-----
-+Certificate:
-+    Data:
-+        Version: 3 (0x2)
-+        Serial Number: 1 (0x1)
-+        Signature Algorithm: sha256WithRSAEncryption
-+        Issuer: C=GB, ST=Derbyshire, L=Derby, O=Mosquitto Project, OU=Testing, CN=Root CA
-+        Validity
-+            Not Before: Feb 25 14:54:18 2020 GMT
-+            Not After : Feb 23 14:54:18 2025 GMT
-+        Subject: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Signing CA
-+        Subject Public Key Info:
-+            Public Key Algorithm: rsaEncryption
-+                RSA Public-Key: (2048 bit)
-+                Modulus:
-+                    00:c1:a1:1a:6e:76:1f:98:b7:1c:7e:d6:67:d5:dc:
-+                    92:34:ef:48:22:62:94:56:cb:21:29:c1:88:7c:7a:
-+                    62:eb:6d:b9:af:8b:80:75:f4:8e:32:e2:20:e2:fa:
-+                    3a:49:c8:20:74:53:83:0f:c1:48:e2:13:3e:48:27:
-+                    f2:e5:7d:55:c5:87:8c:41:9e:e2:90:58:8c:09:97:
-+                    1e:bc:5a:ce:10:71:b2:66:02:02:9b:0c:d0:24:47:
-+                    7a:3a:4d:3a:2e:c0:f0:65:6b:6a:cf:13:13:8a:f0:
-+                    6d:a0:a5:80:5f:6b:58:77:ae:91:6e:ba:ab:c5:c0:
-+                    24:f7:22:27:a4:bf:47:52:2d:a0:fc:56:b0:19:16:
-+                    84:e9:53:ac:1d:7f:29:af:c2:86:44:f5:9b:04:e4:
-+                    bf:8f:e1:b8:61:a0:63:55:0a:7a:93:2a:d8:4a:20:
-+                    b8:6b:b6:e9:20:c6:2c:c2:93:c2:dc:7a:69:90:8e:
-+                    ea:00:5b:0c:66:8a:90:74:b4:d9:01:98:9d:fe:5b:
-+                    66:e0:39:19:22:50:0d:76:3d:1c:04:fb:93:4d:6e:
-+                    45:da:e8:cc:27:35:2a:a6:35:a8:87:e1:99:32:42:
-+                    e8:71:eb:7c:f9:69:70:c7:cf:c5:cc:61:c5:ae:47:
-+                    dc:20:86:2b:2b:fe:1c:dd:2c:e9:b0:38:b6:72:8e:
-+                    09:e9
-+                Exponent: 65537 (0x10001)
-+        X509v3 extensions:
-+            X509v3 Subject Key Identifier: 
-+                AA:5A:5B:1C:91:32:9B:3F:9B:C3:42:6C:D2:68:F6:A7:E0:CF:BE:E0
-+            X509v3 Authority Key Identifier: 
-+                keyid:7A:89:5D:1E:C9:B1:72:2F:38:DB:DE:E7:D3:49:80:2C:01:FA:3B:74
-+
-+            X509v3 Basic Constraints: 
-+                CA:TRUE
-+    Signature Algorithm: sha256WithRSAEncryption
-+         d3:8d:e3:33:87:f3:1e:4f:ff:da:1d:f8:61:3f:4a:ae:21:49:
-+         cd:ee:b1:e0:62:ab:44:70:a8:29:92:83:8d:33:45:4c:ac:b0:
-+         66:a0:e8:32:23:76:ef:aa:89:7d:bc:e1:04:17:a5:d7:39:59:
-+         99:ab:d9:bf:0c:fd:c5:b6:ad:6f:45:39:c9:27:f1:3e:c0:af:
-+         c3:8e:b1:1f:8f:fc:34:66:31:f4:f1:11:a0:27:99:a2:65:e2:
-+         aa:20:a7:98:b6:0e:ff:71:5e:10:e7:ab:1e:33:e7:fb:c8:59:
-+         d7:89:7a:3b:d9:a9:9f:48:2f:2e:ff:02:61:cd:86:47:60:61:
-+         8e:81:71:68:f0:cd:63:72:b8:d2:7d:22:9d:6b:07:49:3a:0a:
-+         f7:8b:94:b3:98:90:3c:9f:e5:78:1b:84:a9:2e:fb:85:64:59:
-+         ce:6f:33:05:18:bc:21:df:f5:7c:10:79:d6:58:34:61:0e:1f:
-+         d5:af:b6:a0:8f:86:ce:56:d1:67:4f:b8:7e:50:2d:ba:77:37:
-+         50:0f:91:06:dc:a8:7f:3c:8b:2b:8b:47:df:e3:7e:2f:79:81:
-+         22:70:eb:f9:14:f3:66:73:17:33:e4:26:7e:47:df:80:89:de:
-+         a5:e8:5a:a9:c0:4b:3e:1b:9b:11:4b:3b:b4:8b:6a:9d:6c:ce:
-+         39:f5:04:c9
-+-----BEGIN CERTIFICATE-----
-+MIIDojCCAoqgAwIBAgIBATANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJHQjET
-+MBEGA1UECAwKRGVyYnlzaGlyZTEOMAwGA1UEBwwFRGVyYnkxGjAYBgNVBAoMEU1v
-+c3F1aXR0byBQcm9qZWN0MRAwDgYDVQQLDAdUZXN0aW5nMRAwDgYDVQQDDAdSb290
-+IENBMB4XDTIwMDIyNTE0NTQxOFoXDTI1MDIyMzE0NTQxOFowZTELMAkGA1UEBhMC
-+R0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxGjAYBgNVBAoMEU1vc3F1aXR0byBQcm9q
-+ZWN0MRAwDgYDVQQLDAdUZXN0aW5nMRMwEQYDVQQDDApTaWduaW5nIENBMIIBIjAN
-+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwaEabnYfmLccftZn1dySNO9IImKU
-+VsshKcGIfHpi6225r4uAdfSOMuIg4vo6ScggdFODD8FI4hM+SCfy5X1VxYeMQZ7i
-+kFiMCZcevFrOEHGyZgICmwzQJEd6Ok06LsDwZWtqzxMTivBtoKWAX2tYd66Rbrqr
-+xcAk9yInpL9HUi2g/FawGRaE6VOsHX8pr8KGRPWbBOS/j+G4YaBjVQp6kyrYSiC4
-+a7bpIMYswpPC3HppkI7qAFsMZoqQdLTZAZid/ltm4DkZIlANdj0cBPuTTW5F2ujM
-+JzUqpjWoh+GZMkLocet8+Wlwx8/FzGHFrkfcIIYrK/4c3SzpsDi2co4J6QIDAQAB
-+o1AwTjAdBgNVHQ4EFgQUqlpbHJEymz+bw0Js0mj2p+DPvuAwHwYDVR0jBBgwFoAU
-+eoldHsmxci84297n00mALAH6O3QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsF
-+AAOCAQEA043jM4fzHk//2h34YT9KriFJze6x4GKrRHCoKZKDjTNFTKywZqDoMiN2
-+76qJfbzhBBel1zlZmavZvwz9xbatb0U5ySfxPsCvw46xH4/8NGYx9PERoCeZomXi
-+qiCnmLYO/3FeEOerHjPn+8hZ14l6O9mpn0gvLv8CYc2GR2BhjoFxaPDNY3K40n0i
-+nWsHSToK94uUs5iQPJ/leBuEqS77hWRZzm8zBRi8Id/1fBB51lg0YQ4f1a+2oI+G
-+zlbRZ0+4flAtunc3UA+RBtyofzyLK4tH3+N+L3mBInDr+RTzZnMXM+QmfkffgIne
-+pehaqcBLPhubEUs7tItqnWzOOfUEyQ==
-+-----END CERTIFICATE-----
-+-----BEGIN CERTIFICATE-----
-+MIIDwjCCAqqgAwIBAgIURMxcSM9J+pY3g2SE3qoM34dHwPkwDQYJKoZIhvcNAQEL
-+BQAwcjELMAkGA1UEBhMCR0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxDjAMBgNVBAcM
-+BURlcmJ5MRowGAYDVQQKDBFNb3NxdWl0dG8gUHJvamVjdDEQMA4GA1UECwwHVGVz
-+dGluZzEQMA4GA1UEAwwHUm9vdCBDQTAeFw0yMDAyMjUxNDU0MThaFw0zMDAyMjIx
-+NDU0MThaMHIxCzAJBgNVBAYTAkdCMRMwEQYDVQQIDApEZXJieXNoaXJlMQ4wDAYD
-+VQQHDAVEZXJieTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3QxEDAOBgNVBAsM
-+B1Rlc3RpbmcxEDAOBgNVBAMMB1Jvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-+DwAwggEKAoIBAQDdpftss7fN4lzDhppzwj2WfRehR95WYmiWnXoEsKyEfuh1hINs
-+vvI3tz1FWEb/usORr6XGZhgYwjIpSORMoBxuOZh8RDNPmO9KpLYXN1i4g+CfkGAK
-+QoBUr7FGGlKDaK4fRg6xx8BKQ1Lxqrx+iAOpIT7tU9YYPYrwiYbdhaYwfMTKXyCl
-+V+JypRRKWgzUkua4YRb2TnEH33NaXS0Tw+A0tRxSN26vwRheCrVfo+6CUB0kEaON
-++syuiHP1mGrHj3bMh/MTd3H5u2lu+1GW/Re3HdGFLuHhEq6EkF0fnPCaPS+iJKwU
-+1LgQZwGc+UHglTmmqUS6xhpm++/950fYoaiHAgMBAAGjUDBOMB0GA1UdDgQWBBR6
-+iV0eybFyLzjb3ufTSYAsAfo7dDAfBgNVHSMEGDAWgBR6iV0eybFyLzjb3ufTSYAs
-+Afo7dDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB7/Zn0VBciDCXo
-+JA4ZX5boZyQMx7Lm62O+ixChT2hW0VNlouacgfSq455sNxFJKam0ZQKzusMzssNQ
-+ticyZUwIosGx36f8qBaGksx0EbgAh9QdOulsYDLW5UsB4Rh94C36NoTd9+BJF6D4
-+89IpuxQehDKKuRG0NUChEkLvJ2AAPi/+iDHZQMB/sAzaT4gJ4eMeY4p4XBb/a9P2
-+w05RCpVNyLg32S7ynLNUrz+/lZUfZ8sYhpdECbFDpb0e1iVc1vst8Pur+cSGFO3f
-+HabwuWTdF9Xx8MaH/n32Pv8BxZ/hBdjsXa/CiMyT4POs6XGTpZ2iLcmHo8WS4Uls
-+5gKvsjuj
-+-----END CERTIFICATE-----
 -- 
 2.34.1