diff --git a/certs/crl/crl.pem b/certs/crl/crl.pem
index 28311c760..caef4cd7a 100644
--- a/certs/crl/crl.pem
+++ b/certs/crl/crl.pem
@@ -2,38 +2,40 @@ Certificate Revocation List (CRL):
         Version 2 (0x1)
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: /C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
-        Last Update: May  7 18:21:01 2015 GMT
-        Next Update: Jan 31 18:21:01 2018 GMT
+        Last Update: Jul 22 16:17:45 2015 GMT
+        Next Update: Apr 17 16:17:45 2018 GMT
         CRL extensions:
             X509v3 CRL Number: 
-                1
-No Revoked Certificates.
+                6
+Revoked Certificates:
+    Serial Number: 02
+        Revocation Date: Jul 22 16:17:45 2015 GMT
     Signature Algorithm: sha256WithRSAEncryption
-         96:e2:b9:11:e0:e5:25:be:ab:69:e5:fa:8a:5c:7f:fc:6f:1d:
-         8f:4a:54:70:f8:2e:87:fa:b0:f6:fd:3f:8f:9c:75:8a:eb:62:
-         cc:dd:2c:0a:8c:31:9e:30:3f:22:9b:91:50:6b:43:fd:32:8a:
-         79:ea:0b:6b:68:6c:82:9c:79:da:20:95:83:25:5e:09:fc:57:
-         2d:19:f9:bc:5a:67:95:98:65:dc:2d:91:13:2a:81:c2:6d:ff:
-         12:48:6f:a4:ce:8a:b2:d3:19:b8:c2:86:e0:ba:91:3f:bb:ec:
-         c6:79:83:50:95:19:95:28:eb:ef:ff:bb:16:8f:3c:7d:4c:d1:
-         3e:c3:82:22:8f:c5:e8:0e:b3:64:8f:5d:53:32:d5:98:64:9c:
-         36:c4:6a:cf:68:21:4f:a8:4e:90:37:76:dc:05:70:66:2d:bc:
-         a0:d8:19:5c:96:90:d6:b9:09:56:46:07:be:3c:ae:08:bb:26:
-         26:21:2c:d1:48:01:88:28:bc:21:a4:97:b7:3b:f0:7e:67:73:
-         84:cf:21:43:e7:dd:53:9d:6a:59:c3:e5:98:c9:69:71:c3:e3:
-         70:28:ba:f9:69:0a:af:78:e5:83:02:13:7e:08:70:8c:f3:8b:
-         5d:96:b0:78:b9:d9:99:c5:1e:b7:45:dc:28:32:1a:d0:50:4b:
-         f4:41:92:19
+         7c:5c:fe:a6:cb:e9:78:ed:10:48:59:4a:e6:d9:96:68:ea:30:
+         43:ba:b8:99:d1:8b:96:5e:d9:52:4c:58:3f:c1:d4:98:f1:20:
+         46:02:0f:a3:25:7b:9c:06:c7:3d:5a:f1:00:bf:d2:d6:70:5c:
+         45:ee:dc:fa:22:58:36:f2:14:06:c4:18:c9:b4:f8:ff:54:56:
+         cf:ff:71:00:cd:a1:9a:3c:52:dc:6f:a6:c1:fa:67:2f:a9:4d:
+         7e:f7:da:c0:4c:29:34:53:8d:27:31:02:ad:05:35:3e:7d:8d:
+         ea:f7:2a:f8:57:cb:7f:da:27:54:3d:0b:c4:69:a7:40:8f:b3:
+         cb:fe:dc:76:90:57:aa:62:23:22:61:8a:d5:aa:f4:43:aa:30:
+         bd:9d:97:df:84:58:7c:f1:d6:78:9d:a9:4f:69:7a:a2:b5:0f:
+         a2:61:d0:53:93:ea:d1:0f:35:ea:d4:49:09:a1:53:7d:64:ed:
+         2a:c0:f3:78:d6:ad:07:38:01:56:d5:bb:66:cc:02:e7:a4:f6:
+         9f:65:64:98:f8:db:0d:ed:fc:29:2e:f6:e5:e9:d8:d7:68:97:
+         84:05:99:8e:e2:ad:1c:e6:ba:0d:05:46:5c:9a:6f:60:69:b3:
+         03:d1:af:b9:3c:52:de:08:48:20:1a:3c:86:49:a8:06:49:b8:
+         03:da:ba:89
 -----BEGIN X509 CRL-----
