From 4f55e9b6800c840dc9292b31b9dbe3f664336541 Mon Sep 17 00:00:00 2001 From: Ivan Romanov Date: Sat, 20 Jul 2013 23:06:08 +0600 Subject: [PATCH] fix Windows line endings --- examples/tlssocket/CMakeLists.txt | 18 +-- .../certunittest/certs/servergood2cert.txt | 120 +++++++++--------- unittest/certunittest/certs/user2goodcert.txt | 120 +++++++++--------- 3 files changed, 129 insertions(+), 129 deletions(-) diff --git a/examples/tlssocket/CMakeLists.txt b/examples/tlssocket/CMakeLists.txt index 3ce1c118..7962e6e8 100644 --- a/examples/tlssocket/CMakeLists.txt +++ b/examples/tlssocket/CMakeLists.txt @@ -1,9 +1,9 @@ -set(tlssocket_bin_SRCS tlssocket.cpp main.cpp) - - -MY_AUTOMOC( tlssocket_bin_SRCS) - -add_executable(tlssocket ${tlssocket_bin_SRCS}) - -target_link_libraries( tlssocket qca ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY}) - +set(tlssocket_bin_SRCS tlssocket.cpp main.cpp) + + +MY_AUTOMOC( tlssocket_bin_SRCS) + +add_executable(tlssocket ${tlssocket_bin_SRCS}) + +target_link_libraries( tlssocket qca ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY}) + diff --git a/unittest/certunittest/certs/servergood2cert.txt b/unittest/certunittest/certs/servergood2cert.txt index dd8eac0d..241d0478 100644 --- a/unittest/certunittest/certs/servergood2cert.txt +++ b/unittest/certunittest/certs/servergood2cert.txt @@ -1,60 +1,60 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 6 (0x6) - Signature Algorithm: md5WithRSAEncryption - Issuer: C=de, O=InsecureTestCertificate, CN=For Tests Only next generation/Email=insecure@test.insecure - Validity - Not Before: Jul 1 10:21:49 2002 GMT - Not After : Jun 30 10:21:49 2007 GMT - Subject: C=de, O=InsecureTestCertificate, CN=Insecure Server Cert/Email=insecure@test.insecure - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:bd:45:c9:dc:e9:70:4d:90:95:ff:07:09:24:8e: - 08:8c:d2:64:ce:16:02:00:3d:8a:15:fe:e2:9a:eb: - 81:3c:67:55:7e:5c:e1:75:ea:09:b4:76:84:c3:04: - 3e:fc:8e:49:77:ad:97:db:44:5b:3e:44:32:b3:70: - c0:fe:4e:0f:82:bb:97:4b:11:34:0d:06:64:c6:8f: - 60:85:3c:b9:a2:7c:fa:ce:28:ab:3c:3b:2d:72:d8: - e9:e4:c1:44:f3:83:00:5c:9c:51:78:6c:08:6d:a7: - 97:19:ce:9a:81:4b:7d:fc:13:f7:30:94:20:19:b2: - 60:16:77:68:a9:c4:3b:42:21 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Key Usage: - Digital Signature, Key Encipherment, Key Agreement - X509v3 Extended Key Usage: - TLS Web Server Authentication - X509v3 Subject Key Identifier: - F5:F1:29:8A:CD:31:98:96:2B:00:5B:78:55:F6:CC:69:55:EE:F3:18 - X509v3 Authority Key Identifier: - keyid:8F:08:4F:9C:53:C1:5C:C8:E6:0C:D7:13:2E:CB:52:3C:23:96:02:14 - DirName:/C=de/O=InsecureTestCertificate/CN=For Tests Only next generation/Email=insecure@test.insecure - serial:00 - - X509v3 Subject Alternative Name: - email:insecure@test.insecure - X509v3 Issuer Alternative Name: - email:insecure@test.insecure - Netscape Cert Type: - SSL Server - Netscape Comment: - This certificate was issued for testing only! - Signature Algorithm: md5WithRSAEncryption - 87:48:82:2d:5d:dc:e0:0a:a1:b9:11:3a:bf:37:40:cc:c3:42: - b1:9a:a7:62:3d:8d:0f:7e:bc:da:a9:cc:8f:2c:4b:66:c8:42: - 69:fc:a9:66:8b:f0:51:84:40:23:01:30:98:10:d8:76:01:b0: - c0:bd:ae:68:42:a7:33:c9:48:e5:30:be:4b:4e:8b:e7:f2:56: - 3f:11:2b:2b:10:1d:1e:51:98:39:62:c0:e1:cf:dc:ef:1b:c2: - 2c:1c:cf:94:87:d7:a0:32:c6:50:b2:f4:00:49:61:a5:80:11: - 9e:59:99:3e:d5:59:69:83:47:05:ae:08:bb:2c:0b:53:90:53: - a0:86:0d:9a:6c:d4:ce:c9:d2:fd:fb:b0:a8:24:64:70:0f:9f: - 2b:64:3b:11:40:fa:b7:30:ea:82:e1:4b:32:14:bd:d4:72:e0: - 3f:3e:27:26:b6:d1:80:8a:ad:d4:eb:b3:cf:fc:ab:0b:b6:2d: - 25:5b:0f:be:d5:f1:73:5a:2f:70:c3:fd:9f:3a:db:bc:ab:a7: - 5f:3c:aa:54:b3:c8:9d:a6:12:62:dc:7b:4b:8f:62:d7:fd:f7: - f4:f8:3e:be:ef:26:2b:b9:4b:40:a5:36:c2:e7:0b:7e:41:ba: - 00:88:41:de:0d:ef:fb:0c:e9:df:a0:92:b2:29:1d:ab:d3:45: - c8:16:37:52 +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 6 (0x6) + Signature Algorithm: md5WithRSAEncryption + Issuer: C=de, O=InsecureTestCertificate, CN=For Tests Only next generation/Email=insecure@test.insecure + Validity + Not Before: Jul 1 10:21:49 2002 GMT + Not After : Jun 30 10:21:49 2007 GMT + Subject: C=de, O=InsecureTestCertificate, CN=Insecure Server Cert/Email=insecure@test.insecure + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public Key: (1024 bit) + Modulus (1024 bit): + 00:bd:45:c9:dc:e9:70:4d:90:95:ff:07:09:24:8e: + 08:8c:d2:64:ce:16:02:00:3d:8a:15:fe:e2:9a:eb: + 81:3c:67:55:7e:5c:e1:75:ea:09:b4:76:84:c3:04: + 3e:fc:8e:49:77:ad:97:db:44:5b:3e:44:32:b3:70: + c0:fe:4e:0f:82:bb:97:4b:11:34:0d:06:64:c6:8f: + 60:85:3c:b9:a2:7c:fa:ce:28:ab:3c:3b:2d:72:d8: + e9:e4:c1:44:f3:83:00:5c:9c:51:78:6c:08:6d:a7: + 97:19:ce:9a:81:4b:7d:fc:13:f7:30:94:20:19:b2: + 60:16:77:68:a9:c4:3b:42:21 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Key Usage: + Digital Signature, Key Encipherment, Key Agreement + X509v3 Extended Key Usage: + TLS Web Server Authentication + X509v3 Subject Key Identifier: + F5:F1:29:8A:CD:31:98:96:2B:00:5B:78:55:F6:CC:69:55:EE:F3:18 + X509v3 Authority Key Identifier: + keyid:8F:08:4F:9C:53:C1:5C:C8:E6:0C:D7:13:2E:CB:52:3C:23:96:02:14 + DirName:/C=de/O=InsecureTestCertificate/CN=For Tests Only next generation/Email=insecure@test.insecure + serial:00 + + X509v3 Subject Alternative Name: + email:insecure@test.insecure + X509v3 Issuer Alternative Name: + email:insecure@test.insecure + Netscape Cert Type: + SSL Server + Netscape Comment: + This certificate was issued for testing only! + Signature Algorithm: md5WithRSAEncryption + 87:48:82:2d:5d:dc:e0:0a:a1:b9:11:3a:bf:37:40:cc:c3:42: + b1:9a:a7:62:3d:8d:0f:7e:bc:da:a9:cc:8f:2c:4b:66:c8:42: + 69:fc:a9:66:8b:f0:51:84:40:23:01:30:98:10:d8:76:01:b0: + c0:bd:ae:68:42:a7:33:c9:48:e5:30:be:4b:4e:8b:e7:f2:56: + 3f:11:2b:2b:10:1d:1e:51:98:39:62:c0:e1:cf:dc:ef:1b:c2: + 2c:1c:cf:94:87:d7:a0:32:c6:50:b2:f4:00:49:61:a5:80:11: + 9e:59:99:3e:d5:59:69:83:47:05:ae:08:bb:2c:0b:53:90:53: + a0:86:0d:9a:6c:d4:ce:c9:d2:fd:fb:b0:a8:24:64:70:0f:9f: + 2b:64:3b:11:40:fa:b7:30:ea:82:e1:4b:32:14:bd:d4:72:e0: + 3f:3e:27:26:b6:d1:80:8a:ad:d4:eb:b3:cf:fc:ab:0b:b6:2d: + 25:5b:0f:be:d5:f1:73:5a:2f:70:c3:fd:9f:3a:db:bc:ab:a7: + 5f:3c:aa:54:b3:c8:9d:a6:12:62:dc:7b:4b:8f:62:d7:fd:f7: + f4:f8:3e:be:ef:26:2b:b9:4b:40:a5:36:c2:e7:0b:7e:41:ba: + 00:88:41:de:0d:ef:fb:0c:e9:df:a0:92:b2:29:1d:ab:d3:45: + c8:16:37:52 diff --git a/unittest/certunittest/certs/user2goodcert.txt b/unittest/certunittest/certs/user2goodcert.txt index a208ab29..8467ad31 100644 --- a/unittest/certunittest/certs/user2goodcert.txt +++ b/unittest/certunittest/certs/user2goodcert.txt @@ -1,60 +1,60 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 4 (0x4) - Signature Algorithm: md5WithRSAEncryption - Issuer: C=de, O=InsecureTestCertificate, CN=For Tests Only next generation/Email=insecure@test.insecure - Validity - Not Before: Jul 1 09:58:50 2002 GMT - Not After : Jun 30 09:58:50 2007 GMT - Subject: C=de, O=InsecureTestCertificate, CN=Insecure User Test Cert/Email=insecure@test.insecure - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:f1:79:30:51:bb:49:33:97:ef:e8:03:91:df:f6: - 9d:3b:7e:c7:13:90:7f:60:16:fe:67:8d:b3:58:20: - 6e:09:21:89:f3:25:f3:0d:df:69:b0:33:71:72:70: - 67:af:52:4f:14:3a:6e:f6:6d:fd:b9:c3:8e:71:63: - 31:f7:f4:3a:6e:0b:54:88:ef:d0:57:87:9a:d6:e9: - d5:7d:78:a6:03:a4:54:77:04:f4:27:a3:04:ad:b1: - 12:4d:13:12:b5:e3:32:2e:03:be:b8:d7:8d:5a:c0: - 39:89:33:20:19:3c:32:43:69:5c:31:f2:5c:39:a9: - 54:15:26:ce:3b:bd:f1:92:d9 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Key Usage: - Digital Signature, Non Repudiation, Key Encipherment, Data Encipherment - X509v3 Extended Key Usage: - TLS Web Client Authentication, E-mail Protection - X509v3 Subject Key Identifier: - 7B:5C:26:F0:14:E4:7D:3C:5C:9D:5C:B4:86:A5:E7:6C:BE:8E:77:FB - X509v3 Authority Key Identifier: - keyid:8F:08:4F:9C:53:C1:5C:C8:E6:0C:D7:13:2E:CB:52:3C:23:96:02:14 - DirName:/C=de/O=InsecureTestCertificate/CN=For Tests Only next generation/Email=insecure@test.insecure - serial:00 - - X509v3 Subject Alternative Name: - email:insecure@test.insecure - X509v3 Issuer Alternative Name: - email:insecure@test.insecure - Netscape Cert Type: - SSL Client, S/MIME - Netscape Comment: - This certificate was issued for testing only! - Signature Algorithm: md5WithRSAEncryption - 46:1e:57:24:97:95:da:b9:c3:7e:66:ac:19:ba:08:6d:5e:2e: - 19:e7:bc:c7:78:c9:0d:e6:4a:76:18:b5:ef:d9:2c:6d:a8:3c: - 10:6e:d4:ce:7a:91:70:2a:19:13:2f:8a:60:82:14:57:8c:b0: - bd:ae:0d:0b:44:0d:ba:c7:e7:96:02:61:81:c7:07:c6:cc:73: - c6:a0:15:1c:a2:b4:5c:a5:28:21:6a:d6:c2:cd:84:52:05:36: - 8f:06:97:29:c0:fe:c6:05:32:03:10:cc:fd:1c:56:ce:80:40: - 1e:c2:19:96:8c:cf:27:5d:b5:88:e9:a0:9e:b7:ad:d0:73:c0: - d4:0f:37:09:63:64:57:3d:92:fc:2f:b8:c6:fa:3b:dd:91:f3: - 66:d0:5e:50:d3:1d:10:a5:56:03:c4:7a:dc:b4:5f:0d:a7:34: - c5:47:67:ee:c2:8e:1a:87:30:1f:60:bb:30:25:ce:cc:56:1b: - 22:1f:b2:ca:1e:17:65:92:15:16:ce:f9:09:21:e0:9f:45:dd: - 76:67:ba:f6:7e:98:e0:cf:fe:3c:b0:75:af:34:61:c9:9c:cf: - 42:99:01:cf:05:22:8f:c9:38:87:3f:85:11:8c:68:41:a9:97: - 95:62:56:7f:57:8e:ed:ef:cb:f9:29:7f:d9:9a:ee:3f:d5:c1: - 80:9e:85:05 +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 4 (0x4) + Signature Algorithm: md5WithRSAEncryption + Issuer: C=de, O=InsecureTestCertificate, CN=For Tests Only next generation/Email=insecure@test.insecure + Validity + Not Before: Jul 1 09:58:50 2002 GMT + Not After : Jun 30 09:58:50 2007 GMT + Subject: C=de, O=InsecureTestCertificate, CN=Insecure User Test Cert/Email=insecure@test.insecure + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public Key: (1024 bit) + Modulus (1024 bit): + 00:f1:79:30:51:bb:49:33:97:ef:e8:03:91:df:f6: + 9d:3b:7e:c7:13:90:7f:60:16:fe:67:8d:b3:58:20: + 6e:09:21:89:f3:25:f3:0d:df:69:b0:33:71:72:70: + 67:af:52:4f:14:3a:6e:f6:6d:fd:b9:c3:8e:71:63: + 31:f7:f4:3a:6e:0b:54:88:ef:d0:57:87:9a:d6:e9: + d5:7d:78:a6:03:a4:54:77:04:f4:27:a3:04:ad:b1: + 12:4d:13:12:b5:e3:32:2e:03:be:b8:d7:8d:5a:c0: + 39:89:33:20:19:3c:32:43:69:5c:31:f2:5c:39:a9: + 54:15:26:ce:3b:bd:f1:92:d9 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Key Usage: + Digital Signature, Non Repudiation, Key Encipherment, Data Encipherment + X509v3 Extended Key Usage: + TLS Web Client Authentication, E-mail Protection + X509v3 Subject Key Identifier: + 7B:5C:26:F0:14:E4:7D:3C:5C:9D:5C:B4:86:A5:E7:6C:BE:8E:77:FB + X509v3 Authority Key Identifier: + keyid:8F:08:4F:9C:53:C1:5C:C8:E6:0C:D7:13:2E:CB:52:3C:23:96:02:14 + DirName:/C=de/O=InsecureTestCertificate/CN=For Tests Only next generation/Email=insecure@test.insecure + serial:00 + + X509v3 Subject Alternative Name: + email:insecure@test.insecure + X509v3 Issuer Alternative Name: + email:insecure@test.insecure + Netscape Cert Type: + SSL Client, S/MIME + Netscape Comment: + This certificate was issued for testing only! + Signature Algorithm: md5WithRSAEncryption + 46:1e:57:24:97:95:da:b9:c3:7e:66:ac:19:ba:08:6d:5e:2e: + 19:e7:bc:c7:78:c9:0d:e6:4a:76:18:b5:ef:d9:2c:6d:a8:3c: + 10:6e:d4:ce:7a:91:70:2a:19:13:2f:8a:60:82:14:57:8c:b0: + bd:ae:0d:0b:44:0d:ba:c7:e7:96:02:61:81:c7:07:c6:cc:73: + c6:a0:15:1c:a2:b4:5c:a5:28:21:6a:d6:c2:cd:84:52:05:36: + 8f:06:97:29:c0:fe:c6:05:32:03:10:cc:fd:1c:56:ce:80:40: + 1e:c2:19:96:8c:cf:27:5d:b5:88:e9:a0:9e:b7:ad:d0:73:c0: + d4:0f:37:09:63:64:57:3d:92:fc:2f:b8:c6:fa:3b:dd:91:f3: + 66:d0:5e:50:d3:1d:10:a5:56:03:c4:7a:dc:b4:5f:0d:a7:34: + c5:47:67:ee:c2:8e:1a:87:30:1f:60:bb:30:25:ce:cc:56:1b: + 22:1f:b2:ca:1e:17:65:92:15:16:ce:f9:09:21:e0:9f:45:dd: + 76:67:ba:f6:7e:98:e0:cf:fe:3c:b0:75:af:34:61:c9:9c:cf: + 42:99:01:cf:05:22:8f:c9:38:87:3f:85:11:8c:68:41:a9:97: + 95:62:56:7f:57:8e:ed:ef:cb:f9:29:7f:d9:9a:ee:3f:d5:c1: + 80:9e:85:05