Merge branch 'topic/mm-fixes' of git://208.110.73.182/silc into silc.1.1.branch

[silc.git] / lib / silccrypt / silcpkcs1_i.h

diff --git a/lib/silccrypt/silcpkcs1_i.h b/lib/silccrypt/silcpkcs1_i.h
index 40899e0627371c08dba61996772cce7ce5ebf1ae..fd5ecb4fd91822c115d23cbe406938441b555420 100644 (file)
--- a/lib/silccrypt/silcpkcs1_i.h
+++ b/lib/silccrypt/silcpkcs1_i.h
@@ -24,18 +24,18 @@ SilcBool silc_pkcs1_generate_key(SilcUInt32 keylen,
                                 SilcRng rng,
                                 void **ret_public_key,
                                 void **ret_private_key);
-SilcBool silc_pkcs1_import_public_key(unsigned char *key,
-                                     SilcUInt32 key_len,
-                                     void **ret_public_key);
+int silc_pkcs1_import_public_key(unsigned char *key,
+                                SilcUInt32 key_len,
+                                void **ret_public_key);
 unsigned char *silc_pkcs1_export_public_key(void *public_key,
                                            SilcUInt32 *ret_len);
 SilcUInt32 silc_pkcs1_public_key_bitlen(void *public_key);
 void *silc_pkcs1_public_key_copy(void *public_key);
 SilcBool silc_pkcs1_public_key_compare(void *key1, void *key2);
 void silc_pkcs1_public_key_free(void *public_key);
-SilcBool silc_pkcs1_import_private_key(unsigned char *key,
-                                      SilcUInt32 key_len,
-                                      void **ret_private_key);
+int silc_pkcs1_import_private_key(unsigned char *key,
+                                 SilcUInt32 key_len,
+                                 void **ret_private_key);
 unsigned char *silc_pkcs1_export_private_key(void *private_key,
                                             SilcUInt32 *ret_len);
 SilcUInt32 silc_pkcs1_private_key_bitlen(void *private_key);
@@ -59,6 +59,7 @@ SilcBool silc_pkcs1_sign(void *private_key,
                         unsigned char *signature,
                         SilcUInt32 signature_size,
                         SilcUInt32 *ret_signature_len,
+                        SilcBool compute_hash,
                         SilcHash hash);
 SilcBool silc_pkcs1_verify(void *public_key,
                           unsigned char *signature,
@@ -72,6 +73,7 @@ SilcBool silc_pkcs1_sign_no_oid(void *private_key,
                                unsigned char *signature,
                                SilcUInt32 signature_size,
                                SilcUInt32 *ret_signature_len,
+                               SilcBool compute_hash,
                                SilcHash hash);
 SilcBool silc_pkcs1_verify_no_oid(void *public_key,
                                  unsigned char *signature,