X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2Fsilcpk.c;h=cb9ef4229f3c695674728d7b91fcc3d14df41a2c;hb=9905799a86c606304fd7df2cd401de1740a272a1;hp=b0fd72835fcab0a660545a286e0b0117e8193d2e;hpb=484333112a32835340743aab4e07f511f14f31ef;p=silc.git diff --git a/lib/silccrypt/silcpk.c b/lib/silccrypt/silcpk.c index b0fd7283..cb9ef422 100644 --- a/lib/silccrypt/silcpk.c +++ b/lib/silccrypt/silcpk.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 1997 - 2006 Pekka Riikonen + Copyright (C) 1997 - 2007 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 @@ -863,7 +863,7 @@ SilcBool silc_pkcs_silc_import_private_key_file(unsigned char *filedata, silc_hash_final(sha1, keymat + 16); /* Set the key to the cipher */ - silc_cipher_set_key(aes, keymat, 256); + silc_cipher_set_key(aes, keymat, 256, FALSE); /* First, verify the MAC of the private key data */ mac_len = silc_hmac_len(sha1hmac); @@ -1275,7 +1275,7 @@ silc_pkcs_silc_export_private_key_file(void *private_key, silc_hash_final(sha1, keymat + 16); /* Set the key to the cipher */ - silc_cipher_set_key(aes, keymat, 256); + silc_cipher_set_key(aes, keymat, 256, TRUE); /* Encode the buffer to be encrypted. Add padding to it too, at least block size of the cipher. */ @@ -1529,7 +1529,8 @@ SilcBool silc_pkcs_silc_encrypt(void *public_key, SilcUInt32 src_len, unsigned char *dst, SilcUInt32 dst_size, - SilcUInt32 *ret_dst_len) + SilcUInt32 *ret_dst_len, + SilcRng rng) { SilcSILCPublicKey silc_pubkey = public_key; @@ -1538,7 +1539,7 @@ SilcBool silc_pkcs_silc_encrypt(void *public_key, return silc_pubkey->pkcs->encrypt(silc_pubkey->public_key, src, src_len, - dst, dst_size, ret_dst_len); + dst, dst_size, ret_dst_len, rng); } /* Decrypts as specified in SILC protocol specification */