[arch-commits] Commit in sslsplit/trunk (2 files)
Date: Thursday, January 25, 2018 @ 22:25:53
Author: anthraxx
Revision: 286972
upgpkg: sslsplit 0.5.1-1
Modified:
sslsplit/trunk/PKGBUILD
Deleted:
sslsplit/trunk/0003-Add-fixes-for-OpenSSL-1.1-while-retaining-1.0-compat.patch
-+
0003-Add-fixes-for-OpenSSL-1.1-while-retaining-1.0-compat.patch | 510
--
PKGBUILD| 23
2 files changed, 8 insertions(+), 525 deletions(-)
Deleted: 0003-Add-fixes-for-OpenSSL-1.1-while-retaining-1.0-compat.patch
===
--- 0003-Add-fixes-for-OpenSSL-1.1-while-retaining-1.0-compat.patch
2018-01-25 22:23:28 UTC (rev 286971)
+++ 0003-Add-fixes-for-OpenSSL-1.1-while-retaining-1.0-compat.patch
2018-01-25 22:25:53 UTC (rev 286972)
@@ -1,510 +0,0 @@
-From: Hilko Bengen
-Date: Tue, 8 Nov 2016 00:30:42 +0100
-Subject: Add fixes for OpenSSL 1.1 while retaining 1.0 compatibility
-
- cachedsess.t.c| 4 ++
- cachefkcrt.t.c| 4 ++
- cachemgr.h| 21 ++
- cachessess.t.c| 24 ++--
- extra/pki/GNUmakefile | 4 +-
- ssl.c | 105 +++---
- ssl.t.c | 11 --
- 7 files changed, 125 insertions(+), 48 deletions(-)
-
-diff --git a/cachedsess.t.c b/cachedsess.t.c
-index 7daa472..49fb9e0 100644
a/cachedsess.t.c
-+++ b/cachedsess.t.c
-@@ -120,6 +120,7 @@ START_TEST(cache_dsess_03)
- }
- END_TEST
-
-+#if OPENSSL_VERSION_NUMBER < 0x1010
- START_TEST(cache_dsess_04)
- {
- SSL_SESSION *s1, *s2;
-@@ -145,6 +146,7 @@ START_TEST(cache_dsess_04)
- SSL_SESSION_free(s2);
- }
- END_TEST
-+#endif
-
- Suite *
- cachedsess_suite(void)
-@@ -159,7 +161,9 @@ cachedsess_suite(void)
- tcase_add_test(tc, cache_dsess_01);
- tcase_add_test(tc, cache_dsess_02);
- tcase_add_test(tc, cache_dsess_03);
-+#if OPENSSL_VERSION_NUMBER < 0x1010
- tcase_add_test(tc, cache_dsess_04);
-+#endif
- suite_add_tcase(s, tc);
-
- return s;
-diff --git a/cachefkcrt.t.c b/cachefkcrt.t.c
-index db5e365..d79fb77 100644
a/cachefkcrt.t.c
-+++ b/cachefkcrt.t.c
-@@ -89,6 +89,7 @@ START_TEST(cache_fkcrt_03)
- }
- END_TEST
-
-+#if OPENSSL_VERSION_NUMBER < 0x1010
- START_TEST(cache_fkcrt_04)
- {
- X509 *c1, *c2;
-@@ -116,6 +117,7 @@ START_TEST(cache_fkcrt_04)
- fail_unless(cachemgr_preinit() != -1, "reinit");
- }
- END_TEST
-+#endif
-
- Suite *
- cachefkcrt_suite(void)
-@@ -130,7 +132,9 @@ cachefkcrt_suite(void)
- tcase_add_test(tc, cache_fkcrt_01);
- tcase_add_test(tc, cache_fkcrt_02);
- tcase_add_test(tc, cache_fkcrt_03);
-+#if OPENSSL_VERSION_NUMBER < 0x1010
- tcase_add_test(tc, cache_fkcrt_04);
-+#endif
- suite_add_tcase(s, tc);
-
- return s;
-diff --git a/cachemgr.h b/cachemgr.h
-index 8ec7306..2a0fb0e 100644
a/cachemgr.h
-+++ b/cachemgr.h
-@@ -61,15 +61,20 @@ void cachemgr_gc(void);
- #define cachemgr_ssess_get(key, keysz) \
- cache_get(cachemgr_ssess, cachessess_mkkey((key), (keysz)))
- #define cachemgr_ssess_set(val) \
--cache_set(cachemgr_ssess, \
-- cachessess_mkkey((val)->session_id, \
-- (val)->session_id_length), \
-- cachessess_mkval(val))
-+{ \
-+unsigned int len; \
-+const unsigned char* id = SSL_SESSION_get_id(val, &len); \
-+cache_set(cachemgr_ssess, \
-+ cachessess_mkkey(id, len), \
-+ cachessess_mkval(val));\
-+}
- #define cachemgr_ssess_del(val) \
--cache_del(cachemgr_ssess, \
-- cachessess_mkkey((val)->session_id, \
-- (val)->session_id_length))
--
-+{ \
-+unsigned int len; \
-+const unsigned char* id = SSL_SESSION_get_id(val, &len); \
-+cache_del(cachemgr_ssess, \
-+ cachessess_mkkey(id, len)); \
-+}
- #define cachemgr_dsess_get(addr, addrlen, sni) \
- cache_get(cachemgr_dsess, cachedsess_mkkey((addr), (addrlen), (sni)))
- #define cachemgr_dsess_set(addr, addrlen, sni, val) \
-diff --git a/cachessess.t.c b/cachessess.t.c
-index 8da5287..b23b661 100644
a/cachessess.t.c
-+++ b/cachessess.t.c
-@@ -68,13 +68,16 @@ cachemgr_teardown(void)
- START_TEST(cache_ssess_01)
- {
- SSL_SESSION *s1, *s2;
-+ char* session_id;
-+ unsigned int len;
-
- s1 = ssl_session_from_file(TMP_SESS_FILE);
- fail_unless(!!s1, "creating session failed");
- fail_unless(ssl_session_is_valid(s1), "session invalid");
-
- cachemgr_ssess_set(s1);
-- s2 = cachemgr_ssess_get(s1->session_id, s1->session_id_length);
-+ session_id = SSL_SESSION_get_id(s1, &len);
-+ s2 = cachemgr_ssess_get(s
[arch-commits] Commit in sslsplit/trunk (2 files)
Date: Tuesday, March 21, 2017 @ 23:01:32
Author: jgc
Revision: 218235
upgpkg: sslsplit 0.5.0-2
OpenSSL 1.1.0
Added:
sslsplit/trunk/0003-Add-fixes-for-OpenSSL-1.1-while-retaining-1.0-compat.patch
Modified:
sslsplit/trunk/PKGBUILD
-+
0003-Add-fixes-for-OpenSSL-1.1-while-retaining-1.0-compat.patch | 510
++
PKGBUILD| 13
2 files changed, 520 insertions(+), 3 deletions(-)
Added: 0003-Add-fixes-for-OpenSSL-1.1-while-retaining-1.0-compat.patch
===
--- 0003-Add-fixes-for-OpenSSL-1.1-while-retaining-1.0-compat.patch
(rev 0)
+++ 0003-Add-fixes-for-OpenSSL-1.1-while-retaining-1.0-compat.patch
2017-03-21 23:01:32 UTC (rev 218235)
@@ -0,0 +1,510 @@
+From: Hilko Bengen
+Date: Tue, 8 Nov 2016 00:30:42 +0100
+Subject: Add fixes for OpenSSL 1.1 while retaining 1.0 compatibility
+
+---
+ cachedsess.t.c| 4 ++
+ cachefkcrt.t.c| 4 ++
+ cachemgr.h| 21 ++
+ cachessess.t.c| 24 ++--
+ extra/pki/GNUmakefile | 4 +-
+ ssl.c | 105 +++---
+ ssl.t.c | 11 --
+ 7 files changed, 125 insertions(+), 48 deletions(-)
+
+diff --git a/cachedsess.t.c b/cachedsess.t.c
+index 7daa472..49fb9e0 100644
+--- a/cachedsess.t.c
b/cachedsess.t.c
+@@ -120,6 +120,7 @@ START_TEST(cache_dsess_03)
+ }
+ END_TEST
+
++#if OPENSSL_VERSION_NUMBER < 0x1010
+ START_TEST(cache_dsess_04)
+ {
+ SSL_SESSION *s1, *s2;
+@@ -145,6 +146,7 @@ START_TEST(cache_dsess_04)
+ SSL_SESSION_free(s2);
+ }
+ END_TEST
++#endif
+
+ Suite *
+ cachedsess_suite(void)
+@@ -159,7 +161,9 @@ cachedsess_suite(void)
+ tcase_add_test(tc, cache_dsess_01);
+ tcase_add_test(tc, cache_dsess_02);
+ tcase_add_test(tc, cache_dsess_03);
++#if OPENSSL_VERSION_NUMBER < 0x1010
+ tcase_add_test(tc, cache_dsess_04);
++#endif
+ suite_add_tcase(s, tc);
+
+ return s;
+diff --git a/cachefkcrt.t.c b/cachefkcrt.t.c
+index db5e365..d79fb77 100644
+--- a/cachefkcrt.t.c
b/cachefkcrt.t.c
+@@ -89,6 +89,7 @@ START_TEST(cache_fkcrt_03)
+ }
+ END_TEST
+
++#if OPENSSL_VERSION_NUMBER < 0x1010
+ START_TEST(cache_fkcrt_04)
+ {
+ X509 *c1, *c2;
+@@ -116,6 +117,7 @@ START_TEST(cache_fkcrt_04)
+ fail_unless(cachemgr_preinit() != -1, "reinit");
+ }
+ END_TEST
++#endif
+
+ Suite *
+ cachefkcrt_suite(void)
+@@ -130,7 +132,9 @@ cachefkcrt_suite(void)
+ tcase_add_test(tc, cache_fkcrt_01);
+ tcase_add_test(tc, cache_fkcrt_02);
+ tcase_add_test(tc, cache_fkcrt_03);
++#if OPENSSL_VERSION_NUMBER < 0x1010
+ tcase_add_test(tc, cache_fkcrt_04);
++#endif
+ suite_add_tcase(s, tc);
+
+ return s;
+diff --git a/cachemgr.h b/cachemgr.h
+index 8ec7306..2a0fb0e 100644
+--- a/cachemgr.h
b/cachemgr.h
+@@ -61,15 +61,20 @@ void cachemgr_gc(void);
+ #define cachemgr_ssess_get(key, keysz) \
+ cache_get(cachemgr_ssess, cachessess_mkkey((key), (keysz)))
+ #define cachemgr_ssess_set(val) \
+-cache_set(cachemgr_ssess, \
+- cachessess_mkkey((val)->session_id, \
+- (val)->session_id_length), \
+- cachessess_mkval(val))
++{ \
++unsigned int len; \
++const unsigned char* id = SSL_SESSION_get_id(val, &len); \
++cache_set(cachemgr_ssess, \
++ cachessess_mkkey(id, len), \
++ cachessess_mkval(val));\
++}
+ #define cachemgr_ssess_del(val) \
+-cache_del(cachemgr_ssess, \
+- cachessess_mkkey((val)->session_id, \
+- (val)->session_id_length))
+-
++{ \
++unsigned int len; \
++const unsigned char* id = SSL_SESSION_get_id(val, &len); \
++cache_del(cachemgr_ssess, \
++ cachessess_mkkey(id, len)); \
++}
+ #define cachemgr_dsess_get(addr, addrlen, sni) \
+ cache_get(cachemgr_dsess, cachedsess_mkkey((addr), (addrlen), (sni)))
+ #define cachemgr_dsess_set(addr, addrlen, sni, val) \
+diff --git a/cachessess.t.c b/cachessess.t.c
+index 8da5287..b23b661 100644
+--- a/cachessess.t.c
b/cachessess.t.c
+@@ -68,13 +68,16 @@ cachemgr_teardown(void)
+ START_TEST(cache_ssess_01)
+ {
+ SSL_SESSION *s1, *s2;
++ char* session_id;
++ unsigned int len;
+
+ s1 = ssl_session_from_file(TMP_SESS_FILE);
+ fail_unless(!!s1, "creating session failed");
+ fail_unless(ssl_session_is_valid(s1), "session invalid");
+
+ cachemgr_ssess_set(s1);
+- s2 = cachemgr_ssess_get(s1->session_id, s1->session_id_length);
++ session_id = SSL_SESSION_get_id(s1, &len);
++ s2 = cachemgr_ssess_get(ses