-MIIB7jCB1wIBATANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCVVMxEDAOBgNV
+MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCVVMxEDAOBgNV
 BAgMB01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4xETAPBgNVBAoMCFNhd3Rvb3Ro
 MRMwEQYDVQQLDApDb25zdWx0aW5nMRgwFgYDVQQDDA93d3cud29sZnNzbC5jb20x
-HzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20XDTE1MDUwNzE4MjEwMVoX
-DTE4MDEzMTE4MjEwMVqgDjAMMAoGA1UdFAQDAgEBMA0GCSqGSIb3DQEBCwUAA4IB
-AQCW4rkR4OUlvqtp5fqKXH/8bx2PSlRw+C6H+rD2/T+PnHWK62LM3SwKjDGeMD8i
-m5FQa0P9Mop56gtraGyCnHnaIJWDJV4J/FctGfm8WmeVmGXcLZETKoHCbf8SSG+k
-zoqy0xm4wobgupE/u+zGeYNQlRmVKOvv/7sWjzx9TNE+w4Iij8XoDrNkj11TMtWY
-ZJw2xGrPaCFPqE6QN3bcBXBmLbyg2BlclpDWuQlWRge+PK4IuyYmISzRSAGIKLwh
-pJe3O/B+Z3OEzyFD591TnWpZw+WYyWlxw+NwKLr5aQqveOWDAhN+CHCM84tdlrB4
-udmZxR63RdwoMhrQUEv0QZIZ
+HzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20XDTE1MDcyMjE2MTc0NVoX
+DTE4MDQxNzE2MTc0NVowFDASAgECFw0xNTA3MjIxNjE3NDVaoA4wDDAKBgNVHRQE
+AwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAfFz+psvpeO0QSFlK5tmWaOowQ7q4mdGL
+ll7ZUkxYP8HUmPEgRgIPoyV7nAbHPVrxAL/S1nBcRe7c+iJYNvIUBsQYybT4/1RW
+z/9xAM2hmjxS3G+mwfpnL6lNfvfawEwpNFONJzECrQU1Pn2N6vcq+FfLf9onVD0L
+xGmnQI+zy/7cdpBXqmIjImGK1ar0Q6owvZ2X34RYfPHWeJ2pT2l6orUPomHQU5Pq
+0Q816tRJCaFTfWTtKsDzeNatBzgBVtW7ZswC56T2n2VkmPjbDe38KS725enY12iX
+hAWZjuKtHOa6DQVGXJpvYGmzA9GvuTxS3ghIIBo8hkmoBkm4A9q6iQ==
 -----END X509 CRL-----
diff --git a/certs/crl/crl.revoked b/certs/crl/crl.revoked
index 60152d880..6bef57e6b 100644
--- a/certs/crl/crl.revoked
+++ b/certs/crl/crl.revoked
@@ -2,40 +2,43 @@ Certificate Revocation List (CRL):
         Version 2 (0x1)
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: /C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
-        Last Update: May  7 18:21:01 2015 GMT
-        Next Update: Jan 31 18:21:01 2018 GMT
+        Last Update: Jul 22 16:17:45 2015 GMT
+        Next Update: Apr 17 16:17:45 2018 GMT
         CRL extensions:
             X509v3 CRL Number: 
-                2
+                7
 Revoked Certificates:
     Serial Number: 01
-        Revocation Date: May  7 18:21:01 2015 GMT
+        Revocation Date: Jul 22 16:17:45 2015 GMT
+    Serial Number: 02
+        Revocation Date: Jul 22 16:17:45 2015 GMT
     Signature Algorithm: sha256WithRSAEncryption
