diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-27 09:40:53 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-27 09:44:36 +0200 |
| commit | 5d08c95e8a0101f156cf1afe8b2fae8487d1cfce (patch) | |
| tree | 2510e52b0992afb90b3a9a86ce07b8a2fd26f6f4 /crypto/userspace/libtomcrypt/headers | |
| parent | d5d46ca491d8974ac1eaf7bad3d69e468e49dc34 (diff) | |
| parent | 9cab3a1a9660ed5f798b063aa7e827eb0c95ba94 (diff) | |
| download | kernel-crypto-5d08c95e8a0101f156cf1afe8b2fae8487d1cfce.tar.gz kernel-crypto-5d08c95e8a0101f156cf1afe8b2fae8487d1cfce.tar.xz kernel-crypto-5d08c95e8a0101f156cf1afe8b2fae8487d1cfce.zip | |
Merge branch 'standalone-rename' into userspace-crypto
Conflicts:
.gitignore
crypto/userspace/Makefile
crypto/userspace/cryptodev_int.h
crypto/userspace/ncr-key-wrap.c
crypto/userspace/ncr-key.c
crypto/userspace/ncr-pk.c
crypto/userspace/ncr-sessions.c
crypto/userspace/ncr.c
include/linux/cryptodev.h
Diffstat (limited to 'crypto/userspace/libtomcrypt/headers')
| -rw-r--r-- | crypto/userspace/libtomcrypt/headers/tomcrypt_argchk.h | 4 | ||||
| -rw-r--r-- | crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h | 4 | ||||
| -rw-r--r-- | crypto/userspace/libtomcrypt/headers/tomcrypt_pk.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/crypto/userspace/libtomcrypt/headers/tomcrypt_argchk.h b/crypto/userspace/libtomcrypt/headers/tomcrypt_argchk.h index 1b94434ccb3..1ba08c7ffad 100644 --- a/crypto/userspace/libtomcrypt/headers/tomcrypt_argchk.h +++ b/crypto/userspace/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/crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h b/crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h index b750c8be78c..8ad90bce4b0 100644 --- a/crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h +++ b/crypto/userspace/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/crypto/userspace/libtomcrypt/headers/tomcrypt_pk.h b/crypto/userspace/libtomcrypt/headers/tomcrypt_pk.h index 145165efe51..73348805748 100644 --- a/crypto/userspace/libtomcrypt/headers/tomcrypt_pk.h +++ b/crypto/userspace/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 { |