From 91569d5452d89a134bb5b3eef0c1f54d8935182c Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Mon, 19 Oct 2015 14:56:01 -0600 Subject: [PATCH] New certs update client-callback and server-callback with new API --- certs/1024/ca-cert.der | Bin 0 -> 953 bytes certs/1024/ca-cert.pem | 65 ++++++++++++++++++ certs/1024/ca-key.der | Bin 0 -> 610 bytes certs/1024/ca-key.pem | 15 ++++ certs/1024/client-keyPub.der | Bin 0 -> 162 bytes certs/1024/include.am | 17 ----- certs/1024/server-cert.der | Bin 0 -> 941 bytes certs/1024/server-cert.pem | 130 +++++++++++++++++++++++++++++++++++ certs/1024/server-key.der | Bin 0 -> 609 bytes certs/1024/server-key.pem | 15 ++++ certs/client-keyPub.der | Bin 0 -> 294 bytes certs/ecc-keyPub.der | Bin 0 -> 91 bytes tls/client-callback.c | 2 +- tls/server-callback.c | 2 +- 14 files changed, 227 insertions(+), 19 deletions(-) create mode 100644 certs/1024/ca-cert.der create mode 100644 certs/1024/ca-cert.pem create mode 100644 certs/1024/ca-key.der create mode 100644 certs/1024/ca-key.pem create mode 100644 certs/1024/client-keyPub.der delete mode 100644 certs/1024/include.am create mode 100644 certs/1024/server-cert.der create mode 100644 certs/1024/server-cert.pem create mode 100644 certs/1024/server-key.der create mode 100644 certs/1024/server-key.pem create mode 100644 certs/client-keyPub.der create mode 100644 certs/ecc-keyPub.der diff --git a/certs/1024/ca-cert.der b/certs/1024/ca-cert.der new file mode 100644 index 0000000000000000000000000000000000000000..d1a0260c613032ea6d18d479ef2ea32de8cee4b6 GIT binary patch literal 953 zcmXqLV%}=d#4NXfnTe5!iIbt^$sF`Bka8iFt;C2K*p3Ts$1XiRC5v`6U^K z5(Z)*A#NUi=ls0l(wvgay!3cO10xfd3^NaZd3m{Bd45h>adD1ba(=F%yn!s-Eu4&E z0-1Sf`3^`54CKUl4NVO!jf@R}*w`Wp$h9yqGqi+q2esQ9=Oc$SBP#=QV=pkYJDD0A z8P2Y`>;7inc9p})(jhY{A09Upi@Y|sd~WZf?zb%Bn~uGHGJE1a!+@me5nJmu?`~SF2+WjmCPzx;--JXxzh5$MDLoySANMZX`+sz_X3(8zq}Y4dM3(3&MI;<-#fk# z-^tG(^r=F0y1RdMh;>h{Uu2!m8Beh#0dGFLS`wDG34t0RRC4fq+sq zJpn1Cl__zXWNIwK(zU*B6P%B>CfIgsy`WZ}~BVzW{EH0}e18&@VUee!^tG?n~(X z0zm-bnTspfpXqj&pKEI)9?$9(uGM8i<>hq9twWx6G~YhE`)Zb8)jV@zxu!zPLS ziK8Dt?O!XNriJNAZrqpZ@OLAO2rY8D4Me+dkO=}o0FmS_%8UwWFJj_iJEe_UELJ{$ wXF`$^l3(+e-QlT!tu8I}N>{Ub5WUyr>}m)h>GDQN(rHJEAWQPGQiH2+5G)uYO#lD@ literal 0 HcmV?d00001 diff --git a/certs/1024/ca-key.pem b/certs/1024/ca-key.pem new file mode 100644 index 00000000..de4c756a --- /dev/null +++ b/certs/1024/ca-key.pem @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXgIBAAKBgQDNrN1H7L63JMNjG1SYeeHHMRZZ1p13nY3ii+0EF7LG6+Sbkb4x +UGKXWLV/Kd6zcSQLv5cJfybcLeyoLrJkK3orNRktooDLmf2UcRsjjVTbLmKNgQgt +9CRyJ2z5yY7bTHW6mwH4Pxj05n/7V5SSzIjEtADCqtTliBizES9zwNYpCQIDAQAB +AoGAUjU9ASmklSlxm2RqLMPStb5uE5yPtibYdmu9YbxjLdVNu8zGO4nIznubl+dR +Z2HaqYN7yET1cF4+0H5RuW4TVwhc4WdPYV6lCewR3eS4tPTgYzRM2jIgH4VBXbzb +JMWvvgJfIvF8zAVWpqY3muv/Ui2/MEuaHe6rnCziwbidyTECQQDpiRbNrC7yTWYX +vXgSEo2OhCTeLVBBhYw0Cfr7bYdRTBMo8GARhj3CpM9exW9bETIKtSjQgkdEJpLi +eFm0CLP9AkEA4XW0arWMEfvMQgLF2kjOKUMUAZoss6TLc+uhNVettRYXgANfMje+ +om/5MYS/AG6NAw4wHNAvN/B+wmS/7kvo/QJBAOGZiyvYn+l2l59rayiaP6FjSnJO +9+6z4kMLOSfWIRiKEyBDRaroMZVsvN7if7ZLoDnz05/JmqrdUJvyg0WF+skCQQCv +sMd8+ChEw1Dyh7KiXWW6JblrXjdDbkHU/WNMbBzDJon9iaMfQO1fK56mhelJbtyX +6vB3I4wILXK6DUS7b5AJAkEAkeQuyowKaS9i4mI7pY1aLFY+f2dCkhKSX/OX3eGp +f60uLfRKV7N6EL3X5OxqCCHp8kZJ0mlHiiBL8rFSg6tvEA== +-----END RSA PRIVATE KEY----- diff --git a/certs/1024/client-keyPub.der b/certs/1024/client-keyPub.der new file mode 100644 index 0000000000000000000000000000000000000000..a5c1817d943c577c7cee292682f279f1fc6982ea GIT binary patch literal 162 zcmV;T0A2qufuAr91_>&LNQUD}zDfOhax1PB!LH7B*p~&|pIW z13nOkgNNNWKd&S)FA*lf&cp7MUzM7hm}e+xzzpTnhs;LrW;vpm8ecZio7hi-#R#Q*f}4p{Ri{#OXZ2r3D4~ zMI{uwyKz2pC^ND$FgNxBL%Nfxv5{ew-O@Ri#XVDni54TaTFc?n>YEo>~3Z!7XRA8Pc{~D=v`d zusTz|_T^8LE1wtWu6!P`@<3wCwl}t1YyZZy6|c&6ztOE1;hibeq!#*2WPfNu$G@MY z51E)585kEg0TV*wKVbMXhsyG?h_Q&=v@v~E!l%4%&YxeJ6F3h(ZxNecW6*dGB(KcU zc+8;jaD&KYrG5>a2dwWdzdc-NdvcSRmF)f%3mfMzX`C~dQ&AHqL%)mK|Lx8XXBqH- z{3Fc5YQW6M_#ZirfH{E~7&%-l$7db+=63r@>lGy?A-iC8Rh6#U`jhML6-+sr^C*Y=v!Bek9{nmaMnrmcH;3-c2#tLw86P}c2>`>= BEA{{Y literal 0 HcmV?d00001 diff --git a/certs/1024/server-cert.pem b/certs/1024/server-cert.pem new file mode 100644 index 00000000..f278d2c0 --- /dev/null +++ b/certs/1024/server-cert.pem @@ -0,0 +1,130 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 1 (0x1) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting_1024, CN=www.wolfssl.com/emailAddress=info@wolfssl.com + Validity + Not Before: Sep 23 19:23:38 2015 GMT + Not After : Jun 19 19:23:38 2018 GMT + Subject: C=US, ST=Montana, L=Bozeman, O=wolfSSL, OU=Support_1024, CN=www.wolfssl.com/emailAddress=info@wolfssl.com + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (1024 bit) + Modulus: + 00:aa:3e:a5:9c:d3:17:49:65:43:de:d0:f3:4b:1c: + db:49:0c:fc:7a:65:05:6d:de:6a:c4:e4:73:2c:8a: + 96:82:8f:23:a5:06:71:1c:06:3e:2f:92:8d:0b:29: + 34:45:59:e9:a9:bc:61:d7:24:37:5d:b5:c4:37:8d: + ba:67:b2:ef:03:27:fa:c1:b4:cd:6b:00:66:b4:d6: + 73:70:1f:08:3a:cc:77:ad:e9:f9:34:d4:f3:a0:2d: + a9:e7:58:a9:c0:61:84:b6:ec:3d:0a:ad:fd:5c:86: + 73:aa:6b:47:d8:8b:2e:58:4b:69:12:82:26:55:e6: + 14:bf:55:70:88:fe:f9:75:e1 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + D9:3C:35:EA:74:0E:23:BE:9C:FC:FA:29:90:09:C1:E7:84:16:9F:7C + X509v3 Authority Key Identifier: + keyid:D3:22:8F:28:2C:E0:05:EE:D3:ED:C3:71:3D:C9:B2:36:3A:1D:BF:A8 + DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting_1024/CN=www.wolfssl.com/emailAddress=info@wolfssl.com + serial:8F:44:26:FF:B7:43:E1:9A + + X509v3 Basic Constraints: + CA:TRUE + Signature Algorithm: sha1WithRSAEncryption + 0a:04:c7:9a:c4:f6:46:db:e4:85:d4:22:02:12:3e:53:27:25: + 24:8a:9b:2f:93:7f:de:70:94:c5:6c:4c:26:25:25:7a:d7:0f: + 33:b9:9c:d2:5a:94:7f:8d:30:75:ad:82:c9:bf:4b:6c:91:58: + 7c:45:1a:89:df:8e:ca:31:9f:ab:38:b3:ae:c2:8f:14:87:e6: + 1c:ab:12:4e:df:82:36:c9:41:46:c4:05:95:88:62:09:72:57: + 66:31:80:b8:9c:55:a8:fb:74:01:32:e7:5a:40:df:9b:e4:98: + d7:5b:ea:69:5c:14:1b:9b:8b:08:2d:d9:58:28:be:c9:01:e0: + e1:a9 +-----BEGIN CERTIFICATE----- +MIIDqTCCAxKgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMCVVMx +EDAOBgNVBAgMB01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4xETAPBgNVBAoMCFNh +d3Rvb3RoMRgwFgYDVQQLDA9Db25zdWx0aW5nXzEwMjQxGDAWBgNVBAMMD3d3dy53 +b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAeFw0x +NTA5MjMxOTIzMzhaFw0xODA2MTkxOTIzMzhaMIGVMQswCQYDVQQGEwJVUzEQMA4G +A1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjEQMA4GA1UECgwHd29sZlNT +TDEVMBMGA1UECwwMU3VwcG9ydF8xMDI0MRgwFgYDVQQDDA93d3cud29sZnNzbC5j +b20xHzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20wgZ8wDQYJKoZIhvcN +AQEBBQADgY0AMIGJAoGBAKo+pZzTF0llQ97Q80sc20kM/HplBW3easTkcyyKloKP +I6UGcRwGPi+SjQspNEVZ6am8YdckN121xDeNumey7wMn+sG0zWsAZrTWc3AfCDrM +d63p+TTU86AtqedYqcBhhLbsPQqt/VyGc6prR9iLLlhLaRKCJlXmFL9VcIj++XXh +AgMBAAGjggEBMIH+MB0GA1UdDgQWBBTZPDXqdA4jvpz8+imQCcHnhBaffDCBzgYD +VR0jBIHGMIHDgBTTIo8oLOAF7tPtw3E9ybI2Oh2/qKGBn6SBnDCBmTELMAkGA1UE +BhMCVVMxEDAOBgNVBAgMB01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4xETAPBgNV +BAoMCFNhd3Rvb3RoMRgwFgYDVQQLDA9Db25zdWx0aW5nXzEwMjQxGDAWBgNVBAMM +D3d3dy53b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNv +bYIJAI9EJv+3Q+GaMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEACgTH +msT2RtvkhdQiAhI+UyclJIqbL5N/3nCUxWxMJiUletcPM7mc0lqUf40wda2Cyb9L +bJFYfEUaid+OyjGfqzizrsKPFIfmHKsSTt+CNslBRsQFlYhiCXJXZjGAuJxVqPt0 +ATLnWkDfm+SY11vqaVwUG5uLCC3ZWCi+yQHg4ak= +-----END CERTIFICATE----- +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 10323419125573214618 (0x8f4426ffb743e19a) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting_1024, CN=www.wolfssl.com/emailAddress=info@wolfssl.com + Validity + Not Before: Sep 23 19:23:38 2015 GMT + Not After : Jun 19 19:23:38 2018 GMT + Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting_1024, CN=www.wolfssl.com/emailAddress=info@wolfssl.com + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (1024 bit) + Modulus: + 00:cd:ac:dd:47:ec:be:b7:24:c3:63:1b:54:98:79: + e1:c7:31:16:59:d6:9d:77:9d:8d:e2:8b:ed:04:17: + b2:c6:eb:e4:9b:91:be:31:50:62:97:58:b5:7f:29: + de:b3:71:24:0b:bf:97:09:7f:26:dc:2d:ec:a8:2e: + b2:64:2b:7a:2b:35:19:2d:a2:80:cb:99:fd:94:71: + 1b:23:8d:54:db:2e:62:8d:81:08:2d:f4:24:72:27: + 6c:f9:c9:8e:db:4c:75:ba:9b:01:f8:3f:18:f4:e6: + 7f:fb:57:94:92:cc:88:c4:b4:00:c2:aa:d4:e5:88: + 18:b3:11:2f:73:c0:d6:29:09 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + D3:22:8F:28:2C:E0:05:EE:D3:ED:C3:71:3D:C9:B2:36:3A:1D:BF:A8 + X509v3 Authority Key Identifier: + keyid:D3:22:8F:28:2C:E0:05:EE:D3:ED:C3:71:3D:C9:B2:36:3A:1D:BF:A8 + DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting_1024/CN=www.wolfssl.com/emailAddress=info@wolfssl.com + serial:8F:44:26:FF:B7:43:E1:9A + + X509v3 Basic Constraints: + CA:TRUE + Signature Algorithm: sha1WithRSAEncryption + 0e:46:ac:d8:29:1d:12:12:06:0c:d3:3f:7d:58:2e:0d:11:5e: + 5d:0d:dd:17:c0:0f:aa:01:4d:a4:c4:84:81:6e:64:ae:d1:5d: + 58:cd:19:6a:74:a4:46:2f:c8:43:79:39:c0:91:4b:7c:71:ea: + 4e:63:44:66:15:41:15:de:50:82:e3:e9:d1:55:55:cc:5a:38: + 1e:3a:59:b3:0e:ee:0e:54:4d:93:e7:e0:8e:27:a5:6e:08:b8: + 6a:39:da:2d:47:62:c4:5b:89:c0:48:48:2a:d5:f0:55:74:fd: + a6:b1:68:3c:70:a4:52:24:81:ec:4c:57:e0:e8:18:73:9d:0a: + 4d:d8 +-----BEGIN CERTIFICATE----- +MIIDtTCCAx6gAwIBAgIJAI9EJv+3Q+GaMA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD +VQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjERMA8G +A1UECgwIU2F3dG9vdGgxGDAWBgNVBAsMD0NvbnN1bHRpbmdfMTAyNDEYMBYGA1UE +AwwPd3d3LndvbGZzc2wuY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wu +Y29tMB4XDTE1MDkyMzE5MjMzOFoXDTE4MDYxOTE5MjMzOFowgZkxCzAJBgNVBAYT +AlVTMRAwDgYDVQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMREwDwYDVQQK +DAhTYXd0b290aDEYMBYGA1UECwwPQ29uc3VsdGluZ18xMDI0MRgwFgYDVQQDDA93 +d3cud29sZnNzbC5jb20xHzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20w +gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM2s3Ufsvrckw2MbVJh54ccxFlnW +nXedjeKL7QQXssbr5JuRvjFQYpdYtX8p3rNxJAu/lwl/Jtwt7KgusmQreis1GS2i +gMuZ/ZRxGyONVNsuYo2BCC30JHInbPnJjttMdbqbAfg/GPTmf/tXlJLMiMS0AMKq +1OWIGLMRL3PA1ikJAgMBAAGjggEBMIH+MB0GA1UdDgQWBBTTIo8oLOAF7tPtw3E9 +ybI2Oh2/qDCBzgYDVR0jBIHGMIHDgBTTIo8oLOAF7tPtw3E9ybI2Oh2/qKGBn6SB +nDCBmTELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB01vbnRhbmExEDAOBgNVBAcMB0Jv +emVtYW4xETAPBgNVBAoMCFNhd3Rvb3RoMRgwFgYDVQQLDA9Db25zdWx0aW5nXzEw +MjQxGDAWBgNVBAMMD3d3dy53b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5m +b0B3b2xmc3NsLmNvbYIJAI9EJv+3Q+GaMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN +AQEFBQADgYEADkas2CkdEhIGDNM/fVguDRFeXQ3dF8APqgFNpMSEgW5krtFdWM0Z +anSkRi/IQ3k5wJFLfHHqTmNEZhVBFd5QguPp0VVVzFo4HjpZsw7uDlRNk+fgjiel +bgi4ajnaLUdixFuJwEhIKtXwVXT9prFoPHCkUiSB7ExX4OgYc50KTdg= +-----END CERTIFICATE----- diff --git a/certs/1024/server-key.der b/certs/1024/server-key.der new file mode 100644 index 0000000000000000000000000000000000000000..9f7a9c3dfce2369025c15a7b17830cd81ba83fc5 GIT binary patch literal 609 zcmV-n0-pUaf&yIv0RRGlfdHyLrJU0jNo7Oc(DO?i+er-kdSwM|-fG0;b1aIMf{!Dm z25}q)J};7u3n?^3S?Q^~Vb>%#UA4qFjk;&D?*k|L!L-e50A{q-b8sIBI?Q*i>G?F& z^PnxM=UA!0VT88qJqoS;T!wS1Ye(3NE?7%x5`rdG<`lnGaESi-b>RX70RRC4fq)83 z!TwA0Be6;Xrw0{`;jpK9v`3wAv(oV&K}=Augmdh+QqPGgl^-{M}Vfbg#tkU$Z-ufN8x)REfFo1 zF2~Te(|lZ$JX<2=;EQcX`4kVH2pdzY3aR9OK-1r1bP%HcgCEaTX6s$WgSzaW(zOPy z0zm+`Xc?!+`SF_FT_=&jPkmBnwsxTnJ&_}@v-e4c?cl}ZqX`84iQ>f?ZcBH)1H*f^ zY+drN2$ZP$B)w*F^{zz%KowHaksJ7g+}5gzD&e~*9SaJh-j)F@2|$Jvt{-(??qRzqe3aB+LaR7y8ZN}cNekwR-Nn$fQ362#sf(wn?ykER%X0EiBAv6};6OJB v)qfdSfN*(fncrd!A*0ondAf&n5h4F(A+hDe6@4FLfG1potr0S^E$f&mHwf&l>l!voPP{yC&FMLSc- zgexk1beg@YDpChW)}}VH2QrS(x@mjH!$h9cfk^!=XrhZ}yP@4lI3fA~ literal 0 HcmV?d00001 diff --git a/tls/client-callback.c b/tls/client-callback.c index 96f1aedf..93462aac 100644 --- a/tls/client-callback.c +++ b/tls/client-callback.c @@ -185,7 +185,7 @@ int Client(const char* ip, word16 port) if ((ssl = wolfSSL_new(ctx)) == NULL) err_sys("issue when creating ssl"); - tcp_connect(&fd, ip, port, 0); + tcp_connect(&fd, ip, port, 0, ssl); wolfSSL_set_fd(ssl, fd); if (wolfSSL_connect(ssl) != SSL_SUCCESS) err_sys("client connect failed"); diff --git a/tls/server-callback.c b/tls/server-callback.c index be9ea16a..f1b67992 100644 --- a/tls/server-callback.c +++ b/tls/server-callback.c @@ -179,7 +179,7 @@ int Server(word16 port) wolfSSL_SetIORecv(ctx, CbIORecv); wolfSSL_SetIOSend(ctx, CbIOSend); - tcp_accept(&listenfd, &connfd, NULL, port, 1, 0, 0); + tcp_accept(&listenfd, &connfd, NULL, port, 1, 0, 0, 1); if (connfd < 0) { err_sys("Fatal error : accept error");