-         b7:34:2b:1c:09:6b:a2:9c:12:4f:fd:ef:69:4c:a4:1d:f2:39:
-         52:29:98:78:b2:86:ea:54:9b:29:e5:c2:88:0e:2f:f9:d2:5b:
-         9d:49:37:68:26:6c:45:61:d4:9d:05:ef:2d:ca:78:0a:d0:28:
-         c1:25:f2:f7:6a:ad:df:1d:eb:8a:66:64:4d:0c:02:91:fb:ff:
-         70:b4:36:b6:e4:79:17:d5:18:6a:72:17:e1:8b:31:49:04:98:
-         96:88:42:ea:8c:fe:91:40:5a:c5:ad:3b:da:9a:47:43:d6:e9:
-         f6:59:75:49:91:a9:e4:8b:c8:03:60:6b:36:69:87:71:f1:5b:
-         92:00:51:bb:fe:d5:4f:0d:0e:f2:56:38:e3:b6:cb:76:11:7b:
-         17:ad:a5:da:37:87:f2:49:af:73:42:56:ed:6c:a1:8d:46:5c:
-         dd:00:a7:8f:1f:5a:dd:d7:87:89:43:30:32:fe:e2:d4:b1:29:
-         12:11:ef:22:0d:8f:7f:c5:33:3b:a9:a7:52:0c:25:b8:0c:e6:
-         8a:8b:68:8f:55:84:65:04:c7:44:48:36:02:4d:4e:43:09:1d:
-         1f:3b:f9:4a:0e:ff:59:42:ca:be:0e:a7:79:89:19:31:73:5a:
-         45:6c:70:56:4d:1b:8a:59:c4:6d:ca:bc:f7:41:c4:f6:f0:fd:
-         9c:7e:f1:7e
+         7f:61:91:8a:8c:c1:23:f1:d4:98:d9:67:67:1e:d2:54:2a:ce:
+         b8:41:d1:f7:c4:88:84:01:a5:52:d6:42:d1:af:e6:c8:fb:13:
+         51:9e:2e:18:c1:e7:9d:83:81:79:d3:34:a3:14:a8:1c:7b:9e:
+         07:2b:fb:73:31:ce:17:52:69:80:cc:f7:fd:42:e3:1c:e0:63:
+         66:70:52:81:09:cc:be:51:02:2c:33:9a:ec:21:15:81:9f:7a:
+         10:d0:9c:23:f4:e6:b3:2b:e2:36:0e:fb:79:da:52:2c:bc:fa:
+         dd:9c:53:6b:48:b0:6a:56:5c:7b:87:53:18:94:c4:37:03:bf:
+         13:18:e3:a4:26:e0:66:0c:dc:e5:99:84:5d:36:69:01:f4:69:
+         d4:06:eb:43:ff:4f:f5:17:46:9d:b7:cb:45:ec:0d:9e:9c:4a:
+         96:3c:0b:92:c5:fb:de:d4:3f:af:a9:5e:b1:6f:9d:d7:8b:b5:
+         ab:86:b6:eb:00:da:b1:f4:6d:72:2d:9b:ec:f3:1b:2f:24:99:
+         d5:04:7b:4f:f8:7a:2e:4e:b6:ee:be:f8:50:d2:96:96:6f:f6:
+         3a:c2:7f:35:48:82:1a:84:64:03:e8:58:8e:0c:dc:62:97:cd:
+         82:ff:16:93:ac:44:14:e1:ae:fc:fb:52:25:b6:0d:70:ec:c4:
+         93:42:37:af
 -----BEGIN X509 CRL-----
-MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCVVMxEDAOBgNV
-BAgMB01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4xETAPBgNVBAoMCFNhd3Rvb3Ro
-MRMwEQYDVQQLDApDb25zdWx0aW5nMRgwFgYDVQQDDA93d3cud29sZnNzbC5jb20x
-HzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20XDTE1MDUwNzE4MjEwMVoX
-DTE4MDEzMTE4MjEwMVowFDASAgEBFw0xNTA1MDcxODIxMDFaoA4wDDAKBgNVHRQE
-AwIBAjANBgkqhkiG9w0BAQsFAAOCAQEAtzQrHAlropwST/3vaUykHfI5UimYeLKG
-6lSbKeXCiA4v+dJbnUk3aCZsRWHUnQXvLcp4CtAowSXy92qt3x3rimZkTQwCkfv/
-cLQ2tuR5F9UYanIX4YsxSQSYlohC6oz+kUBaxa072ppHQ9bp9ll1SZGp5IvIA2Br
-NmmHcfFbkgBRu/7VTw0O8lY447bLdhF7F62l2jeH8kmvc0JW7WyhjUZc3QCnjx9a
-3deHiUMwMv7i1LEpEhHvIg2Pf8UzO6mnUgwluAzmiotoj1WEZQTHREg2Ak1OQwkd
-Hzv5Sg7/WULKvg6neYkZMXNaRWxwVk0bilnEbcq890HE9vD9nH7xfg==
+MIICGTCCAQECAQEwDQYJKoZIhvcNAQELBQAwgZQxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMREwDwYDVQQKDAhTYXd0b290
+aDETMBEGA1UECwwKQ29uc3VsdGluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29t
+MR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tFw0xNTA3MjIxNjE3NDVa
+Fw0xODA0MTcxNjE3NDVaMCgwEgIBARcNMTUwNzIyMTYxNzQ1WjASAgECFw0xNTA3
+MjIxNjE3NDVaoA4wDDAKBgNVHRQEAwIBBzANBgkqhkiG9w0BAQsFAAOCAQEAf2GR
+iozBI/HUmNlnZx7SVCrOuEHR98SIhAGlUtZC0a/myPsTUZ4uGMHnnYOBedM0oxSo
+HHueByv7czHOF1JpgMz3/ULjHOBjZnBSgQnMvlECLDOa7CEVgZ96ENCcI/Tmsyvi
+Ng77edpSLLz63ZxTa0iwalZce4dTGJTENwO/ExjjpCbgZgzc5ZmEXTZpAfRp1Abr
+Q/9P9RdGnbfLRewNnpxKljwLksX73tQ/r6lesW+d14u1q4a26wDasfRtci2b7PMb
+LySZ1QR7T/h6Lk627r74UNKWlm/2OsJ/NUiCGoRkA+hYjgzcYpfNgv8Wk6xEFOGu
+/PtSJbYNcOzEk0I3rw==
 -----END X509 CRL-----
diff --git a/certs/crl/gencrls.sh b/certs/crl/gencrls.sh
index f5c2a435b..3e500ff84 100755
--- a/certs/crl/gencrls.sh
+++ b/certs/crl/gencrls.sh
@@ -14,6 +14,17 @@ function setup_files() {
     touch ./demoCA/index.txt
 }
 
+function cleanup_files() {
+    rm blank.index.txt
+    rm index.*
+    rm crlnumber*
+    rm -r demoCA
+    echo "Removed ../wolfssl.cnf, blank.index.txt, index.*, crlnumber*, demoCA/"
+    echo ""
+    exit 0
+}
+trap cleanup_files EXIT
+
 #setup the files
 setup_files
 
@@ -72,14 +83,3 @@ mv tmp eccSrvCRL.pem
 #cp eccSrvCRL.pem ~/wolfssl/certs/crl/eccSrvCRL.pem
 
 exit 0
-
-function cleanup_files() {
-    rm blank.index.txt
-    rm index.*
-    rm crlnumber*
-    rm -r demoCA
-    echo "Removed ../wolfssl.cnf, blank.index.txt, index.*, crlnumber*, demoCA/"
-    echo ""
-    exit 0
-}
-trap cleanup_files EXIT
diff --git a/certs/server-revoked-cert.pem b/certs/server-revoked-cert.pem
index e3dfb27c7..c4d4cc68d 100644
--- a/certs/server-revoked-cert.pem
+++ b/certs/server-revoked-cert.pem
@@ -2,16 +2,16 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number: 2 (0x2)
-        Signature Algorithm: sha1WithRSAEncryption
+    Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Validity
-            Not Before: Jul 22 15:23:38 2015 GMT
-            Not After : Apr 17 15:23:38 2018 GMT
+            Not Before: Jul 22 16:17:13 2015 GMT
+            Not After : Apr 17 16:17:13 2018 GMT
         Subject: C=US, ST=Montana, L=Bozeman, O=wolfSSL, OU=Support, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (2048 bit)
