Added synchronous and asynchronous PKCS calls.

[crypto.git] / lib / silcssh / silcssh_pkcs.c

diff --git a/lib/silcssh/silcssh_pkcs.c b/lib/silcssh/silcssh_pkcs.c
index d2b2a239c3bfa9c6418a2815aa207f51ebe89bfd..3772a79bc22f0631f63fc052e3f70b43ca3eaadf 100644 (file)
--- a/lib/silcssh/silcssh_pkcs.c
+++ b/lib/silcssh/silcssh_pkcs.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2007 Pekka Riikonen
+  Copyright (C) 2007 - 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
@@ -17,7 +17,7 @@
 
 */
 
-#include "silc.h"
+#include "silccrypto.h"
 #include "rsa.h"
 #include "dsa.h"
 #include "silcssh_pkcs.h"
@@ -573,8 +573,9 @@ SILC_PKCS_IMPORT_PRIVATE_KEY_FILE(silc_pkcs_ssh_import_private_key_file)
   }
 
   /* Decode the private key */
-  ret = silc_pkcs_ssh_import_private_key(pkcs, alg, filedata, filedata_len,
-                                        (void *)&privkey, ret_alg);
+  ret = silc_pkcs_ssh_import_private_key(pkcs, alg, NULL, 0, filedata,
+                                        filedata_len, (void *)&privkey,
+                                        ret_alg);
   silc_free(data);
 
   if (ret) {
@@ -1045,7 +1046,7 @@ SILC_PKCS_VERIFY(silc_pkcs_ssh_verify)
   /* Verify */
   op = pubkey->pkcs->verify(pubkey->pkcs, pubkey->public_key,
                            signature, signature_len,
-                           data, data_len, hash, rng,
+                           data, data_len, compute_hash, hash, rng,
                            verify_cb, context);
 
   silc_free(signame);