[med-svn] [dcmtk] 01/01: correct patch to also compile with openssl-1.0.2

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository dcmtk.

commit 4390c5a237e596ba77c4205d2fff314d3813df90
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Sat Jul 2 19:14:35 2016 +0000

    correct patch to also compile with openssl-1.0.2
---
 debian/patches/09_openssl-1.1.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/09_openssl-1.1.patch b/debian/patches/09_openssl-1.1.patch
index 0a3c03e..ba9851d 100644
--- a/debian/patches/09_openssl-1.1.patch
+++ b/debian/patches/09_openssl-1.1.patch
@@ -10,7 +10,7 @@ Bug-Debian: http://bugs.debian.org/828281
  
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L
 +#define SSL_CTX_get_cert_store(ctx) ctx->cert_store
-+#define EVP_PKEY_base_id(key) key->type;
++#define EVP_PKEY_base_id(key) EVP_PKEY_type(key->type)
 +#endif
 +
  extern "C" int DcmTLSTransportLayer_certificateValidationCallback(int ok, X509_STORE_CTX *storeContext);
@@ -84,7 +84,7 @@ Bug-Debian: http://bugs.debian.org/828281
  END_EXTERN_C
  
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#define EVP_PKEY_id(key) key->type;
++#define EVP_PKEY_id(key) key->type
 +#endif
 +
  SiCertificate::SiCertificate()
@@ -153,7 +153,7 @@ Bug-Debian: http://bugs.debian.org/828281
  END_EXTERN_C
  
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#define EVP_PKEY_id(key) key->type;
++#define EVP_PKEY_id(key) key->type
 +#endif
  
  /* buf     : buffer to write password into

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dcmtk.git