diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-09-06 15:00:17 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-09-06 15:00:17 +0200 |
| commit | c61c13594953d462597ed18d6c77e736878ff9d9 (patch) | |
| tree | 583b7cb956cb9fce6c630cc634e772942e3bbaf7 /crypto/userspace/libtomcrypt/headers | |
| parent | 9cab3a1a9660ed5f798b063aa7e827eb0c95ba94 (diff) | |
| parent | 8afc069c742f80d3e383ba3d0e38697aeeeb147b (diff) | |
| download | kernel-crypto-ncr-standalone-rename.tar.gz kernel-crypto-ncr-standalone-rename.tar.xz kernel-crypto-ncr-standalone-rename.zip | |
Merge branch 'standalone-master' into standalone-renamencr-standalone-rename
Conflicts:
crypto/userspace/libtomcrypt/misc/qsort.c
crypto/userspace/libtommath/bn_mp_and.c
crypto/userspace/libtommath/bn_mp_exteuclid.c
crypto/userspace/libtommath/bn_mp_jacobi.c
crypto/userspace/libtommath/bn_mp_or.c
crypto/userspace/libtommath/bn_mp_prime_fermat.c
crypto/userspace/libtommath/bn_mp_radix_size.c
crypto/userspace/libtommath/bn_mp_radix_smap.c
crypto/userspace/libtommath/bn_mp_read_radix.c
crypto/userspace/libtommath/bn_mp_sqrt.c
crypto/userspace/libtommath/bn_mp_toradix.c
crypto/userspace/libtommath/bn_mp_toradix_n.c
crypto/userspace/libtommath/bn_mp_xor.c
examples/Makefile
examples/ncr.c
examples/pk.c
Diffstat (limited to 'crypto/userspace/libtomcrypt/headers')
| -rw-r--r-- | crypto/userspace/libtomcrypt/headers/tomcrypt.h | 1 | ||||
| -rw-r--r-- | crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h | 4 | ||||
| -rw-r--r-- | crypto/userspace/libtomcrypt/headers/tomcrypt_custom.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/crypto/userspace/libtomcrypt/headers/tomcrypt.h b/crypto/userspace/libtomcrypt/headers/tomcrypt.h index fdb6c8d1f16..a9c675d0944 100644 --- a/crypto/userspace/libtomcrypt/headers/tomcrypt.h +++ b/crypto/userspace/libtomcrypt/headers/tomcrypt.h @@ -6,6 +6,7 @@ #include <linux/string.h> #include <linux/ctype.h> #include <linux/nls.h> +#include <linux/sort.h> /* use configuration data */ #include <tomcrypt_custom.h> diff --git a/crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h b/crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h index 8ad90bce4b0..93db10e6729 100644 --- a/crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h +++ b/crypto/userspace/libtomcrypt/headers/tomcrypt_cfg.h @@ -19,11 +19,11 @@ #define LTC_EXPORT #endif -LTC_EXPORT void LTC_CALL XQSORT(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *)); - /* certain platforms use macros for these, making the prototypes broken */ #ifndef LTC_NO_PROTOTYPES +LTC_EXPORT void LTC_CALL XQSORT(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *)); + /* you can change how memory allocation works ... */ LTC_EXPORT void * LTC_CALL XMALLOC(size_t n); LTC_EXPORT void * LTC_CALL XREALLOC(void *p, size_t n); diff --git a/crypto/userspace/libtomcrypt/headers/tomcrypt_custom.h b/crypto/userspace/libtomcrypt/headers/tomcrypt_custom.h index c537dc7605a..76b574487bc 100644 --- a/crypto/userspace/libtomcrypt/headers/tomcrypt_custom.h +++ b/crypto/userspace/libtomcrypt/headers/tomcrypt_custom.h @@ -65,7 +65,7 @@ #ifdef qsort #define LTC_NO_PROTOTYPES #endif -#define XQSORT qsort +#define XQSORT(x,y,z,w) sort(x,y,z,w,NULL) #endif /* Easy button? */ |