-                Modulus (2048 bit):
+                Public-Key: (2048 bit)
+                Modulus:
                     00:b0:14:16:3a:43:dd:e1:50:45:4f:cf:80:b3:dd:
                     66:96:c7:e9:f4:dc:de:b6:6b:24:1b:76:48:ac:c6:
                     23:a5:a7:e4:05:19:bd:b7:f6:de:fa:ff:ed:5b:3c:
@@ -41,30 +41,30 @@ Certificate:
 
             X509v3 Basic Constraints: 
                 CA:TRUE
-    Signature Algorithm: sha1WithRSAEncryption
-        9e:cf:e7:a7:b3:0d:40:4c:c1:ec:ad:8d:c4:5e:8c:91:b0:f3:
-        8e:12:03:0d:6d:aa:6d:28:ac:2d:77:05:59:a7:e0:68:fd:90:
-        17:e2:0e:6c:f0:26:21:85:c2:2b:21:5b:61:c2:70:4d:1e:dc:
-        58:e8:bf:5c:d0:81:10:61:5a:03:8e:37:b4:5a:7b:71:1c:d1:
-        c6:dd:aa:8f:a3:7b:83:90:d1:8c:a4:ff:f5:b3:87:00:d0:f4:
-        b6:ee:26:ca:58:f2:f8:b3:c1:a0:4c:73:cd:8f:33:d8:75:e6:
-        47:88:36:36:98:39:ac:22:75:b6:69:73:ce:c4:1a:40:c2:e7:
-        f1:da:9c:a2:b7:fb:08:d8:8a:da:4d:f4:26:2b:15:89:c9:cb:
-        ad:a8:56:c7:fb:e0:2d:f5:95:f5:89:24:02:f1:32:c2:dd:33:
-        e3:d5:33:65:7c:58:95:82:4f:52:dc:f2:68:83:0b:a8:f4:68:
-        f7:06:b8:6e:04:30:86:b2:ab:01:ff:bf:66:57:41:77:b9:e7:
-        ea:af:0d:44:c6:1a:cb:d6:65:f2:f2:4d:2a:ff:19:25:60:f2:
-        bb:39:c2:96:2a:40:b8:6c:c8:24:c5:1b:dd:43:f0:35:65:80:
-        02:86:54:da:f9:36:29:75:46:ff:c5:c3:ee:ff:ea:84:6c:ab:
-        bd:88:ab:b1
+    Signature Algorithm: sha256WithRSAEncryption
+         9a:f1:4a:20:31:d1:06:ac:6f:88:ff:c5:c1:db:85:cf:a1:bc:
+         25:6a:04:12:9a:5e:23:31:ab:d1:aa:cb:a2:a7:0e:8f:9a:2d:
+         f2:84:5b:40:05:6f:fb:9c:88:e8:a7:92:a4:95:aa:34:c3:7a:
+         8c:95:6f:a1:30:9a:a7:0c:1c:57:e0:76:ad:4b:53:c1:71:b3:
+         8d:11:96:59:0c:c9:2b:92:69:bb:5a:48:55:23:77:dd:26:0b:
+         34:ec:25:98:7a:3b:a5:de:ed:0b:d0:05:80:cc:d2:db:9e:3c:
+         9e:b2:49:97:38:06:28:48:44:a8:75:88:43:2c:bc:44:44:4f:
+         9a:33:08:8f:dc:8a:51:ce:7e:0f:d6:10:95:01:e1:b4:65:0f:
+         0a:9f:23:b0:76:e8:10:c4:ac:80:97:e4:93:1a:ce:1a:a4:ea:
+         9d:5d:89:93:ca:83:c0:b0:19:eb:c9:58:f7:bf:22:c0:6f:7d:
+         4e:1f:44:69:47:b0:d0:3c:07:db:dc:95:7c:cf:32:fc:3b:4d:
+         43:42:c0:c4:cc:af:5a:f0:4e:e1:65:15:12:7d:bd:bc:68:72:
+         4c:ae:e5:8a:81:21:fb:1a:45:3f:89:f3:2a:a3:c1:e0:49:8b:
+         c1:2b:9f:fd:99:54:d4:84:5f:ec:2a:8e:ba:06:23:85:3f:a1:
+         d9:57:c0:ee
 -----BEGIN CERTIFICATE-----
