[pkg-opensc-commit] [pkcs11-helper] 40/53: Update pkcs11.h

[Eric Dorland]

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

eric pushed a commit to tag pkcs11-helper-1.03
in repository pkcs11-helper.

commit d7e86ebaf0c67b3b903d024eb2b7b1cfbd6bc5f6
Author: alonbl <alonbl at 485eb718-1723-0410-b8a9-88cf21a28c35>
Date:   Sun May 6 19:24:32 2007 +0000

    Update pkcs11.h
---
 COPYING                            |  6 +++++-
 include/pkcs11-helper-1.0/pkcs11.h | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/COPYING b/COPYING
index 7810e3f..a94f6ad 100644
--- a/COPYING
+++ b/COPYING
@@ -70,6 +70,10 @@ m4 Macros License
 		Copyright (c) James Yonan <jim at yonan.net>
 		Copyright (c) Matthias Andree <matthias.andree at web.de>
 
+pkcs11.h License
+	Copyright 2006, 2007 g10 Code GmbH
+	Copyright 2006 Andreas Jellinghaus
+
 OpenSSL License (Optional component, parsing certificates, engine)
 
 	This product includes software developed by the OpenSSL Project
@@ -79,7 +83,7 @@ OpenSSL License (Optional component, parsing certificates, engine)
 	(eay at cryptsoft.com).  This product includes software written by Tim
 	Hudson (tjh at cryptsoft.com).
 
-GNUTLS License (Optional component, for a complete GPLed license, replaces OpenSSL)
+GnuTLS License (Optional component, for a complete GPLed license, replaces OpenSSL)
 
 	Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Nikos Mavroyanopoulos
 	See the end for copying conditions.
diff --git a/include/pkcs11-helper-1.0/pkcs11.h b/include/pkcs11-helper-1.0/pkcs11.h
index 115c309..2e6a1e3 100644
--- a/include/pkcs11-helper-1.0/pkcs11.h
+++ b/include/pkcs11-helper-1.0/pkcs11.h
@@ -1,5 +1,5 @@
 /* pkcs11.h
-   Copyright 2006 g10 Code GmbH
+   Copyright 2006, 2007 g10 Code GmbH
    Copyright 2006 Andreas Jellinghaus
 
    This file is free software; as a special exception the author gives
@@ -498,6 +498,12 @@ typedef unsigned long ck_mechanism_type_t;
 #define CKM_X9_42_DH_DERIVE		(0x31)
 #define CKM_X9_42_DH_HYBRID_DERIVE	(0x32)
 #define CKM_X9_42_MQV_DERIVE		(0x33)
+#define CKM_SHA256_RSA_PKCS		(0x40)
+#define CKM_SHA384_RSA_PKCS		(0x41)
+#define CKM_SHA512_RSA_PKCS		(0x42)
+#define CKM_SHA256_RSA_PKCS_PSS		(0x43)
+#define CKM_SHA384_RSA_PKCS_PSS		(0x44)
+#define CKM_SHA512_RSA_PKCS_PSS		(0x45)
 #define CKM_RC2_KEY_GEN			(0x100)
 #define CKM_RC2_ECB			(0x101)
 #define	CKM_RC2_CBC			(0x102)
@@ -540,6 +546,15 @@ typedef unsigned long ck_mechanism_type_t;
 #define CKM_RIPEMD160			(0x240)
 #define CKM_RIPEMD160_HMAC		(0x241)
 #define CKM_RIPEMD160_HMAC_GENERAL	(0x242)
+#define CKM_SHA256			(0x250)
+#define CKM_SHA256_HMAC			(0x251)
+#define CKM_SHA256_HMAC_GENERAL		(0x252)
+#define CKM_SHA384			(0x260)
+#define CKM_SHA384_HMAC			(0x261)
+#define CKM_SHA384_HMAC_GENERAL		(0x262)
+#define CKM_SHA512			(0x270)
+#define CKM_SHA512_HMAC			(0x271)
+#define CKM_SHA512_HMAC_GENERAL		(0x272)
 #define CKM_CAST_KEY_GEN		(0x300)
 #define CKM_CAST_ECB			(0x301)
 #define CKM_CAST_CBC			(0x302)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git