Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (695945b6b730a5ed2e06aa772b112ff32e35f8b1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (695945b6b730a5ed2e06aa772b112ff32e35f8b1)
  • Date: Sat, 5 Aug 2017 12:36:12 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

crypto/libp11/HISTORY | 3 +++
crypto/libp11/PRE_BUILD | 3 +++
crypto/libp11/patches/libressl.patch | 22 ++++++++++++++++++++++
3 files changed, 28 insertions(+)

New commits:
commit 695945b6b730a5ed2e06aa772b112ff32e35f8b1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libp11 - fix build with libressl

diff --git a/crypto/libp11/HISTORY b/crypto/libp11/HISTORY
index 0e1f986..7a61cbf 100644
--- a/crypto/libp11/HISTORY
+++ b/crypto/libp11/HISTORY
@@ -1,3 +1,6 @@
+2017-08-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD patches/*: added - fix build with libressl
+
2017-07-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4.7
now at github
diff --git a/crypto/libp11/PRE_BUILD b/crypto/libp11/PRE_BUILD
new file mode 100755
index 0000000..922c0ab
--- /dev/null
+++ b/crypto/libp11/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/crypto/libp11/patches/libressl.patch
b/crypto/libp11/patches/libressl.patch
new file mode 100644
index 0000000..ebff65b
--- /dev/null
+++ b/crypto/libp11/patches/libressl.patch
@@ -0,0 +1,22 @@
+--- a/src/p11_front.c.orig 2017-08-05 14:17:47.255547585 +0200
++++ a/src/p11_front.c 2017-08-05 14:19:15.503800488 +0200
+@@ -380,7 +380,7 @@
+
+ void ERR_load_PKCS11_strings(void)
+ {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
+ #endif
+ ERR_load_P11_strings();
+--- a/src/eng_front.c.orig 2017-08-05 14:23:48.944584133 +0200
++++ 1/src/eng_front.c 2017-08-05 14:25:59.552960821 +0200
+@@ -226,7 +226,7 @@
+ #ifndef OPENSSL_NO_RSA
+ !ENGINE_set_RSA(e, PKCS11_get_rsa_method()) ||
+ #endif
+-#if OPENSSL_VERSION_NUMBER >= 0x10100002L
++#if OPENSSL_VERSION_NUMBER >= 0x10100002L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ #ifndef OPENSSL_NO_EC
+ /* PKCS11_get_ec_key_method combines ECDSA and ECDH */
+ !ENGINE_set_EC(e, PKCS11_get_ec_key_method()) ||



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (695945b6b730a5ed2e06aa772b112ff32e35f8b1), Treeve Jelbert, 08/05/2017

Archive powered by MHonArc 2.6.24.

Top of Page