diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-08-20 09:54:41 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-08-20 09:54:41 +0200 |
| commit | 88d38939bcf937e62b32f39d006d4e86ca89083c (patch) | |
| tree | e662eb0892457730e4d0abf461f82d9c8d47419a | |
| parent | 5507ea6f51bd227ce4af661d550ad4d4de80674b (diff) | |
| download | cryptodev-linux-88d38939bcf937e62b32f39d006d4e86ca89083c.tar.gz cryptodev-linux-88d38939bcf937e62b32f39d006d4e86ca89083c.tar.xz cryptodev-linux-88d38939bcf937e62b32f39d006d4e86ca89083c.zip | |
Increased RSA size to 8192. Return error on wrong arguments.
| -rw-r--r-- | libtomcrypt/headers/tomcrypt_argchk.h | 4 | ||||
| -rw-r--r-- | libtomcrypt/headers/tomcrypt_cfg.h | 4 | ||||
| -rw-r--r-- | libtomcrypt/headers/tomcrypt_pk.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libtomcrypt/headers/tomcrypt_argchk.h b/libtomcrypt/headers/tomcrypt_argchk.h index 1b94434..1ba08c7 100644 --- a/libtomcrypt/headers/tomcrypt_argchk.h +++ b/libtomcrypt/headers/tomcrypt_argchk.h @@ -25,8 +25,8 @@ void crypt_argchk(char *v, char *s, int d); #elif ARGTYPE == 4 -#define LTC_ARGCHK(x) if (!(x)) return CRYPT_INVALID_ARG; -#define LTC_ARGCHKVD(x) if (!(x)) return; +#define LTC_ARGCHK(x) if (!(x)) { printk( "\nwarning: ARGCHK failed at %s:%d\n", __FILE__, __LINE__); return CRYPT_INVALID_ARG; } +#define LTC_ARGCHKVD(x) if (!(x)) { printk( "\nwarning: ARGCHK failed at %s:%d\n", __FILE__, __LINE__); return; } #endif diff --git a/libtomcrypt/headers/tomcrypt_cfg.h b/libtomcrypt/headers/tomcrypt_cfg.h index b750c8b..8ad90bc 100644 --- a/libtomcrypt/headers/tomcrypt_cfg.h +++ b/libtomcrypt/headers/tomcrypt_cfg.h @@ -42,9 +42,9 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const char *s1, const char *s2); #endif -/* type of argument checking, 0=default, 1=fatal and 2=error+continue, 3=nothing */ +/* type of argument checking, 0=default, 1=fatal and 2=error+continue, 3=nothing, 4=return error */ #ifndef ARGTYPE - #define ARGTYPE 0 + #define ARGTYPE 4 #endif /* Controls endianess and size of registers. Leave uncommented to get platform neutral [slower] code diff --git a/libtomcrypt/headers/tomcrypt_pk.h b/libtomcrypt/headers/tomcrypt_pk.h index 145165e..7334880 100644 --- a/libtomcrypt/headers/tomcrypt_pk.h +++ b/libtomcrypt/headers/tomcrypt_pk.h @@ -26,7 +26,7 @@ int rand_prime(mp_int *N, long len); /* Min and Max RSA key sizes (in bits) */ #define MIN_RSA_SIZE 1024 -#define MAX_RSA_SIZE 4096 +#define MAX_RSA_SIZE 8192 /** RSA LTC_PKCS style key */ typedef struct Rsa_key { |