This is an automated email from the git hooks/post-receive script.
grinorcole-guest pushed a commit to branch master
in repository libcrypt-openssl-pkcs12-perl.
commit 74352d867c315dcf5c45157049fcb6554263d97e
Author: Christopher Hoskin <christopher.hos...@gmail.com>
Date: Sun Nov 6 20:34:30 2016 +0000
Fix "FTBFS with openssl 1.1.0" - patch for new API (Closes: #828386)
---
debian/changelog | 6 ++++
debian/patches/openssl-1.1.patch | 67 ++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 74 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 9bbdc6d..759cee6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcrypt-openssl-pkcs12-perl (0.7-2) UNRELEASED; urgency=medium
+
+ * Fix "FTBFS with openssl 1.1.0" - patch for new API (Closes: #828386)
+
+ -- Christopher Hoskin <christopher.hos...@gmail.com> Sun, 06 Nov 2016
20:32:29 +0000
+
libcrypt-openssl-pkcs12-perl (0.7-1) unstable; urgency=low
* New upstream release (0.7)
diff --git a/debian/patches/openssl-1.1.patch b/debian/patches/openssl-1.1.patch
new file mode 100644
index 0000000..6e74790
--- /dev/null
+++ b/debian/patches/openssl-1.1.patch
@@ -0,0 +1,67 @@
+Description: Compatibility with OpenSSL 1.1.0
+Bug: https://github.com/dsully/perl-crypt-openssl-pkcs12/issues/8
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=828386
+Forwarded: https://github.com/dsully/perl-crypt-openssl-pkcs12/pull/10
+Author: Christopher Hoskin <christopher.hos...@gmail.com>
+Last-Update: 2016-11-06
+--- a/PKCS12.xs
++++ b/PKCS12.xs
+@@ -149,18 +149,18 @@
+ int dump_certs_pkeys_bag (BIO *bio, PKCS12_SAFEBAG *bag, char *pass, int
passlen, int options, char *pempass) {
+
+ EVP_PKEY *pkey;
+- PKCS8_PRIV_KEY_INFO *p8;
+ X509 *x509;
+
+ switch (M_PKCS12_bag_type(bag)) {
+
+- case NID_keyBag:
++ case NID_keyBag: ;
++ const PKCS8_PRIV_KEY_INFO *cp8;
+
+ if (options & NOKEYS) return 1;
+
+- p8 = bag->value.keybag;
++ cp8 = PKCS12_SAFEBAG_get0_p8inf(bag);
+
+- if (!(pkey = EVP_PKCS82PKEY (p8))) return 0;
++ if (!(pkey = EVP_PKCS82PKEY (cp8))) return 0;
+
+ PEM_write_bio_PrivateKey (bio, pkey, enc, NULL, 0, NULL, pempass);
+
+@@ -168,7 +168,8 @@
+
+ break;
+
+- case NID_pkcs8ShroudedKeyBag:
++ case NID_pkcs8ShroudedKeyBag: ;
++ PKCS8_PRIV_KEY_INFO *p8;
+
+ if (options & NOKEYS) return 1;
+
+@@ -192,7 +193,7 @@
+
+ if (options & NOCERTS) return 1;
+
+- if (PKCS12_get_attr(bag, NID_localKeyID)) {
++ if (PKCS12_SAFEBAG_get0_attr(bag, NID_localKeyID)) {
+
+ if (options & CACERTS) return 1;
+
+@@ -203,7 +204,7 @@
+
+ if (M_PKCS12_cert_bag_type(bag) != NID_x509Certificate) return 1;
+
+- if (!(x509 = M_PKCS12_certbag2x509(bag))) return 0;
++ if (!(x509 = PKCS12_certbag2x509(bag))) return 0;
+
+ PEM_write_bio_X509 (bio, x509);
+
+@@ -368,7 +369,6 @@
+
+ CRYPTO_cleanup_all_ex_data();
+ ERR_free_strings();
+- ERR_remove_state(0);
+ EVP_cleanup();
+
+ SV*
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5505fc5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+openssl-1.1.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libcrypt-openssl-pkcs12-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
