pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security qca2*: update to 2.2.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/d6eec266e7ec
branches: trunk
changeset: 322657:d6eec266e7ec
user: markd <markd%pkgsrc.org@localhost>
date: Thu Apr 25 23:35:28 2019 +0000
description:
qca2*: update to 2.2.1
Changes in 2.2
- support for openssl 1.1
- support for AES GCM and AES CCM modes
- new base64 convenience functions
- new botan2 support
- new hkdf support
- various build improvements and (deprecation) cleanups
There may be trouble building this release on windows. Feedback/input
would be very welcome.
(2.2.0 was not announced due to defects noticed after tagging)
diffstat:
security/qca2-gnupg/Makefile | 3 +-
security/qca2-ossl/Makefile | 3 +-
security/qca2-qt5-gnupg/Makefile | 3 +-
security/qca2-qt5-ossl/Makefile | 3 +-
security/qca2-qt5/Makefile | 3 +-
security/qca2/Makefile | 3 +-
security/qca2/Makefile.common | 6 +-
security/qca2/distinfo | 14 +-
security/qca2/patches/patch-plugins_qca-ossl_CMakeLists.txt | 15 -
security/qca2/patches/patch-plugins_qca-ossl_libcrypto-compat.c | 417 --
security/qca2/patches/patch-plugins_qca-ossl_libcrypto-compat.h | 64 -
security/qca2/patches/patch-plugins_qca-ossl_qca-ossl.cpp | 1503 ----------
12 files changed, 14 insertions(+), 2023 deletions(-)
diffs (truncated from 2122 to 300 lines):
diff -r abef8973500f -r d6eec266e7ec security/qca2-gnupg/Makefile
--- a/security/qca2-gnupg/Makefile Thu Apr 25 21:36:52 2019 +0000
+++ b/security/qca2-gnupg/Makefile Thu Apr 25 23:35:28 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2018/07/04 13:40:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.25 2019/04/25 23:35:28 markd Exp $
PKGNAME= qca2-gnupg-${DISTNAME:C/.*-//}
-PKGREVISION= 1
COMMENT= Cross-platform crypto API for QT - GnuPG plugin
diff -r abef8973500f -r d6eec266e7ec security/qca2-ossl/Makefile
--- a/security/qca2-ossl/Makefile Thu Apr 25 21:36:52 2019 +0000
+++ b/security/qca2-ossl/Makefile Thu Apr 25 23:35:28 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2018/07/04 13:40:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.38 2019/04/25 23:35:28 markd Exp $
PKGNAME= qca2-ossl-${DISTNAME:C/.*-//}
-PKGREVISION= 1
COMMENT= Cross-platform crypto API for QT - OpenSSL plugin
diff -r abef8973500f -r d6eec266e7ec security/qca2-qt5-gnupg/Makefile
--- a/security/qca2-qt5-gnupg/Makefile Thu Apr 25 21:36:52 2019 +0000
+++ b/security/qca2-qt5-gnupg/Makefile Thu Apr 25 23:35:28 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2019/04/03 00:33:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2019/04/25 23:35:28 markd Exp $
PKGNAME= qca2-qt5-gnupg-${DISTNAME:C/.*-//}
-PKGREVISION= 6
COMMENT= Cross-platform crypto API for QT5 - GnuPG plugin
diff -r abef8973500f -r d6eec266e7ec security/qca2-qt5-ossl/Makefile
--- a/security/qca2-qt5-ossl/Makefile Thu Apr 25 21:36:52 2019 +0000
+++ b/security/qca2-qt5-ossl/Makefile Thu Apr 25 23:35:28 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2019/04/03 00:33:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2019/04/25 23:35:28 markd Exp $
PKGNAME= qca2-qt5-ossl-${DISTNAME:C/.*-//}
-PKGREVISION= 6
COMMENT= Cross-platform crypto API for QT5 - OpenSSL plugin
diff -r abef8973500f -r d6eec266e7ec security/qca2-qt5/Makefile
--- a/security/qca2-qt5/Makefile Thu Apr 25 21:36:52 2019 +0000
+++ b/security/qca2-qt5/Makefile Thu Apr 25 23:35:28 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2019/04/03 00:33:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2019/04/25 23:35:28 markd Exp $
PKGNAME= qca2-qt5-${DISTNAME:C/.*-//}
-PKGREVISION= 6
COMMENT= Cross-platform crypto API for QT5
diff -r abef8973500f -r d6eec266e7ec security/qca2/Makefile
--- a/security/qca2/Makefile Thu Apr 25 21:36:52 2019 +0000
+++ b/security/qca2/Makefile Thu Apr 25 23:35:28 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2018/03/12 11:15:44 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2019/04/25 23:35:28 markd Exp $
PKGNAME= qca2-${DISTNAME:C/.*-//}
-PKGREVISION= 1
COMMENT= Cross-platform crypto API for QT
diff -r abef8973500f -r d6eec266e7ec security/qca2/Makefile.common
--- a/security/qca2/Makefile.common Thu Apr 25 21:36:52 2019 +0000
+++ b/security/qca2/Makefile.common Thu Apr 25 23:35:28 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.2 2018/07/04 13:40:36 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.3 2019/04/25 23:35:28 markd Exp $
-DISTNAME= qca-2.1.3
+DISTNAME= qca-2.2.1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_KDE:=qca/2.1.3/src/}
+MASTER_SITES= ${MASTER_SITE_KDE:=qca/2.2.1/}
EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff -r abef8973500f -r d6eec266e7ec security/qca2/distinfo
--- a/security/qca2/distinfo Thu Apr 25 21:36:52 2019 +0000
+++ b/security/qca2/distinfo Thu Apr 25 23:35:28 2019 +0000
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.9 2018/01/31 09:14:55 markd Exp $
+$NetBSD: distinfo,v 1.10 2019/04/25 23:35:28 markd Exp $
-SHA1 (qca-2.1.3.tar.xz) = b5426f9b0c0cdaec4a069091bb9fc476ef363289
-RMD160 (qca-2.1.3.tar.xz) = 3577bd164bdf41147cfa0e8b4c5db01bde7d20de
-SHA512 (qca-2.1.3.tar.xz) = 0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a
-Size (qca-2.1.3.tar.xz) = 686340 bytes
+SHA1 (qca-2.2.1.tar.xz) = 012f1259126f1ce40402f236c7531f3e1d1c89da
+RMD160 (qca-2.2.1.tar.xz) = dddc3cf240dc5424b9df13fc1bf41c8e04f3b814
+SHA512 (qca-2.2.1.tar.xz) = 3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
+Size (qca-2.2.1.tar.xz) = 691676 bytes
SHA1 (patch-CMakeLists.txt) = 4867c54f8bff523233a11201bdb021e6e81a10ed
-SHA1 (patch-plugins_qca-ossl_CMakeLists.txt) = a03e1c2e2d6c89b36060795f6f47c9b513dbf395
-SHA1 (patch-plugins_qca-ossl_libcrypto-compat.c) = 965e4db85e12df55057b3d030c568977b83fb708
-SHA1 (patch-plugins_qca-ossl_libcrypto-compat.h) = 957641557f6767e7c559d3cafba61060029d4e46
-SHA1 (patch-plugins_qca-ossl_qca-ossl.cpp) = bc1ed58f69b1a1c27f7e71b6d5c00a25a49cb37c
diff -r abef8973500f -r d6eec266e7ec security/qca2/patches/patch-plugins_qca-ossl_CMakeLists.txt
--- a/security/qca2/patches/patch-plugins_qca-ossl_CMakeLists.txt Thu Apr 25 21:36:52 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-plugins_qca-ossl_CMakeLists.txt,v 1.1 2018/01/31 09:14:55 markd Exp $
-
-openssl 1.1 support
-
---- plugins/qca-ossl/CMakeLists.txt.orig 2018-01-30 20:26:20.512731852 +0000
-+++ plugins/qca-ossl/CMakeLists.txt
-@@ -32,7 +32,7 @@ if(OPENSSL_FOUND)
- message(WARNING "qca-ossl will be compiled without SHA-0 digest algorithm support")
- endif(HAVE_OPENSSL_SHA0)
-
-- set(QCA_OSSL_SOURCES qca-ossl.cpp)
-+ set(QCA_OSSL_SOURCES libcrypto-compat.c qca-ossl.cpp)
-
- my_automoc( QCA_OSSL_SOURCES )
-
diff -r abef8973500f -r d6eec266e7ec security/qca2/patches/patch-plugins_qca-ossl_libcrypto-compat.c
--- a/security/qca2/patches/patch-plugins_qca-ossl_libcrypto-compat.c Thu Apr 25 21:36:52 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,417 +0,0 @@
-$NetBSD: patch-plugins_qca-ossl_libcrypto-compat.c,v 1.1 2018/01/31 09:14:55 markd Exp $
-
-openssl 1.1 support
-
---- plugins/qca-ossl/libcrypto-compat.c.orig 2018-01-30 20:34:52.547356534 +0000
-+++ plugins/qca-ossl/libcrypto-compat.c
-@@ -0,0 +1,410 @@
-+/*
-+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
-+ *
-+ * Licensed under the OpenSSL license (the "License"). You may not use
-+ * this file except in compliance with the License. You can obtain a copy
-+ * in the file LICENSE in the source distribution or at
-+ * https://www.openssl.org/source/license.html
-+ */
-+
-+#include <openssl/evp.h>
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+
-+#include <string.h>
-+#include <openssl/engine.h>
-+
-+static void *OPENSSL_zalloc(size_t num)
-+{
-+ void *ret = OPENSSL_malloc(num);
-+
-+ if (ret != NULL)
-+ memset(ret, 0, num);
-+ return ret;
-+}
-+
-+int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+ /* If the fields n and e in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL for n and e. d may be
-+ * left NULL (in case only the public key is used).
-+ */
-+ if ((r->n == NULL && n == NULL)
-+ || (r->e == NULL && e == NULL))
-+ return 0;
-+
-+ if (n != NULL) {
-+ BN_free(r->n);
-+ r->n = n;
-+ }
-+ if (e != NULL) {
-+ BN_free(r->e);
-+ r->e = e;
-+ }
-+ if (d != NULL) {
-+ BN_free(r->d);
-+ r->d = d;
-+ }
-+
-+ return 1;
-+}
-+
-+int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q)
-+{
-+ /* If the fields p and q in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL.
-+ */
-+ if ((r->p == NULL && p == NULL)
-+ || (r->q == NULL && q == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free(r->p);
-+ r->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free(r->q);
-+ r->q = q;
-+ }
-+
-+ return 1;
-+}
-+
-+int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp)
-+{
-+ /* If the fields dmp1, dmq1 and iqmp in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL.
-+ */
-+ if ((r->dmp1 == NULL && dmp1 == NULL)
-+ || (r->dmq1 == NULL && dmq1 == NULL)
-+ || (r->iqmp == NULL && iqmp == NULL))
-+ return 0;
-+
-+ if (dmp1 != NULL) {
-+ BN_free(r->dmp1);
-+ r->dmp1 = dmp1;
-+ }
-+ if (dmq1 != NULL) {
-+ BN_free(r->dmq1);
-+ r->dmq1 = dmq1;
-+ }
-+ if (iqmp != NULL) {
-+ BN_free(r->iqmp);
-+ r->iqmp = iqmp;
-+ }
-+
-+ return 1;
-+}
-+
-+void RSA_get0_key(const RSA *r,
-+ const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
-+{
-+ if (n != NULL)
-+ *n = r->n;
-+ if (e != NULL)
-+ *e = r->e;
-+ if (d != NULL)
-+ *d = r->d;
-+}
-+
-+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q)
-+{
-+ if (p != NULL)
-+ *p = r->p;
-+ if (q != NULL)
-+ *q = r->q;
-+}
-+
-+void RSA_get0_crt_params(const RSA *r,
-+ const BIGNUM **dmp1, const BIGNUM **dmq1,
-+ const BIGNUM **iqmp)
-+{
-+ if (dmp1 != NULL)
-+ *dmp1 = r->dmp1;
-+ if (dmq1 != NULL)
-+ *dmq1 = r->dmq1;
-+ if (iqmp != NULL)
-+ *iqmp = r->iqmp;
-+}
-+
-+void DSA_get0_pqg(const DSA *d,
-+ const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = d->p;
-+ if (q != NULL)
-+ *q = d->q;
-+ if (g != NULL)
-+ *g = d->g;
-+}
-+
-+int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+ /* If the fields p, q and g in d are NULL, the corresponding input
-+ * parameters MUST be non-NULL.
-+ */
-+ if ((d->p == NULL && p == NULL)
-+ || (d->q == NULL && q == NULL)
-+ || (d->g == NULL && g == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free(d->p);
-+ d->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free(d->q);
-+ d->q = q;
-+ }
-+ if (g != NULL) {
-+ BN_free(d->g);
-+ d->g = g;
-+ }
-+
Home |
Main Index |
Thread Index |
Old Index