added libtomcrypt-1.12

src/headers/tomcrypt.h

@@ -16,8 +16,8 @@ extern "C" {
 #endif
 
 /* version */
-#define CRYPT   0x0111
-#define SCRYPT  "1.11"
+#define CRYPT   0x0112
+#define SCRYPT  "1.12"
 
 /* max size of either a cipher/hash block or symmetric key [largest of the two] */
 #define MAXBLOCKSIZE  128

src/headers/tomcrypt_cfg.h

@@ -7,22 +7,34 @@
 #ifndef TOMCRYPT_CFG_H
 #define TOMCRYPT_CFG_H
 
-/* you can change how memory allocation works ... */
-void *XMALLOC(size_t n);
-void *XREALLOC(void *p, size_t n);
-void *XCALLOC(size_t n, size_t s);
-void XFREE(void *p);
+#if defined(_WIN32) || defined(_MSC_VER)
+#define LTC_CALL __cdecl
+#else
+#ifndef LTC_CALL
+   #define LTC_CALL
+#endif
+#endif
 
-void XQSORT(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *));
+#ifndef LTC_EXPORT
+#define LTC_EXPORT
+#endif
+
+/* 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);
+LTC_EXPORT void * LTC_CALL XCALLOC(size_t n, size_t s);
+LTC_EXPORT void LTC_CALL XFREE(void *p);
+
+LTC_EXPORT void LTC_CALL XQSORT(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *));
 
 
 /* change the clock function too */
-clock_t XCLOCK(void);
+LTC_EXPORT clock_t LTC_CALL XCLOCK(void);
 
 /* various other functions */
-void *XMEMCPY(void *dest, const void *src, size_t n);
-int   XMEMCMP(const void *s1, const void *s2, size_t n);
-void *XMEMSET(void *s, int c, size_t n);
+LTC_EXPORT void * LTC_CALL XMEMCPY(void *dest, const void *src, size_t n);
+LTC_EXPORT int   LTC_CALL XMEMCMP(const void *s1, const void *s2, size_t n);
+LTC_EXPORT void * LTC_CALL XMEMSET(void *s, int c, size_t n);
 
 /* type of argument checking, 0=default, 1=fatal and 2=error+continue, 3=nothing */
 #ifndef ARGTYPE

src/headers/tomcrypt_custom.h

@@ -269,6 +269,9 @@
    #define MECC_ACCEL
 #endif   
 
+/* do we want fixed point ECC */
+/* #define MECC_FP */
+
 /* Timing Resistant? */
 /* #define LTC_ECC_TIMING_RESISTANT */
 

src/headers/tomcrypt_math.h

@@ -108,6 +108,12 @@ typedef struct {
    */
    int (*count_bits)(void * a);
 
+   /** Count the number of LSB bits which are zero 
+     @param a   The integer to count
+     @return The number of contiguous zero LSB bits
+   */
+   int (*count_lsb_bits)(void *a);
+
    /** Compute a power of two
      @param a  The integer to store the power in
      @param n  The power of two you want to store (a = 2^n)
@@ -424,6 +430,7 @@ extern const ltc_math_descriptor gmp_desc;
 #define mp_cmp(a, b)                 ltc_mp.compare(a, b)
 #define mp_cmp_d(a, b)               ltc_mp.compare_d(a, b)
 #define mp_count_bits(a)             ltc_mp.count_bits(a)
+#define mp_cnt_lsb(a)                ltc_mp.count_lsb_bits(a)
 #define mp_2expt(a, b)               ltc_mp.twoexpt(a, b)
 
 #define mp_read_radix(a, b, c)       ltc_mp.read_radix(a, b, c)

src/headers/tomcrypt_pk.h

@@ -226,9 +226,8 @@ ecc_point *ltc_ecc_new_point(void);
 void       ltc_ecc_del_point(ecc_point *p);
 int        ltc_ecc_is_valid_idx(int n);
 
-
 /* point ops (mp == montgomery digit) */
-#ifndef MECC_ACCEL
+#if !defined(MECC_ACCEL) || defined(LTM_DESC) || defined(GMP_DESC)
 /* R = 2P */
 int ltc_ecc_projective_dbl_point(ecc_point *P, ecc_point *R, void *modulus, void *mp);
 
@@ -236,6 +235,13 @@ int ltc_ecc_projective_dbl_point(ecc_point *P, ecc_point *R, void *modulus, void
 int ltc_ecc_projective_add_point(ecc_point *P, ecc_point *Q, ecc_point *R, void *modulus, void *mp);
 #endif
 
+#if defined(MECC_FP)
+int ltc_ecc_fp_mulmod(void *k, ecc_point *G, ecc_point *R, void *modulus, int map);
+int ltc_ecc_fp_save_state(unsigned char **out, unsigned long *outlen);
+int ltc_ecc_fp_restore_state(unsigned char *in, unsigned long inlen);
+void ltc_ecc_fp_free(void);
+#endif
+
 /* R = kG */
 int ltc_ecc_mulmod(void *k, ecc_point *G, ecc_point *R, void *modulus, int map);
 
@@ -318,6 +324,7 @@ int dsa_shared_secret(void          *private_key, void *base,
 
 enum {
  LTC_ASN1_EOL,
+ LTC_ASN1_BOOLEAN,
  LTC_ASN1_INTEGER,
  LTC_ASN1_SHORT_INTEGER,
  LTC_ASN1_BIT_STRING,
@@ -389,6 +396,12 @@ int  der_decode_sequence_flexi(const unsigned char *in, unsigned long *inlen, lt
 void der_free_sequence_flexi(ltc_asn1_list *list);
 void der_sequence_free(ltc_asn1_list *in);
 
+/* BOOLEAN */
+int der_length_boolean(unsigned long *outlen);
+int der_encode_boolean(int in, 
+                       unsigned char *out, unsigned long *outlen);
+int der_decode_boolean(const unsigned char *in, unsigned long inlen,
+                                       int *out);		       
 /* INTEGER */
 int der_encode_integer(void *num, unsigned char *out, unsigned long *outlen);
 int der_decode_integer(const unsigned char *in, unsigned long inlen, void *num);