diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-27 09:31:07 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-27 09:31:07 +0200 |
| commit | 3d758323280763fe59b1f61d4f86aa2a29fe3775 (patch) | |
| tree | f195a8cb4aa2ff6fbb5a51e0e6c13df1968401b6 /libtomcrypt | |
| parent | 40b5088d61e6f0830302b253ad407d06e46364b6 (diff) | |
| parent | dd5317620d70e6b438e40370163257e47ca385a3 (diff) | |
| download | kernel-crypto-3d758323280763fe59b1f61d4f86aa2a29fe3775.tar.gz kernel-crypto-3d758323280763fe59b1f61d4f86aa2a29fe3775.tar.xz kernel-crypto-3d758323280763fe59b1f61d4f86aa2a29fe3775.zip | |
Merge remote branch 'standalone/master' into standalone-master
Conflicts:
cryptodev_main.c
ncr-int.h
ncr.c
Diffstat (limited to 'libtomcrypt')
| -rw-r--r-- | libtomcrypt/hashes/hash_memory.c | 2 | ||||
| -rw-r--r-- | libtomcrypt/hashes/hash_memory_multi.c | 2 | ||||
| -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 | ||||
| -rw-r--r-- | libtomcrypt/pk/rsa/rsa_import.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/libtomcrypt/hashes/hash_memory.c b/libtomcrypt/hashes/hash_memory.c index a416de9624e..c6f51881245 100644 --- a/libtomcrypt/hashes/hash_memory.c +++ b/libtomcrypt/hashes/hash_memory.c @@ -44,7 +44,7 @@ int hash_memory(const struct algo_properties_st *hash, const unsigned char *in, return CRYPT_BUFFER_OVERFLOW; } - err = cryptodev_hash_init( &hdata, hash->kstr, 0, NULL, 0); + err = cryptodev_hash_init(&hdata, hash->kstr, NULL, 0); if (err < 0) { err = CRYPT_INVALID_HASH; goto LBL_ERR; diff --git a/libtomcrypt/hashes/hash_memory_multi.c b/libtomcrypt/hashes/hash_memory_multi.c index a9149166700..74226767a72 100644 --- a/libtomcrypt/hashes/hash_memory_multi.c +++ b/libtomcrypt/hashes/hash_memory_multi.c @@ -50,7 +50,7 @@ int hash_memory_multi(const struct algo_properties_st *hash, unsigned char *out, return CRYPT_BUFFER_OVERFLOW; } - err = cryptodev_hash_init( &hdata, hash->kstr, 0, NULL, 0); + err = cryptodev_hash_init(&hdata, hash->kstr, NULL, 0); if (err < 0) { err = CRYPT_INVALID_HASH; goto LBL_ERR; diff --git a/libtomcrypt/headers/tomcrypt_argchk.h b/libtomcrypt/headers/tomcrypt_argchk.h index 1b94434ccb3..1ba08c7ffad 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 b750c8be78c..8ad90bce4b0 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 145165efe51..73348805748 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 { diff --git a/libtomcrypt/pk/rsa/rsa_import.c b/libtomcrypt/pk/rsa/rsa_import.c index 9f3c5bfa642..87cb1030d47 100644 --- a/libtomcrypt/pk/rsa/rsa_import.c +++ b/libtomcrypt/pk/rsa/rsa_import.c @@ -84,7 +84,7 @@ int rsa_import(const unsigned char *in, unsigned long inlen, rsa_key *key) } /* it's a private key */ if ((err = der_decode_sequence_multi(in, inlen, - LTC_ASN1_INTEGER, 1UL, zero, + LTC_ASN1_INTEGER, 1UL, &zero, LTC_ASN1_INTEGER, 1UL, &key->N, LTC_ASN1_INTEGER, 1UL, &key->e, LTC_ASN1_INTEGER, 1UL, &key->d, |