Update botan to 1.10.17

Minor library bump to libbotan-1.10.so.1.1
Patch it to compile with LibreSSL
Fix CVE-2017-14737
This commit is contained in:
bluhm 2017-10-09 20:06:26 +00:00
parent 03799861b8
commit 934f12a261
4 changed files with 39 additions and 8 deletions

View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.26 2017/07/26 22:45:29 sthen Exp $
# $OpenBSD: Makefile,v 1.27 2017/10/09 20:06:26 bluhm Exp $
ONLY_FOR_ARCHS = ${GCC4_ARCHS} ${CLANG_ARCHS}
COMMENT = portable, easy to use, and efficient C++ crypto library
PORTROACH = limit:^1\.10\.
VERSION = 1.10.16
VERSION = 1.10.17
DISTNAME = Botan-${VERSION}
PKGNAME = botan-${VERSION}
REVISION = 1
SHARED_LIBS = botan-1.10 1.0
SHARED_LIBS = botan-1.10 1.1
CATEGORIES = security

View File

@ -1,4 +1,4 @@
SHA256 (Botan-1.10.16.tgz) = bFRyQB0GUn6HrctT3ScPPJsftohwOwTdenz7hiie/lI=
SHA256 (Botan-1.10.16.tgz.asc) = N7L1pIgc+1UXTZsBUtOR8etktY1OYcdG1z1gMlb2+/0=
SIZE (Botan-1.10.16.tgz) = 2711177
SIZE (Botan-1.10.16.tgz.asc) = 488
SHA256 (Botan-1.10.17.tgz) = aEf/tkuNL5OdzP7MF70sgDhdCPdiHixW06M1EY6CNhM=
SHA256 (Botan-1.10.17.tgz.asc) = QD44oY8Ulc5j4OrNXkPniynPkY5PpBmyFctBMdZg/Hk=
SIZE (Botan-1.10.17.tgz) = 2706678
SIZE (Botan-1.10.17.tgz.asc) = 488

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_engine_openssl_ossl_bc_cpp,v 1.1 2017/10/09 20:06:26 bluhm Exp $
https://github.com/randombit/botan/commit/e61a5f56fb404db3655909be4ce23c3a816cbb60
Index: src/engine/openssl/ossl_bc.cpp
--- src/engine/openssl/ossl_bc.cpp.orig
+++ src/engine/openssl/ossl_bc.cpp
@@ -8,7 +8,7 @@
#include <botan/internal/openssl_engine.h>
#include <openssl/evp.h>
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
#error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x"
#endif

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_engine_openssl_ossl_md_cpp,v 1.1 2017/10/09 20:06:26 bluhm Exp $
https://github.com/randombit/botan/commit/e61a5f56fb404db3655909be4ce23c3a816cbb60
Index: src/engine/openssl/ossl_md.cpp
--- src/engine/openssl/ossl_md.cpp.orig
+++ src/engine/openssl/ossl_md.cpp
@@ -8,7 +8,7 @@
#include <botan/internal/openssl_engine.h>
#include <openssl/evp.h>
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
#error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x"
#endif