From 3cceddcb018981b11928b8fba08ae1dab8a9f251 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Thu, 3 Sep 2020 10:41:58 +0300 Subject: bearssl: move to extra --- core/bearssl/build | 29 ----------- core/bearssl/checksums | 3 -- ...-return-in-client-single-EC-choose-functi.patch | 25 --------- ...ns-to-retrieve-certificate-validity-perio.patch | 60 ---------------------- core/bearssl/sources | 3 -- core/bearssl/version | 1 - 6 files changed, 121 deletions(-) delete mode 100755 core/bearssl/build delete mode 100644 core/bearssl/checksums delete mode 100644 core/bearssl/patches/0001-Add-missing-return-in-client-single-EC-choose-functi.patch delete mode 100644 core/bearssl/patches/0002-Add-functions-to-retrieve-certificate-validity-perio.patch delete mode 100644 core/bearssl/sources delete mode 100644 core/bearssl/version (limited to 'core') diff --git a/core/bearssl/build b/core/bearssl/build deleted file mode 100755 index 21bbd789..00000000 --- a/core/bearssl/build +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -e - -for patch in *.patch; do - patch -p1 < "$patch" -done - -kinstall() { - mkdir -p "${3%/*}"; cp "$2" "$3" - chmod "$1" "$3" -} - -make - -# Build static binary for bearssl, word splitting on CFLAGS is intentional. -# shellcheck disable=2086 -"${CC:-cc}" \ - -static $CFLAGS \ - -I ./inc \ - -include tools/brssl.h \ - tools/*.c \ - build/libbearssl.a \ - -o brssl - - -kinstall 755 brssl "$1/usr/bin/brssl" -kinstall 644 build/libbearssl.a "$1/usr/lib/libbearssl.a" -kinstall 755 build/libbearssl.so "$1/usr/lib/libbearssl.so" - -mv inc "$1/usr/include" diff --git a/core/bearssl/checksums b/core/bearssl/checksums deleted file mode 100644 index cd6661bf..00000000 --- a/core/bearssl/checksums +++ /dev/null @@ -1,3 +0,0 @@ -6705bba1714961b41a728dfc5debbe348d2966c117649392f8c8139efc83ff14 bearssl-0.6.tar.gz -ad783bbbbb58bbdad66af299c5a0ea5389474a7d7256391673fe94e88f11fbef 0001-Add-missing-return-in-client-single-EC-choose-functi.patch -414fd90fc27353ae3ca2478b68891715088de8b6cf6b81927ed8337df63f47e4 0002-Add-functions-to-retrieve-certificate-validity-perio.patch diff --git a/core/bearssl/patches/0001-Add-missing-return-in-client-single-EC-choose-functi.patch b/core/bearssl/patches/0001-Add-missing-return-in-client-single-EC-choose-functi.patch deleted file mode 100644 index 421bbc7f..00000000 --- a/core/bearssl/patches/0001-Add-missing-return-in-client-single-EC-choose-functi.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a5c3ea02385205858128e414873a0150cd8bceda Mon Sep 17 00:00:00 2001 -From: Michael Forney -Date: Fri, 31 Jan 2020 15:11:32 -0800 -Subject: [PATCH] Add missing return in client single EC choose function - -Otherwise, static ECDH is never selected. ---- - src/ssl/ssl_ccert_single_ec.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ssl/ssl_ccert_single_ec.c b/src/ssl/ssl_ccert_single_ec.c -index 93ebcde..2e1e54f 100644 ---- a/src/ssl/ssl_ccert_single_ec.c -+++ b/src/ssl/ssl_ccert_single_ec.c -@@ -69,6 +69,7 @@ cc_choose(const br_ssl_client_certificate_class **pctx, - choices->hash_id = -1; - choices->chain = zc->chain; - choices->chain_len = zc->chain_len; -+ return; - } - } - --- -2.25.0 - diff --git a/core/bearssl/patches/0002-Add-functions-to-retrieve-certificate-validity-perio.patch b/core/bearssl/patches/0002-Add-functions-to-retrieve-certificate-validity-perio.patch deleted file mode 100644 index 8377da4d..00000000 --- a/core/bearssl/patches/0002-Add-functions-to-retrieve-certificate-validity-perio.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 31fdee5b9d8fc63c850222768dcd097e43da0116 Mon Sep 17 00:00:00 2001 -From: Michael Forney -Date: Thu, 26 Mar 2020 14:17:19 -0700 -Subject: [PATCH] Add functions to retrieve certificate validity period from - br_x509_decoder. - ---- - inc/bearssl_x509.h | 36 ++++++++++++++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) - -diff --git a/inc/bearssl_x509.h b/inc/bearssl_x509.h -index 49d2fba..9d43e15 100644 ---- a/inc/bearssl_x509.h -+++ b/inc/bearssl_x509.h -@@ -1045,6 +1045,42 @@ br_x509_decoder_last_error(br_x509_decoder_context *ctx) - return 0; - } - -+/** -+ * \brief Get the time when the certificate becomes valid. -+ * -+ * The time is represented the same as in `br_x509_minimal_set_time()`. -+ * These values should not be read before decoding completed successfully. -+ * -+ * \param ctx X.509 decoder context. -+ * \param days receives the days since January 1st, 0 AD. -+ * \param seconds receives the seconds since midnight (0 to 86400). -+ */ -+static inline void -+br_x509_decoder_get_notbefore(br_x509_decoder_context *ctx, -+ uint32_t *days, uint32_t *seconds) -+{ -+ *days = ctx->notbefore_days; -+ *seconds = ctx->notbefore_seconds; -+} -+ -+/** -+ * \brief Get the time when the certificate is no longer valid. -+ * -+ * The time is represented the same as in `br_x509_minimal_set_time()`. -+ * These values should not be read before decoding completed successfully. -+ * -+ * \param ctx X.509 decoder context. -+ * \param days receives the days since January 1st, 0 AD. -+ * \param seconds receives the seconds since midnight (0 to 86400). -+ */ -+static inline void -+br_x509_decoder_get_notafter(br_x509_decoder_context *ctx, -+ uint32_t *days, uint32_t *seconds) -+{ -+ *days = ctx->notafter_days; -+ *seconds = ctx->notafter_seconds; -+} -+ - /** - * \brief Get the "isCA" flag from an X.509 decoder context. - * --- -2.26.0 - diff --git a/core/bearssl/sources b/core/bearssl/sources deleted file mode 100644 index 3d637087..00000000 --- a/core/bearssl/sources +++ /dev/null @@ -1,3 +0,0 @@ -https://bearssl.org/bearssl-0.6.tar.gz -patches/0001-Add-missing-return-in-client-single-EC-choose-functi.patch -patches/0002-Add-functions-to-retrieve-certificate-validity-perio.patch diff --git a/core/bearssl/version b/core/bearssl/version deleted file mode 100644 index 28c26d58..00000000 --- a/core/bearssl/version +++ /dev/null @@ -1 +0,0 @@ -0.6 2 -- cgit v1.2.3