diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-27 09:32:48 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-27 09:32:48 +0200 |
| commit | 9cab3a1a9660ed5f798b063aa7e827eb0c95ba94 (patch) | |
| tree | fb5dadde55ce30a6634f113bb6ca35682833ecf3 /crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h | |
| parent | a6d3a923924a7b751981d93ade82854985abebba (diff) | |
| parent | 3d758323280763fe59b1f61d4f86aa2a29fe3775 (diff) | |
| download | kernel-crypto-9cab3a1a9660ed5f798b063aa7e827eb0c95ba94.tar.gz kernel-crypto-9cab3a1a9660ed5f798b063aa7e827eb0c95ba94.tar.xz kernel-crypto-9cab3a1a9660ed5f798b063aa7e827eb0c95ba94.zip | |
Merge branch 'standalone-master' into standalone-rename
Conflicts:
TODO
crypto.4
examples/Makefile
examples/ncr.c
examples/pk.c
examples/speed.c
include/linux/cryptodev.h
userspace/setkey.c
Diffstat (limited to 'crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h')
| -rw-r--r-- | crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |