Mercurial > dropbear
comparison libtomcrypt/src/misc/pkcs5/pkcs_5_1.c @ 398:59c7938af2bd
merge of '1250b8af44b62d8f4fe0f8d9fc7e7a1cc34e7e1c'
and '7f8670ac3bb975f40967f3979d09d2199b7e90c8'
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Sat, 03 Feb 2007 08:20:30 +0000 |
parents | 0cbe8f6dbf9e |
children | f849a5ca2efc |
comparison
equal
deleted
inserted
replaced
396:e7c1a77d2921 | 398:59c7938af2bd |
---|---|
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 $ */ |