[Pkg-ocaml-maint-commits] [SCM] ocaml-ssl packaging branch, master, updated. debian/0.4.4-2-1-g48779c7

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 48779c721e678878b785104a051fa6d338cbed7a
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Apr 18 11:13:24 2011 +0200

    Drop SSLv2 constructor from Ssl interface

diff --git a/debian/changelog b/debian/changelog
index cffbe8e..f6e2354 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-ssl (0.4.4-3) unstable; urgency=low
+
+  * Drop SSLv2 constructor from Ssl interface (follows fix to #622144)
+
+ -- Stéphane Glondu <glondu at debian.org>  Mon, 18 Apr 2011 11:14:38 +0200
+
 ocaml-ssl (0.4.4-2) unstable; urgency=low
 
   * Drop SSLv2 support (Closes: #622144)
diff --git a/debian/patches/0001-Drop-SSLv2-support.patch b/debian/patches/0001-Drop-SSLv2-support.patch
index a198646..60cee8a 100644
--- a/debian/patches/0001-Drop-SSLv2-support.patch
+++ b/debian/patches/0001-Drop-SSLv2-support.patch
@@ -1,25 +1,47 @@
 From: Stephane Glondu <steph at glondu.net>
 Date: Mon, 11 Apr 2011 23:01:54 +0200
-Subject: [PATCH] Drop SSLv2 support
+Subject: Drop SSLv2 support
 
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622144
 Signed-off-by: Stephane Glondu <steph at glondu.net>
 ---
- src/ssl_stubs.c |   17 -----------------
- 1 files changed, 0 insertions(+), 17 deletions(-)
+ src/ssl.ml      |    1 -
+ src/ssl.mli     |    1 -
+ src/ssl_stubs.c |   21 ++-------------------
+ 3 files changed, 2 insertions(+), 21 deletions(-)
 
+diff --git a/src/ssl.ml b/src/ssl.ml
+index b5fa287..eea852e 100644
+--- a/src/ssl.ml
++++ b/src/ssl.ml
+@@ -21,7 +21,6 @@
+ (* $Id: ssl.ml 2683 2006-08-28 14:53:19Z smimram $ *)
+ 
+ type protocol =
+-  | SSLv2
+   | SSLv23
+   | SSLv3
+   | TLSv1
+diff --git a/src/ssl.mli b/src/ssl.mli
+index 6a3ddd9..d1f7557 100644
+--- a/src/ssl.mli
++++ b/src/ssl.mli
+@@ -122,7 +122,6 @@ val get_error_string : unit -> string
+ 
+ (** Protocol used by SSL. *)
+ type protocol =
+-  | SSLv2 (** SSL v2 protocol *)
+   | SSLv23 (** SSL v3 protocol but can rollback to v2 *)
+   | SSLv3 (** SSL v3 protocol *)
+   | TLSv1 (** TLS v1 protocol *)
 diff --git a/src/ssl_stubs.c b/src/ssl_stubs.c
-index 995ca99..09c173b 100644
+index 995ca99..bf59232 100644
 --- a/src/ssl_stubs.c
 +++ b/src/ssl_stubs.c
-@@ -157,23 +157,6 @@ static SSL_METHOD *get_method(int protocol, int type)
-   caml_enter_blocking_section();
-   switch (protocol)
-   {
--    case 0:
--      switch (type)
--      {
--        case 0:
+@@ -161,23 +161,6 @@ static SSL_METHOD *get_method(int protocol, int type)
+       switch (type)
+       {
+         case 0:
 -          method = SSLv2_client_method();
 -          break;
 -
@@ -33,7 +55,29 @@ index 995ca99..09c173b 100644
 -      }
 -      break;
 -
-     case 1:
+-    case 1:
+-      switch (type)
+-      {
+-        case 0:
+           method = SSLv23_client_method();
+           break;
+ 
+@@ -191,7 +174,7 @@ static SSL_METHOD *get_method(int protocol, int type)
+       }
+       break;
+ 
+-    case 2:
++    case 1:
+       switch (type)
+       {
+         case 0:
+@@ -208,7 +191,7 @@ static SSL_METHOD *get_method(int protocol, int type)
+       }
+       break;
+ 
+-    case 3:
++    case 2:
        switch (type)
        {
+         case 0:
 -- 

-- 
ocaml-ssl packaging