[debian-edu-commits] debian-edu/ 08/50: Remove all references to opencryptoki.

[Unit 193]

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

unit193-guest pushed a commit to branch master
in repository veracrypt.

commit 497b108ab15fce1750a20710819edb207c659208
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Sat Feb 14 15:26:47 2015 -0500

    Remove all references to opencryptoki.
---
 debian/README.Debian                       |  9 -----
 debian/control                             |  1 -
 debian/patches/000-opencryptoki-2.2.8.diff | 61 ------------------------------
 debian/patches/series                      |  1 -
 4 files changed, 72 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 47e9e18..7642a48 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -24,12 +24,3 @@ these ways:
 
 - The user manual is installed in /usr/share/doc/veracrypt as opposed to
   /usr/share/veracrypt/doc.
-
-- This package uses libopencryptoki for the PKCS#11 headers rather than
-  including the ones from RSA (they are not included with the VeraCrypt
-  sources). These only implement PKCS#11 v2.11 rather than v2.20. The v2.20
-  headers define a few error codes that the v2.11 ones don't.  This does not
-  impact VeraCrypt functionality as it only uses them to map error codes back to
-  strings and will use the hex value of the code as a fallback. Secondly, there
-  does not appear to be a PCKS#11 v2.20 implementation in Debian at the moment
-  anyway, so they're also rather unlikely to appear.
diff --git a/debian/control b/debian/control
index c63de88..3436bd9 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Build-Depends: debhelper (>= 9),
                imagemagick,
                libappindicator-dev,
                libfuse-dev,
-#               libopencryptoki-dev,
                libwxgtk3.0-dev,
                makeself,
                nasm (>= 2.08.01) [any-i386 any-amd64],
diff --git a/debian/patches/000-opencryptoki-2.2.8.diff b/debian/patches/000-opencryptoki-2.2.8.diff
deleted file mode 100644
index f8a3b56..0000000
--- a/debian/patches/000-opencryptoki-2.2.8.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Francis Russell <francis at unchartedbackwaters.co.uk>
-Date: Mon, 14 Jan 2013 11:44
-Subject: Enable us to use libopencryptoki
-
-This package uses libopencryptoki for the PKCS#11 headers rather than
-including the ones from RSA (they are not included with the VeraCrypt
-sources). These only implement PKCS#11 v2.11 rather than v2.20. The v2.20
-headers define a few error codes that the v2.11 ones don't.  This does not
-impact VeraCrypt functionality as it only uses them to map error codes back to
-strings and will use the hex value of the code as a fallback. Secondly, there
-does not appear to be a PCKS#11 v2.20 implementation in Debian at the moment
-anyway, so they're also rather unlikely to appear.
-
-Forwarded: no
-
---- veracrypt.orig/src/Common/SecurityToken.cpp	2009-11-08 01:24:41.000000000 +0000
-+++ veracrypt/src/Common/SecurityToken.cpp	2009-11-08 01:29:30.000000000 +0000
-@@ -657,9 +657,15 @@
- 			TC_TOKEN_ERR (CKR_CRYPTOKI_ALREADY_INITIALIZED)
- 			TC_TOKEN_ERR (CKR_MUTEX_BAD)
- 			TC_TOKEN_ERR (CKR_MUTEX_NOT_LOCKED)
-+
-+                        /*
-+			These error codes do not exist in PKCS#11 v2.11.
-+			Removing them simply causes the error description strings to be returned as hex.
-+
- 			TC_TOKEN_ERR (CKR_NEW_PIN_MODE)
- 			TC_TOKEN_ERR (CKR_NEXT_OTP)
- 			TC_TOKEN_ERR (CKR_FUNCTION_REJECTED)
-+			*/
- 
- #undef		TC_TOKEN_ERR
- 		};
-diff -ur veracrypt.orig/src/Common/SecurityToken.h veracrypt/src/Common/SecurityToken.h
---- veracrypt.orig/src/Common/SecurityToken.h	2009-11-08 01:24:41.000000000 +0000
-+++ veracrypt/src/Common/SecurityToken.h	2009-11-08 01:27:01.000000000 +0000
-@@ -19,6 +19,15 @@
- #ifndef NULL_PTR
- #	define NULL_PTR 0
- #endif
-+
-+#ifndef CK_TRUE
-+#	define CK_TRUE TRUE
-+#endif
-+
-+#ifndef CK_FALSE
-+#	define CK_FALSE FALSE
-+#endif
-+
- #define CK_PTR *
- #define CK_CALLBACK_FUNCTION(RET_TYPE, NAME) RET_TYPE (* NAME)
- 
-@@ -40,7 +49,7 @@
- #	define CK_DECLARE_FUNCTION(RET_TYPE, NAME) RET_TYPE NAME
- #	define CK_DECLARE_FUNCTION_POINTER(RET_TYPE, NAME) RET_TYPE (* NAME)
- 
--#	include <pkcs11.h>
-+#	include <opencryptoki/pkcs11.h>
- 
- #endif // !TC_WINDOWS
- 
diff --git a/debian/patches/series b/debian/patches/series
index bc54693..da7a887 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-#000-opencryptoki-2.2.8.diff
 001-user-guide-location.diff
 002-build-flags.diff
 003-file-manager.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/veracrypt.git