Mercurial > dropbear

comparison libtomcrypt/src/headers/tomcrypt.h @ 398:59c7938af2bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '1250b8af44b62d8f4fe0f8d9fc7e7a1cc34e7e1c' and '7f8670ac3bb975f40967f3979d09d2199b7e90c8'
author Matt Johnston <matt@ucc.asn.au>
date Sat, 03 Feb 2007 08:20:30 +0000
parents 0cbe8f6dbf9e
children ac2158e3e403
comparison
equal deleted inserted replaced
396:e7c1a77d2921 398:59c7938af2bd
14 #ifdef __cplusplus 14 #ifdef __cplusplus
15 extern "C" { 15 extern "C" {
16 #endif 16 #endif
17 17
18 /* version */ 18 /* version */
19 #define CRYPT 0x0105 19 #define CRYPT 0x0116
20 #define SCRYPT "1.05" 20 #define SCRYPT "1.16"
21 21
22 /* max size of either a cipher/hash block or symmetric key [largest of the two] */ 22 /* max size of either a cipher/hash block or symmetric key [largest of the two] */
23 #define MAXBLOCKSIZE 128 23 #define MAXBLOCKSIZE 128
24 24
25 /* descriptor table size */ 25 /* descriptor table size */
58 CRYPT_PK_INVALID_SYSTEM,/* Invalid PK system specified */ 58 CRYPT_PK_INVALID_SYSTEM,/* Invalid PK system specified */
59 CRYPT_PK_DUP, /* Duplicate key already in key ring */ 59 CRYPT_PK_DUP, /* Duplicate key already in key ring */
60 CRYPT_PK_NOT_FOUND, /* Key not found in keyring */ 60 CRYPT_PK_NOT_FOUND, /* Key not found in keyring */
61 CRYPT_PK_INVALID_SIZE, /* Invalid size input for PK parameters */ 61 CRYPT_PK_INVALID_SIZE, /* Invalid size input for PK parameters */
62 62
63 CRYPT_INVALID_PRIME_SIZE/* Invalid size of prime requested */ 63 CRYPT_INVALID_PRIME_SIZE,/* Invalid size of prime requested */
64 CRYPT_PK_INVALID_PADDING /* Invalid padding on input */
64 }; 65 };
65 66
66 #include <tomcrypt_cfg.h> 67 #include <tomcrypt_cfg.h>
67 #include <tomcrypt_macros.h> 68 #include <tomcrypt_macros.h>
68 #include <tomcrypt_cipher.h> 69 #include <tomcrypt_cipher.h>
69 #include <tomcrypt_hash.h> 70 #include <tomcrypt_hash.h>
70 #include <tomcrypt_mac.h> 71 #include <tomcrypt_mac.h>
71 #include <tomcrypt_prng.h> 72 #include <tomcrypt_prng.h>
72 #include <tomcrypt_pk.h> 73 #include <tomcrypt_pk.h>
74 #include <tomcrypt_math.h>
73 #include <tomcrypt_misc.h> 75 #include <tomcrypt_misc.h>
74 #include <tomcrypt_argchk.h> 76 #include <tomcrypt_argchk.h>
75 #include <tomcrypt_pkcs.h> 77 #include <tomcrypt_pkcs.h>
76 78
77 #ifdef __cplusplus 79 #ifdef __cplusplus
80 82
81 #endif /* TOMCRYPT_H_ */ 83 #endif /* TOMCRYPT_H_ */
82 84
83 85
84 /* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt.h,v $ */ 86 /* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt.h,v $ */
85 /* $Revision: 1.7 $ */ 87 /* $Revision: 1.20 $ */
86 /* $Date: 2005/06/19 18:03:25 $ */ 88 /* $Date: 2006/11/26 01:45:14 $ */