-MIIEnjCCA4agAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMCVVMx
+MIIEnjCCA4agAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCVVMx
 EDAOBgNVBAgMB01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4xETAPBgNVBAoMCFNh
 d3Rvb3RoMRMwEQYDVQQLDApDb25zdWx0aW5nMRgwFgYDVQQDDA93d3cud29sZnNz
 bC5jb20xHzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20wHhcNMTUwNzIy
-MTUyMzM4WhcNMTgwNDE3MTUyMzM4WjCBkDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B01vbnRhbmExEDAOBgNVBAcTB0JvemVtYW4xEDAOBgNVBAoTB3dvbGZTU0wxEDAO
-BgNVBAsTB1N1cHBvcnQxGDAWBgNVBAMTD3d3dy53b2xmc3NsLmNvbTEfMB0GCSqG
+MTYxNzEzWhcNMTgwNDE3MTYxNzEzWjCBkDELMAkGA1UEBhMCVVMxEDAOBgNVBAgM
+B01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4xEDAOBgNVBAoMB3dvbGZTU0wxEDAO
+BgNVBAsMB1N1cHBvcnQxGDAWBgNVBAMMD3d3dy53b2xmc3NsLmNvbTEfMB0GCSqG
 SIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBALAUFjpD3eFQRU/PgLPdZpbH6fTc3rZrJBt2SKzGI6Wn5AUZvbf2
 3vr/7Vs8eYqp1fH768ix5LKrUnKJkyJcus2KNios0UDsqGYOw3bN57OjCh7dSgeC
@@ -77,19 +77,18 @@ s6TYHTDl6NWhgZqkgZcwgZQxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5h
 MRAwDgYDVQQHDAdCb3plbWFuMREwDwYDVQQKDAhTYXd0b290aDETMBEGA1UECwwK
 Q29uc3VsdGluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29tMR8wHQYJKoZIhvcN
 AQkBFhBpbmZvQHdvbGZzc2wuY29tggkA2YA6w9L02jcwDAYDVR0TBAUwAwEB/zAN
-BgkqhkiG9w0BAQUFAAOCAQEAns/np7MNQEzB7K2NxF6MkbDzjhIDDW2qbSisLXcF
-WafgaP2QF+IObPAmIYXCKyFbYcJwTR7cWOi/XNCBEGFaA443tFp7cRzRxt2qj6N7
-g5DRjKT/9bOHAND0tu4myljy+LPBoExzzY8z2HXmR4g2Npg5rCJ1tmlzzsQaQMLn
-8dqcorf7CNiK2k30JisVicnLrahWx/vgLfWV9YkkAvEywt0z49UzZXxYlYJPUtzy
-aIMLqPRo9wa4bgQwhrKrAf+/ZldBd7nn6q8NRMYay9Zl8vJNKv8ZJWDyuznClipA
-uGzIJMUb3UPwNWWAAoZU2vk2KXVG/8XD7v/qhGyrvYirsQ==
+BgkqhkiG9w0BAQsFAAOCAQEAmvFKIDHRBqxviP/FwduFz6G8JWoEEppeIzGr0arL
+oqcOj5ot8oRbQAVv+5yI6KeSpJWqNMN6jJVvoTCapwwcV+B2rUtTwXGzjRGWWQzJ
+K5Jpu1pIVSN33SYLNOwlmHo7pd7tC9AFgMzS2548nrJJlzgGKEhEqHWIQyy8RERP
+mjMIj9yKUc5+D9YQlQHhtGUPCp8jsHboEMSsgJfkkxrOGqTqnV2Jk8qDwLAZ68lY
+978iwG99Th9EaUew0DwH29yVfM8y/DtNQ0LAxMyvWvBO4WUVEn29vGhyTK7lioEh
++xpFP4nzKqPB4EmLwSuf/ZlU1IRf7CqOugYjhT+h2VfA7g==
 -----END CERTIFICATE-----
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number:
-            d9:80:3a:c3:d2:f4:da:37
-        Signature Algorithm: sha256WithRSAEncryption
+        Serial Number: 15672591315981621815 (0xd9803ac3d2f4da37)
+    Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Validity
             Not Before: May  7 18:21:01 2015 GMT
