X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2Fsilcpkcs_i.h;h=7d6661126df5935fb810aa0f439fbdfd47a2d37b;hb=bd548b5771a325d3dc051887d3fd0225550d4418;hp=1321f0a3d31279d6250cd8912f83feaba2ac2d87;hpb=e0ab4ae1e6e96ab2bed087da2a19947d7a2cb22a;p=crypto.git

diff --git a/lib/silccrypt/silcpkcs_i.h b/lib/silccrypt/silcpkcs_i.h
index 1321f0a3..7d666112 100644
--- a/lib/silccrypt/silcpkcs_i.h
+++ b/lib/silccrypt/silcpkcs_i.h
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2007 Pekka Riikonen
+  Copyright (C) 1997 - 2008 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 
 #define SILC_PKCS_ALG_IMPORT_PUBLIC_KEY(name)				\
   int name(const struct SilcPKCSAlgorithmStruct *pkcs,			\
-	   void *key, SilcUInt32 key_len,				\
+	   void *key, SilcUInt32 key_len,			\
 	   void **ret_public_key)
 
 #define SILC_PKCS_ALG_EXPORT_PUBLIC_KEY(name)				\
@@ -60,7 +60,8 @@
 
 #define SILC_PKCS_ALG_IMPORT_PRIVATE_KEY(name)				\
   int name(const struct SilcPKCSAlgorithmStruct *pkcs,			\
-	   void *key, SilcUInt32 key_len, void **ret_private_key)
+	   void *key, SilcUInt32 key_len,				\
+	   void **ret_private_key)
 
 #define SILC_PKCS_ALG_EXPORT_PRIVATE_KEY(name)				\
   unsigned char *name(const struct SilcPKCSAlgorithmStruct *pkcs,	\
@@ -99,6 +100,7 @@
 			  SilcUInt32 src_len,				\
 			  SilcBool compute_hash,			\
 			  SilcHash hash,				\
+			  SilcRng rng,					\
 			  SilcPKCSSignCb sign_cb,			\
 			  void *context)
 
@@ -109,7 +111,9 @@
 			  SilcUInt32 signature_len,			\
 			  unsigned char *data,				\
 			  SilcUInt32 data_len,				\
+			  SilcBool compute_hash,			\
 			  SilcHash hash,				\
+			  SilcRng rng,					\
 			  SilcPKCSVerifyCb verify_cb,			\
 			  void *context)
 
@@ -189,9 +193,10 @@ struct SilcPKCSAlgorithmStruct {
 		SilcPKCSFileEncoding encoding, void **ret_public_key,	\
 		const struct SilcPKCSAlgorithmStruct **ret_alg)
 
-#define SILC_PKCS_IMPORT_PUBLIC_KEY(name)			\
-  int name(const struct SilcPKCSObjectStruct *pkcs, void *key,	\
-	   SilcUInt32 key_len, void **ret_public_key,		\
+#define SILC_PKCS_IMPORT_PUBLIC_KEY(name)				\
+  int name(const struct SilcPKCSObjectStruct *pkcs,			\
+	   const struct SilcPKCSAlgorithmStruct *alg,			\
+	   void *key, SilcUInt32 key_len, void **ret_public_key,	\
 	   const struct SilcPKCSAlgorithmStruct **ret_alg)
 
 #define SILC_PKCS_EXPORT_PUBLIC_KEY_FILE(name)			\
@@ -225,9 +230,11 @@ struct SilcPKCSAlgorithmStruct {
 		SilcPKCSFileEncoding encoding, void **ret_private_key,	\
 		const struct SilcPKCSAlgorithmStruct **ret_alg)
 
-#define SILC_PKCS_IMPORT_PRIVATE_KEY(name)			\
-  int name(const struct SilcPKCSObjectStruct *pkcs, void *key,	\
-	   SilcUInt32 key_len, void **ret_private_key,		\
+#define SILC_PKCS_IMPORT_PRIVATE_KEY(name)				\
+  int name(const struct SilcPKCSObjectStruct *pkcs,			\
+	   const struct SilcPKCSAlgorithmStruct *alg,			\
+	   const char *passphrase, SilcUInt32 passphrase_len,		\
+	   void *key, SilcUInt32 key_len, void **ret_private_key,	\
 	   const struct SilcPKCSAlgorithmStruct **ret_alg)
 
 #define SILC_PKCS_EXPORT_PRIVATE_KEY_FILE(name)				\
@@ -271,6 +278,7 @@ struct SilcPKCSAlgorithmStruct {
 			  SilcUInt32 src_len,				\
 			  SilcBool compute_hash,			\
 			  SilcHash hash,				\
+			  SilcRng rng,					\
 			  SilcPKCSSignCb sign_cb,			\
 			  void *context)
 
@@ -281,7 +289,9 @@ struct SilcPKCSAlgorithmStruct {
 			  SilcUInt32 signature_len,			\
 			  unsigned char *data,				\
 			  SilcUInt32 data_len,				\
+			  SilcBool compute_hash,			\
 			  SilcHash hash,				\
+			  SilcRng rng,					\
 			  SilcPKCSVerifyCb verify_cb,			\
 			  void *context)
 
@@ -352,4 +362,8 @@ struct SilcPKCSObjectStruct {
   SILC_PKCS_VERIFY((*verify));
 };
 
+/* Backwards support for PKCS API */
+
+#define silc_pkcs_get_context silc_pkcs_public_key_get_pkcs
+
 #endif /* SILCPKCS_I_H */