Mercurial > dropbear
diff libtomcrypt/src/misc/pkcs5/pkcs_5_1.c @ 1439:8d24733026c5 coverity
merge
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Sat, 24 Jun 2017 23:33:16 +0800 |
parents | f849a5ca2efc |
children | 6dba84798cd5 |
line wrap: on
line diff
--- a/libtomcrypt/src/misc/pkcs5/pkcs_5_1.c Sat Jun 03 00:10:58 2017 +0800 +++ b/libtomcrypt/src/misc/pkcs5/pkcs_5_1.c Sat Jun 24 23:33:16 2017 +0800 @@ -6,21 +6,21 @@ * The library is free for all purposes without any express * guarantee it works. * - * Tom St Denis, [email protected], http://libtomcrypt.com + * Tom St Denis, [email protected], http://libtom.org */ #include <tomcrypt.h> /** @file pkcs_5_1.c - PKCS #5, Algorithm #1, Tom St Denis + LTC_PKCS #5, Algorithm #1, Tom St Denis */ -#ifdef PKCS_5 +#ifdef LTC_PKCS_5 /** - Execute PKCS #5 v1 + Execute LTC_PKCS #5 v1 @param password The password (or key) @param password_len The length of the password (octet) @param salt The salt (or nonce) which is 8 octets long - @param iteration_count The PKCS #5 v1 iteration count + @param iteration_count The LTC_PKCS #5 v1 iteration count @param hash_idx The index of the hash desired @param out [out] The destination for this algorithm @param outlen [in/out] The max size and resulting size of the algorithm output @@ -101,6 +101,6 @@ #endif -/* $Source: /cvs/libtom/libtomcrypt/src/misc/pkcs5/pkcs_5_1.c,v $ */ -/* $Revision: 1.5 $ */ -/* $Date: 2006/03/31 14:15:35 $ */ +/* $Source$ */ +/* $Revision$ */ +/* $Date$ */