@@ -97,8 +96,8 @@ Certificate:
         Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (2048 bit)
-                Modulus (2048 bit):
+                Public-Key: (2048 bit)
+                Modulus:
                     00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
                     f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
                     de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
@@ -129,21 +128,21 @@ Certificate:
             X509v3 Basic Constraints: 
                 CA:TRUE
     Signature Algorithm: sha256WithRSAEncryption
-        7a:af:44:3b:aa:6f:53:42:b2:33:aa:43:5f:56:30:d3:b9:96:
-        0b:9a:55:5a:39:2a:0b:4e:e4:2e:f1:95:66:c9:86:36:82:8d:
-        63:7c:4d:a2:ee:48:ba:03:c7:90:d7:a7:c6:74:60:48:5f:31:
-        a2:f9:5e:3e:c3:82:e1:e5:2f:41:81:83:29:25:79:d1:53:00:
-        69:3c:ed:0a:30:3b:41:1d:92:a1:2c:a8:9d:2c:e3:23:87:79:
-        e0:55:6e:91:a8:50:da:46:2f:c2:20:50:3e:2b:47:97:14:b0:
-        7d:04:ba:45:51:d0:6e:e1:5a:a2:4b:84:9c:4d:cd:85:04:f9:
-        28:31:82:93:bc:c7:59:49:91:03:e8:df:6a:e4:56:ad:6a:cb:
-        1f:0d:37:e4:5e:bd:e7:9f:d5:ec:9d:3c:18:25:9b:f1:2f:50:
-        7d:eb:31:cb:f1:63:22:9d:57:fc:f3:84:20:1a:c6:07:87:92:
-        26:9e:15:18:59:33:06:dc:fb:b0:b6:76:5d:f1:c1:2f:c8:2f:
-        62:9c:c0:d6:de:eb:65:77:f3:5c:a6:c3:88:27:96:75:b4:f4:
-        54:cd:ff:2d:21:2e:96:f0:07:73:4b:e9:93:92:90:de:62:d9:
-        a3:3b:ac:6e:24:5f:27:4a:b3:94:70:ff:30:17:e7:7e:32:8f:
-        65:b7:75:58
+         7a:af:44:3b:aa:6f:53:42:b2:33:aa:43:5f:56:30:d3:b9:96:
+         0b:9a:55:5a:39:2a:0b:4e:e4:2e:f1:95:66:c9:86:36:82:8d:
+         63:7c:4d:a2:ee:48:ba:03:c7:90:d7:a7:c6:74:60:48:5f:31:
+         a2:f9:5e:3e:c3:82:e1:e5:2f:41:81:83:29:25:79:d1:53:00:
+         69:3c:ed:0a:30:3b:41:1d:92:a1:2c:a8:9d:2c:e3:23:87:79:
+         e0:55:6e:91:a8:50:da:46:2f:c2:20:50:3e:2b:47:97:14:b0:
+         7d:04:ba:45:51:d0:6e:e1:5a:a2:4b:84:9c:4d:cd:85:04:f9:
+         28:31:82:93:bc:c7:59:49:91:03:e8:df:6a:e4:56:ad:6a:cb:
+         1f:0d:37:e4:5e:bd:e7:9f:d5:ec:9d:3c:18:25:9b:f1:2f:50:
+         7d:eb:31:cb:f1:63:22:9d:57:fc:f3:84:20:1a:c6:07:87:92:
+         26:9e:15:18:59:33:06:dc:fb:b0:b6:76:5d:f1:c1:2f:c8:2f:
+         62:9c:c0:d6:de:eb:65:77:f3:5c:a6:c3:88:27:96:75:b4:f4:
+         54:cd:ff:2d:21:2e:96:f0:07:73:4b:e9:93:92:90:de:62:d9:
+         a3:3b:ac:6e:24:5f:27:4a:b3:94:70:ff:30:17:e7:7e:32:8f:
+         65:b7:75:58
 -----BEGIN CERTIFICATE-----
 MIIEqjCCA5KgAwIBAgIJANmAOsPS9No3MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
 VQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjERMA8G
