[libcrypt-openssl-pkcs12-perl] 04/06: Remove openssl-1.1.patch (accepted upstream)

[Christopher Stuart Hoskin]

This is an automated email from the git hooks/post-receive script.

mans0954 pushed a commit to branch master
in repository libcrypt-openssl-pkcs12-perl.

commit bdf9197f635bf74955af6bc797f537b5d53e76b4
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Sat Nov 25 06:44:26 2017 +0000

    Remove openssl-1.1.patch (accepted upstream)
---
 debian/changelog                 |  1 +
 debian/patches/openssl-1.1.patch | 67 ----------------------------------------
 debian/patches/series            |  1 -
 3 files changed, 1 insertion(+), 68 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c95e31a..49873aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libcrypt-openssl-pkcs12-perl (0.8-1) UNRELEASED; urgency=medium
 
   * New upstream release (0.8)
   * Use my Debian e-mail address in debian/control and debian/copyright
+  * Remove openssl-1.1.patch (accepted upstream)
 
  -- Christopher Hoskin <mans0954 at debian.org>  Sat, 25 Nov 2017 06:30:33 +0000
 
diff --git a/debian/patches/openssl-1.1.patch b/debian/patches/openssl-1.1.patch
deleted file mode 100644
index 9c67812..0000000
--- a/debian/patches/openssl-1.1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Description: Compatibility with OpenSSL 1.1.0
-Bug: https://github.com/dsully/perl-crypt-openssl-pkcs12/issues/8
-Bug-Debian: https://bugs.debian.org/828386
-Forwarded: https://github.com/dsully/perl-crypt-openssl-pkcs12/pull/10
-Author: Christopher Hoskin <christopher.hoskin at 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
deleted file mode 100644
index 5505fc5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-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