[Pkg-ocaml-maint-commits] [ocaml-ssl] 01/03: Use accessor functions for X509_STORE_CTX (Closes: #828462)

[Mehdi Dogguy]

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

mehdi pushed a commit to branch master
in repository ocaml-ssl.

commit 07d761bd42a1bb837e5bfb4638477c291c104b82
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Nov 3 00:43:44 2016 +0100

    Use accessor functions for X509_STORE_CTX (Closes: #828462)
---
 debian/changelog                                   |  7 +++++
 ...Use-accessor-functions-for-X509_STORE_CTX.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 43 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index eee4d34..855c370 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-ssl (0.5.2-2) UNRELEASED; urgency=medium
+
+  * Use accessor functions for X509_STORE_CTX (Closes: #828462).
+    - add 0001-Use-accessor-functions-for-X509_STORE_CTX.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 03 Nov 2016 00:42:43 +0100
+
 ocaml-ssl (0.5.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/0001-Use-accessor-functions-for-X509_STORE_CTX.patch b/debian/patches/0001-Use-accessor-functions-for-X509_STORE_CTX.patch
new file mode 100644
index 0000000..7771d85
--- /dev/null
+++ b/debian/patches/0001-Use-accessor-functions-for-X509_STORE_CTX.patch
@@ -0,0 +1,35 @@
+From: Samuel Mimram <smimram at gmail.com>
+Date: Thu, 3 Nov 2016 00:41:56 +0100
+Subject: Use accessor functions for X509_STORE_CTX
+
+  Upstream: https://github.com/savonet/ocaml-ssl/commit/e49b6a741ac7a86057acb7bdef609e67491b292e
+---
+ src/ssl_stubs.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/ssl_stubs.c b/src/ssl_stubs.c
+index 1b175fa..b8781ef 100644
+--- a/src/ssl_stubs.c
++++ b/src/ssl_stubs.c
+@@ -656,7 +656,7 @@ CAMLprim value ocaml_ssl_get_cipher_name(value vcipher)
+ 
+ CAMLprim value ocaml_ssl_get_cipher_version(value vcipher)
+ {
+-  char *version;
++  const char *version;
+   SSL_CIPHER *cipher = (SSL_CIPHER*)vcipher;
+ 
+   caml_enter_blocking_section();
+@@ -1228,9 +1228,9 @@ static int client_verify_callback(int ok, X509_STORE_CTX *ctx)
+   int depth, error;
+   char *xs;
+ 
+-  depth = ctx->error_depth;
+-  error = ctx->error;
+-  xs = (char *)X509_STORE_CTX_get_current_cert(ctx);
++  depth = X509_STORE_CTX_get_error_depth(ctx);
++  error = X509_STORE_CTX_get_error(ctx);
++  xs = (char*)X509_STORE_CTX_get_current_cert(ctx);
+ 
+   subject = issuer = NULL;
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..195b265
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Use-accessor-functions-for-X509_STORE_CTX.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-ssl.git