diff --git a/scripts/crl.test b/scripts/crl.test
index 5361e1f27..421359520 100755
--- a/scripts/crl.test
+++ b/scripts/crl.test
@@ -4,10 +4,12 @@
 
 log_file="scripts/client_result.txt"
 success_line="err = -361, CRL Cert revoked"
-exit_code="-1"
+exit_code=-1
 
 crl_port=11113
+#no_pid tells us process was never started if -1
 no_pid=-1
+#server_pid captured on startup, stores the id of the server process
 server_pid=$no_pid
 
 function remove_ready_file() {
@@ -17,10 +19,17 @@ function remove_ready_file() {
     fi
 }
 
+function remove_log_file() {
+    if test -e $log_file; then
+        echo -e "removing client log file"
+        rm $log_file
+    fi
+}
+
 # trap this function so if user aborts with ^C or other kill signal we still
 # get an exit that will in turn clean up the file system
 function abort_trap() {
-    $exit_code = "-1"
+    exit_code=-2 #different exit code in case of user interrupt
     echo "got abort signal, exiting with $exit_code"
     exit $exit_code
 }
@@ -39,6 +48,7 @@ function restore_file_system() {
         kill -9 $server_pid
     fi
     remove_ready_file
+    remove_log_file
 }
 trap restore_file_system EXIT
 
@@ -46,7 +56,11 @@ function run_test() {
     echo -e "\nStarting example server for crl test...\n"
 
     remove_ready_file
-    ./examples/server/server -R -p $crl_port &
+
+    # starts the server on crl_port, -R generates ready file to be used as a
+    # mutex lock, -c loads the revoked certificate. We capture the processid
+    # into the variable server_pid
+    ./examples/server/server -R -p $crl_port -c certs/server-revoked-cert.pem &
     server_pid=$!
 
     while [ ! -s /tmp/wolfssl_server_ready ]; do
@@ -54,34 +68,10 @@ function run_test() {
         sleep 0.1
     done
 
+    # starts client on crl_port and redirects output to log_file
     ./examples/client/client -p $crl_port &> $log_file
     client_result=$?
 
-    if [ $client_result != 0 ]
-    then
-        echo -e "client failed!"
-        exit 1
-    fi
-
-    wait $server_pid
-    server_result=$?
-
-    if [ $server_result != 0 ]
-    then
-        echo -e "client failed!"
-        exit 1
-    fi
-
-    echo -e "\nSuccess!\n"
-
-    # NICK: is there a better way then scrubbing the .log file to get the
-    # error code -361 thoughts?
-    #consider how we might abstract this up one layer perhaps a c program.
-
-    # Redirect stdout and stderr to reduce "noise"
-#    ./testsuite/testsuite.test &> scripts/ignore.txt
-#    rm scripts/ignore.txt
-
     if test -e $log_file
     then
         while read line;
@@ -99,7 +89,7 @@ function run_test() {
 
 # run the test
 run_test
-$exit_code=0
+exit_code=0
 echo "exiting with $exit_code"
 exit $exit_code
 ########## end program ##########