comparison libtomcrypt/src/misc/pkcs5/pkcs_5_1.c @ 435:337c45621e81

merge of 'a9b0496634cdd25647b65e585cc3240f3fa699ee' and 'c22be8b8f570b48e9662dac32c7b3e7148a42206'
author Matt Johnston <matt@ucc.asn.au>
date Thu, 22 Feb 2007 14:53:49 +0000
parents 0cbe8f6dbf9e
children f849a5ca2efc
comparison
equal deleted inserted replaced
434:0aaaf68e97dc 435:337c45621e81
4 * algorithms in a highly modular and flexible manner. 4 * algorithms in a highly modular and flexible manner.
5 * 5 *
6 * The library is free for all purposes without any express 6 * The library is free for all purposes without any express
7 * guarantee it works. 7 * guarantee it works.
8 * 8 *
9 * Tom St Denis, [email protected], http://libtomcrypt.org 9 * Tom St Denis, [email protected], http://libtomcrypt.com
10 */ 10 */
11 #include <tomcrypt.h> 11 #include <tomcrypt.h>
12 12
13 /** 13 /**
14 @file pkcs_5_1.c 14 @file pkcs_5_1.c
100 } 100 }
101 101
102 #endif 102 #endif
103 103
104 /* $Source: /cvs/libtom/libtomcrypt/src/misc/pkcs5/pkcs_5_1.c,v $ */ 104 /* $Source: /cvs/libtom/libtomcrypt/src/misc/pkcs5/pkcs_5_1.c,v $ */
105 /* $Revision: 1.4 $ */ 105 /* $Revision: 1.5 $ */
106 /* $Date: 2005/05/05 14:35:59 $ */ 106 /* $Date: 2006/03/31 14:15:35 $ */