wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

merged RC_1_1 into master

This commit is contained in:
arvidn 2016-05-29 10:01:55 -07:00
parent 9489eb23f4 b3bbb2f0f6
commit 7795b2ff6c
8 changed files with 2194 additions and 1434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -19,6 +19,7 @@
1.1.1 release 1.1.1 release
* upgraded to libtommath 1.0
* fixed parsing of IPv6 endpoint with invalid port character separator * fixed parsing of IPv6 endpoint with invalid port character separator
* added limited support for new x.pe parameter from BEP 9 * added limited support for new x.pe parameter from BEP 9
* fixed dht stats counters that weren't being updated * fixed dht stats counters that weren't being updated

1
include/libtorrent/Makefile.am
View File

@ -152,6 +152,7 @@ nobase_include_HEADERS = \
tommath.h \ tommath.h \
tommath_class.h \ tommath_class.h \
tommath_superclass.h \ tommath_superclass.h \
tommath_private.h \
\ \
aux_/array_view.hpp \ aux_/array_view.hpp \
aux_/allocating_handler.hpp \ aux_/allocating_handler.hpp \

215
include/libtorrent/tommath.h
View File

@ -10,44 +10,35 @@
* The library is free for all purposes without any express * The library is free for all purposes without any express
* guarantee it works. * guarantee it works.
* *
* Tom St Denis, tomstdenis@gmail.com, http://math.libtomcrypt.com * Tom St Denis, tstdenis82@gmail.com, http://math.libtomcrypt.com
*/ */
#ifndef BN_H_ #ifndef BN_H_
#define BN_H_ #define BN_H_
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h>
#include <limits.h> #include <limits.h>
#include "libtorrent/export.hpp"
#ifdef _MSC_VER
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
typedef unsigned __int64 uint64_t;
#else
#include <stdint.h>
#endif
#include "libtorrent/tommath_class.h" #include "libtorrent/tommath_class.h"
#ifndef MIN
#define MIN(x,y) ((x)<(y)?(x):(y))
#endif
#ifndef MAX
#define MAX(x,y) ((x)>(y)?(x):(y))
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
/* C++ compilers don't like assigning void * to mp_digit * */
#define OPT_CAST(x) (x *)
#else
/* C on the other hand doesn't care */
#define OPT_CAST(x)
#endif #endif
/* detect 64-bit mode if possible */ /* detect 64-bit mode if possible */
#if defined(__x86_64__) #if defined(__x86_64__)
#if !(defined(MP_64BIT) && defined(MP_16BIT) && defined(MP_8BIT)) #if !(defined(MP_32BIT) || defined(MP_16BIT) || defined(MP_8BIT))
#define MP_64BIT #define MP_64BIT
#endif #endif
#endif #endif
@ -61,70 +52,68 @@ extern "C" {
* [any size beyond that is ok provided it doesn't overflow the data type] * [any size beyond that is ok provided it doesn't overflow the data type]
*/ */
#ifdef MP_8BIT #ifdef MP_8BIT
typedef unsigned char mp_digit; typedef uint8_t mp_digit;
typedef unsigned short mp_word; typedef uint16_t mp_word;
#define MP_SIZEOF_MP_DIGIT 1
#ifdef DIGIT_BIT
#error You must not define DIGIT_BIT when using MP_8BIT
#endif
#elif defined(MP_16BIT) #elif defined(MP_16BIT)
typedef unsigned short mp_digit; typedef uint16_t mp_digit;
typedef unsigned long mp_word; typedef uint32_t mp_word;
#define MP_SIZEOF_MP_DIGIT 2
#ifdef DIGIT_BIT
#error You must not define DIGIT_BIT when using MP_16BIT
#endif
#elif defined(MP_64BIT) #elif defined(MP_64BIT)
/* for GCC only on supported platforms */ /* for GCC only on supported platforms */
#ifndef CRYPT typedef uint64_t mp_digit;
typedef unsigned long long ulong64; #if defined(_WIN32)
typedef signed long long long64; typedef unsigned __int128 mp_word;
#elif defined(__GNUC__)
typedef unsigned long mp_word __attribute__ ((mode(TI)));
#else
/* it seems you have a problem
* but we assume you can somewhere define your own uint128_t */
typedef uint128_t mp_word;
#endif #endif
typedef unsigned long mp_digit; #define DIGIT_BIT 60
typedef unsigned long mp_word __attribute__ ((mode(TI)));
#define DIGIT_BIT 60
#else #else
/* this is the default case, 28-bit digits */ /* this is the default case, 28-bit digits */
/* this is to make porting into LibTomCrypt easier :-) */ /* this is to make porting into LibTomCrypt easier :-) */
#ifndef CRYPT typedef uint32_t mp_digit;
#if defined(_MSC_VER) || defined(__BORLANDC__) typedef uint64_t mp_word;
typedef unsigned __int64 ulong64;
typedef signed __int64 long64;
#else
typedef unsigned long long ulong64;
typedef signed long long long64;
#endif
#endif
typedef unsigned long mp_digit; #ifdef MP_31BIT
typedef ulong64 mp_word;
#ifdef MP_31BIT
/* this is an extension that uses 31-bit digits */ /* this is an extension that uses 31-bit digits */
#define DIGIT_BIT 31 #define DIGIT_BIT 31
#else #else
/* default case is 28-bit digits, defines MP_28BIT as a handy macro to test */ /* default case is 28-bit digits, defines MP_28BIT as a handy macro to test */
#define DIGIT_BIT 28 #define DIGIT_BIT 28
#define MP_28BIT #define MP_28BIT
#endif
#endif #endif
/* define heap macros */
#ifndef CRYPT
/* default to libc stuff */
#ifndef XMALLOC
#define XMALLOC malloc
#define XFREE free
#define XREALLOC realloc
#define XCALLOC calloc
#else
/* prototypes for our heap functions */
extern void *XMALLOC(size_t n);
extern void *XREALLOC(void *p, size_t n);
extern void *XCALLOC(size_t n, size_t s);
extern void XFREE(void *p);
#endif
#endif #endif
/* otherwise the bits per digit is calculated automatically from the size of a mp_digit */ /* otherwise the bits per digit is calculated automatically from the size of a mp_digit */
#ifndef DIGIT_BIT #ifndef DIGIT_BIT
#define DIGIT_BIT ((int)((CHAR_BIT * sizeof(mp_digit) - 1))) /* bits per digit */ #define DIGIT_BIT (((CHAR_BIT * MP_SIZEOF_MP_DIGIT) - 1)) /* bits per digit */
typedef uint_least32_t mp_min_u32;
#else
typedef mp_digit mp_min_u32;
#endif
/* platforms that can use a better rand function */
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
#define MP_USE_ALT_RAND 1
#endif
/* use arc4random on platforms that support it */
#ifdef MP_USE_ALT_RAND
#define MP_GEN_RANDOM() arc4random()
#else
#define MP_GEN_RANDOM() rand()
#endif #endif
#define MP_DIGIT_BIT DIGIT_BIT #define MP_DIGIT_BIT DIGIT_BIT
@ -169,11 +158,11 @@ extern int KARATSUBA_MUL_CUTOFF,
#define MP_PREC 32 /* default digits of precision */ #define MP_PREC 32 /* default digits of precision */
#else #else
#define MP_PREC 8 /* default digits of precision */ #define MP_PREC 8 /* default digits of precision */
#endif #endif
#endif #endif
/* size of comba arrays, should be at least 2 * 2**(BITS_PER_WORD - BITS_PER_DIGIT*2) */ /* size of comba arrays, should be at least 2 * 2**(BITS_PER_WORD - BITS_PER_DIGIT*2) */
#define MP_WARRAY (1 << (sizeof(mp_word) * CHAR_BIT - 2 * DIGIT_BIT + 1)) #define MP_WARRAY (1 << (((sizeof(mp_word) * CHAR_BIT) - (2 * DIGIT_BIT)) + 1))
/* the infamous mp_int structure */ /* the infamous mp_int structure */
typedef struct { typedef struct {
@ -190,14 +179,14 @@ typedef int ltm_prime_callback(unsigned char *dst, int len, void *dat);
#define SIGN(m) ((m)->sign) #define SIGN(m) ((m)->sign)
/* error code to char* string */ /* error code to char* string */
char *mp_error_to_string(int code); const char *mp_error_to_string(int code);
/* ---> init and deinit bignum functions <--- */ /* ---> init and deinit bignum functions <--- */
/* init a bignum */ /* init a bignum */
int mp_init(mp_int *a); TORRENT_EXTRA_EXPORT int mp_init(mp_int *a);
/* free a bignum */ /* free a bignum */
void mp_clear(mp_int *a); TORRENT_EXTRA_EXPORT void mp_clear(mp_int *a);
/* init a null terminated series of arguments */ /* init a null terminated series of arguments */
int mp_init_multi(mp_int *mp, ...); int mp_init_multi(mp_int *mp, ...);
@ -219,8 +208,9 @@ int mp_init_size(mp_int *a, int size);
/* ---> Basic Manipulations <--- */ /* ---> Basic Manipulations <--- */
#define mp_iszero(a) (((a)->used == 0) ? MP_YES : MP_NO) #define mp_iszero(a) (((a)->used == 0) ? MP_YES : MP_NO)
#define mp_iseven(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 0)) ? MP_YES : MP_NO) #define mp_iseven(a) ((((a)->used > 0) && (((a)->dp[0] & 1u) == 0u)) ? MP_YES : MP_NO)
#define mp_isodd(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 1)) ? MP_YES : MP_NO) #define mp_isodd(a) ((((a)->used > 0) && (((a)->dp[0] & 1u) == 1u)) ? MP_YES : MP_NO)
#define mp_isneg(a) (((a)->sign != MP_ZPOS) ? MP_YES : MP_NO)
/* set to zero */ /* set to zero */
void mp_zero(mp_int *a); void mp_zero(mp_int *a);
@ -231,9 +221,21 @@ void mp_set(mp_int *a, mp_digit b);
/* set a 32-bit const */ /* set a 32-bit const */
int mp_set_int(mp_int *a, unsigned long b); int mp_set_int(mp_int *a, unsigned long b);
/* set a platform dependent unsigned long value */
int mp_set_long(mp_int *a, unsigned long b);
/* set a platform dependent unsigned long long value */
int mp_set_long_long(mp_int *a, unsigned long long b);
/* get a 32-bit value */ /* get a 32-bit value */
unsigned long mp_get_int(mp_int * a); unsigned long mp_get_int(mp_int * a);
/* get a platform dependent unsigned long value */
unsigned long mp_get_long(mp_int * a);
/* get a platform dependent unsigned long long value */
unsigned long long mp_get_long_long(mp_int * a);
/* initialize and set a digit */ /* initialize and set a digit */
int mp_init_set (mp_int * a, mp_digit b); int mp_init_set (mp_int * a, mp_digit b);
@ -249,6 +251,12 @@ int mp_init_copy(mp_int *a, mp_int *b);
/* trim unused digits */ /* trim unused digits */
void mp_clamp(mp_int *a); void mp_clamp(mp_int *a);
/* import binary data */
int mp_import(mp_int* rop, size_t count, int order, size_t size, int endian, size_t nails, const void* op);
/* export binary data */
int mp_export(void* rop, size_t* countp, int order, size_t size, int endian, size_t nails, mp_int* op);
/* ---> digit manipulation <--- */ /* ---> digit manipulation <--- */
/* right shift by "b" digits */ /* right shift by "b" digits */
@ -257,19 +265,19 @@ void mp_rshd(mp_int *a, int b);
/* left shift by "b" digits */ /* left shift by "b" digits */
int mp_lshd(mp_int *a, int b); int mp_lshd(mp_int *a, int b);
/* c = a / 2**b */ /* c = a / 2**b, implemented as c = a >> b */
int mp_div_2d(mp_int *a, int b, mp_int *c, mp_int *d); int mp_div_2d(mp_int *a, int b, mp_int *c, mp_int *d);
/* b = a/2 */ /* b = a/2 */
int mp_div_2(mp_int *a, mp_int *b); int mp_div_2(mp_int *a, mp_int *b);
/* c = a * 2**b */ /* c = a * 2**b, implemented as c = a << b */
int mp_mul_2d(mp_int *a, int b, mp_int *c); int mp_mul_2d(mp_int *a, int b, mp_int *c);
/* b = a*2 */ /* b = a*2 */
int mp_mul_2(mp_int *a, mp_int *b); int mp_mul_2(mp_int *a, mp_int *b);
/* c = a mod 2**d */ /* c = a mod 2**b */
int mp_mod_2d(mp_int *a, int b, mp_int *c); int mp_mod_2d(mp_int *a, int b, mp_int *c);
/* computes a = 2**b */ /* computes a = 2**b */
@ -347,6 +355,7 @@ int mp_div_3(mp_int *a, mp_int *c, mp_digit *d);
/* c = a**b */ /* c = a**b */
int mp_expt_d(mp_int *a, mp_digit b, mp_int *c); int mp_expt_d(mp_int *a, mp_digit b, mp_int *c);
int mp_expt_d_ex (mp_int * a, mp_digit b, mp_int * c, int fast);
/* c = a mod b, 0 <= c < b */ /* c = a mod b, 0 <= c < b */
int mp_mod_d(mp_int *a, mp_digit b, mp_digit *c); int mp_mod_d(mp_int *a, mp_digit b, mp_digit *c);
@ -382,10 +391,14 @@ int mp_lcm(mp_int *a, mp_int *b, mp_int *c);
* returns error if a < 0 and b is even * returns error if a < 0 and b is even
*/ */
int mp_n_root(mp_int *a, mp_digit b, mp_int *c); int mp_n_root(mp_int *a, mp_digit b, mp_int *c);
int mp_n_root_ex (mp_int * a, mp_digit b, mp_int * c, int fast);
/* special sqrt algo */ /* special sqrt algo */
int mp_sqrt(mp_int *arg, mp_int *ret); int mp_sqrt(mp_int *arg, mp_int *ret);
/* special sqrt (mod prime) */
int mp_sqrtmod_prime(mp_int *arg, mp_int *prime, mp_int *ret);
/* is number a square? */ /* is number a square? */
int mp_is_square(mp_int *arg, int *ret); int mp_is_square(mp_int *arg, int *ret);
@ -453,7 +466,7 @@ int mp_exptmod(mp_int *a, mp_int *b, mp_int *c, mp_int *d);
#endif #endif
/* table of first PRIME_SIZE primes */ /* table of first PRIME_SIZE primes */
extern const mp_digit ltm_prime_tab[]; extern const mp_digit ltm_prime_tab[PRIME_SIZE];
/* result=1 if a is divisible by one of the first PRIME_SIZE primes */ /* result=1 if a is divisible by one of the first PRIME_SIZE primes */
int mp_prime_is_divisible(mp_int *a, int *result); int mp_prime_is_divisible(mp_int *a, int *result);
@ -469,7 +482,7 @@ int mp_prime_fermat(mp_int *a, mp_int *b, int *result);
int mp_prime_miller_rabin(mp_int *a, mp_int *b, int *result); int mp_prime_miller_rabin(mp_int *a, mp_int *b, int *result);
/* This gives [for a given bit size] the number of trials required /* This gives [for a given bit size] the number of trials required
* such that Miller-Rabin gives a prob of failure lower than 2^-96 * such that Miller-Rabin gives a prob of failure lower than 2^-96
*/ */
int mp_prime_rabin_miller_trials(int size); int mp_prime_rabin_miller_trials(int size);
@ -490,7 +503,7 @@ int mp_prime_is_prime(mp_int *a, int t, int *result);
int mp_prime_next_prime(mp_int *a, int t, int bbs_style); int mp_prime_next_prime(mp_int *a, int t, int bbs_style);
/* makes a truly random prime of a given size (bytes), /* makes a truly random prime of a given size (bytes),
* call with bbs = 1 if you want it to be congruent to 3 mod 4 * call with bbs = 1 if you want it to be congruent to 3 mod 4
* *
* You have to supply a callback which fills in a buffer with random bytes. "dat" is a parameter you can * You have to supply a callback which fills in a buffer with random bytes. "dat" is a parameter you can
* have passed to the callback (e.g. a state or something). This function doesn't use "dat" itself * have passed to the callback (e.g. a state or something). This function doesn't use "dat" itself
@ -503,10 +516,9 @@ int mp_prime_next_prime(mp_int *a, int t, int bbs_style);
/* makes a truly random prime of a given size (bits), /* makes a truly random prime of a given size (bits),
* *
* Flags are as follows: * Flags are as follows:
* *
* LTM_PRIME_BBS - make prime congruent to 3 mod 4 * LTM_PRIME_BBS - make prime congruent to 3 mod 4
* LTM_PRIME_SAFE - make sure (p-1)/2 is prime as well (implies LTM_PRIME_BBS) * LTM_PRIME_SAFE - make sure (p-1)/2 is prime as well (implies LTM_PRIME_BBS)
* LTM_PRIME_2MSB_OFF - make the 2nd highest bit zero
* LTM_PRIME_2MSB_ON - make the 2nd highest bit one * LTM_PRIME_2MSB_ON - make the 2nd highest bit one
* *
* You have to supply a callback which fills in a buffer with random bytes. "dat" is a parameter you can * You have to supply a callback which fills in a buffer with random bytes. "dat" is a parameter you can
@ -519,8 +531,8 @@ int mp_prime_random_ex(mp_int *a, int t, int size, int flags, ltm_prime_callback
/* ---> radix conversion <--- */ /* ---> radix conversion <--- */
int mp_count_bits(mp_int *a); int mp_count_bits(mp_int *a);
int mp_unsigned_bin_size(mp_int *a); TORRENT_EXTRA_EXPORT int mp_unsigned_bin_size(mp_int *a);
int mp_read_unsigned_bin(mp_int *a, const unsigned char *b, int c); TORRENT_EXTRA_EXPORT int mp_read_unsigned_bin(mp_int *a, const unsigned char *b, int c);
int mp_to_unsigned_bin(mp_int *a, unsigned char *b); int mp_to_unsigned_bin(mp_int *a, unsigned char *b);
int mp_to_unsigned_bin_n (mp_int * a, unsigned char *b, unsigned long *outlen); int mp_to_unsigned_bin_n (mp_int * a, unsigned char *b, unsigned long *outlen);
@ -534,8 +546,10 @@ int mp_toradix(mp_int *a, char *str, int radix);
int mp_toradix_n(mp_int * a, char *str, int radix, int maxlen); int mp_toradix_n(mp_int * a, char *str, int radix, int maxlen);
int mp_radix_size(mp_int *a, int radix, int *size); int mp_radix_size(mp_int *a, int radix, int *size);
#ifndef LTM_NO_FILE
int mp_fread(mp_int *a, int radix, FILE *stream); int mp_fread(mp_int *a, int radix, FILE *stream);
int mp_fwrite(mp_int *a, int radix, FILE *stream); int mp_fwrite(mp_int *a, int radix, FILE *stream);
#endif
#define mp_read_raw(mp, str, len) mp_read_signed_bin((mp), (str), (len)) #define mp_read_raw(mp, str, len) mp_read_signed_bin((mp), (str), (len))
#define mp_raw_size(mp) mp_signed_bin_size(mp) #define mp_raw_size(mp) mp_signed_bin_size(mp)
@ -549,29 +563,6 @@ int mp_fwrite(mp_int *a, int radix, FILE *stream);
#define mp_todecimal(M, S) mp_toradix((M), (S), 10) #define mp_todecimal(M, S) mp_toradix((M), (S), 10)
#define mp_tohex(M, S) mp_toradix((M), (S), 16) #define mp_tohex(M, S) mp_toradix((M), (S), 16)
/* lowlevel functions, do not call! */
int s_mp_add(mp_int *a, mp_int *b, mp_int *c);
int s_mp_sub(mp_int *a, mp_int *b, mp_int *c);
#define s_mp_mul(a, b, c) s_mp_mul_digs(a, b, c, (a)->used + (b)->used + 1)
int fast_s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c, int digs);
int s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c, int digs);
int fast_s_mp_mul_high_digs(mp_int *a, mp_int *b, mp_int *c, int digs);
int s_mp_mul_high_digs(mp_int *a, mp_int *b, mp_int *c, int digs);
int fast_s_mp_sqr(mp_int *a, mp_int *b);
int s_mp_sqr(mp_int *a, mp_int *b);
int mp_karatsuba_mul(mp_int *a, mp_int *b, mp_int *c);
int mp_toom_mul(mp_int *a, mp_int *b, mp_int *c);
int mp_karatsuba_sqr(mp_int *a, mp_int *b);
int mp_toom_sqr(mp_int *a, mp_int *b);
int fast_mp_invmod(mp_int *a, mp_int *b, mp_int *c);
int mp_invmod_slow (mp_int * a, mp_int * b, mp_int * c);
int fast_mp_montgomery_reduce(mp_int *a, mp_int *m, mp_digit mp);
int mp_exptmod_fast(mp_int *G, mp_int *X, mp_int *P, mp_int *Y, int mode);
int s_mp_exptmod (mp_int * G, mp_int * X, mp_int * P, mp_int * Y, int mode);
void bn_reverse(unsigned char *s, int len);
extern const char *mp_s_rmap;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
@ -579,6 +570,6 @@ extern const char *mp_s_rmap;
#endif #endif
/* $Source: /cvs/libtom/libtommath/tommath.h,v $ */ /* $Source$ */
/* $Revision: 1.8 $ */ /* $Revision$ */
/* $Date: 2006/03/31 14:18:44 $ */ /* $Date$ */

85
include/libtorrent/tommath_class.h
View File

@ -38,7 +38,9 @@
#define BN_MP_DR_REDUCE_C #define BN_MP_DR_REDUCE_C
#define BN_MP_DR_SETUP_C #define BN_MP_DR_SETUP_C
#define BN_MP_EXCH_C #define BN_MP_EXCH_C
#define BN_MP_EXPORT_C
#define BN_MP_EXPT_D_C #define BN_MP_EXPT_D_C
#define BN_MP_EXPT_D_EX_C
#define BN_MP_EXPTMOD_C #define BN_MP_EXPTMOD_C
#define BN_MP_EXPTMOD_FAST_C #define BN_MP_EXPTMOD_FAST_C
#define BN_MP_EXTEUCLID_C #define BN_MP_EXTEUCLID_C
@ -46,7 +48,10 @@
#define BN_MP_FWRITE_C #define BN_MP_FWRITE_C
#define BN_MP_GCD_C #define BN_MP_GCD_C
#define BN_MP_GET_INT_C #define BN_MP_GET_INT_C
#define BN_MP_GET_LONG_C
#define BN_MP_GET_LONG_LONG_C
#define BN_MP_GROW_C #define BN_MP_GROW_C
#define BN_MP_IMPORT_C
#define BN_MP_INIT_C #define BN_MP_INIT_C
#define BN_MP_INIT_COPY_C #define BN_MP_INIT_COPY_C
#define BN_MP_INIT_MULTI_C #define BN_MP_INIT_MULTI_C
@ -73,6 +78,7 @@
#define BN_MP_MUL_D_C #define BN_MP_MUL_D_C
#define BN_MP_MULMOD_C #define BN_MP_MULMOD_C
#define BN_MP_N_ROOT_C #define BN_MP_N_ROOT_C
#define BN_MP_N_ROOT_EX_C
#define BN_MP_NEG_C #define BN_MP_NEG_C
#define BN_MP_OR_C #define BN_MP_OR_C
#define BN_MP_PRIME_FERMAT_C #define BN_MP_PRIME_FERMAT_C
@ -99,11 +105,14 @@
#define BN_MP_RSHD_C #define BN_MP_RSHD_C
#define BN_MP_SET_C #define BN_MP_SET_C
#define BN_MP_SET_INT_C #define BN_MP_SET_INT_C
#define BN_MP_SET_LONG_C
#define BN_MP_SET_LONG_LONG_C
#define BN_MP_SHRINK_C #define BN_MP_SHRINK_C
#define BN_MP_SIGNED_BIN_SIZE_C #define BN_MP_SIGNED_BIN_SIZE_C
#define BN_MP_SQR_C #define BN_MP_SQR_C
#define BN_MP_SQRMOD_C #define BN_MP_SQRMOD_C
#define BN_MP_SQRT_C #define BN_MP_SQRT_C
#define BN_MP_SQRTMOD_PRIME_C
#define BN_MP_SUB_C #define BN_MP_SUB_C
#define BN_MP_SUB_D_C #define BN_MP_SUB_D_C
#define BN_MP_SUBMOD_C #define BN_MP_SUBMOD_C
@ -315,12 +324,23 @@
#if defined(BN_MP_EXCH_C) #if defined(BN_MP_EXCH_C)
#endif #endif
#if defined(BN_MP_EXPORT_C)
#define BN_MP_INIT_COPY_C
#define BN_MP_COUNT_BITS_C
#define BN_MP_DIV_2D_C
#define BN_MP_CLEAR_C
#endif
#if defined(BN_MP_EXPT_D_C) #if defined(BN_MP_EXPT_D_C)
#define BN_MP_EXPT_D_EX_C
#endif
#if defined(BN_MP_EXPT_D_EX_C)
#define BN_MP_INIT_COPY_C #define BN_MP_INIT_COPY_C
#define BN_MP_SET_C #define BN_MP_SET_C
#define BN_MP_SQR_C
#define BN_MP_CLEAR_C
#define BN_MP_MUL_C #define BN_MP_MUL_C
#define BN_MP_CLEAR_C
#define BN_MP_SQR_C
#endif #endif
#if defined(BN_MP_EXPTMOD_C) #if defined(BN_MP_EXPTMOD_C)
@ -387,7 +407,6 @@
#if defined(BN_MP_GCD_C) #if defined(BN_MP_GCD_C)
#define BN_MP_ISZERO_C #define BN_MP_ISZERO_C
#define BN_MP_ABS_C #define BN_MP_ABS_C
#define BN_MP_ZERO_C
#define BN_MP_INIT_COPY_C #define BN_MP_INIT_COPY_C
#define BN_MP_CNT_LSB_C #define BN_MP_CNT_LSB_C
#define BN_MP_DIV_2D_C #define BN_MP_DIV_2D_C
@ -401,13 +420,26 @@
#if defined(BN_MP_GET_INT_C) #if defined(BN_MP_GET_INT_C)
#endif #endif
#if defined(BN_MP_GET_LONG_C)
#endif
#if defined(BN_MP_GET_LONG_LONG_C)
#endif
#if defined(BN_MP_GROW_C) #if defined(BN_MP_GROW_C)
#endif #endif
#if defined(BN_MP_IMPORT_C)
#define BN_MP_ZERO_C
#define BN_MP_MUL_2D_C
#define BN_MP_CLAMP_C
#endif
#if defined(BN_MP_INIT_C) #if defined(BN_MP_INIT_C)
#endif #endif
#if defined(BN_MP_INIT_COPY_C) #if defined(BN_MP_INIT_COPY_C)
#define BN_MP_INIT_SIZE_C
#define BN_MP_COPY_C #define BN_MP_COPY_C
#endif #endif
@ -481,8 +513,9 @@
#define BN_MP_MUL_C #define BN_MP_MUL_C
#define BN_MP_INIT_SIZE_C #define BN_MP_INIT_SIZE_C
#define BN_MP_CLAMP_C #define BN_MP_CLAMP_C
#define BN_MP_SUB_C #define BN_S_MP_ADD_C
#define BN_MP_ADD_C #define BN_MP_ADD_C
#define BN_S_MP_SUB_C
#define BN_MP_LSHD_C #define BN_MP_LSHD_C
#define BN_MP_CLEAR_C #define BN_MP_CLEAR_C
#endif #endif
@ -491,8 +524,8 @@
#define BN_MP_INIT_SIZE_C #define BN_MP_INIT_SIZE_C
#define BN_MP_CLAMP_C #define BN_MP_CLAMP_C
#define BN_MP_SQR_C #define BN_MP_SQR_C
#define BN_MP_SUB_C
#define BN_S_MP_ADD_C #define BN_S_MP_ADD_C
#define BN_S_MP_SUB_C
#define BN_MP_LSHD_C #define BN_MP_LSHD_C
#define BN_MP_ADD_C #define BN_MP_ADD_C
#define BN_MP_CLEAR_C #define BN_MP_CLEAR_C
@ -516,8 +549,9 @@
#define BN_MP_INIT_C #define BN_MP_INIT_C
#define BN_MP_DIV_C #define BN_MP_DIV_C
#define BN_MP_CLEAR_C #define BN_MP_CLEAR_C
#define BN_MP_ADD_C #define BN_MP_ISZERO_C
#define BN_MP_EXCH_C #define BN_MP_EXCH_C
#define BN_MP_ADD_C
#endif #endif
#if defined(BN_MP_MOD_2D_C) #if defined(BN_MP_MOD_2D_C)
@ -583,10 +617,14 @@
#endif #endif
#if defined(BN_MP_N_ROOT_C) #if defined(BN_MP_N_ROOT_C)
#define BN_MP_N_ROOT_EX_C
#endif
#if defined(BN_MP_N_ROOT_EX_C)
#define BN_MP_INIT_C #define BN_MP_INIT_C
#define BN_MP_SET_C #define BN_MP_SET_C
#define BN_MP_COPY_C #define BN_MP_COPY_C
#define BN_MP_EXPT_D_C #define BN_MP_EXPT_D_EX_C
#define BN_MP_MUL_C #define BN_MP_MUL_C
#define BN_MP_SUB_C #define BN_MP_SUB_C
#define BN_MP_MUL_D_C #define BN_MP_MUL_D_C
@ -667,9 +705,9 @@
#endif #endif
#if defined(BN_MP_RADIX_SIZE_C) #if defined(BN_MP_RADIX_SIZE_C)
#define BN_MP_ISZERO_C
#define BN_MP_COUNT_BITS_C #define BN_MP_COUNT_BITS_C
#define BN_MP_INIT_COPY_C #define BN_MP_INIT_COPY_C
#define BN_MP_ISZERO_C
#define BN_MP_DIV_D_C #define BN_MP_DIV_D_C
#define BN_MP_CLEAR_C #define BN_MP_CLEAR_C
#endif #endif
@ -687,7 +725,6 @@
#if defined(BN_MP_READ_RADIX_C) #if defined(BN_MP_READ_RADIX_C)
#define BN_MP_ZERO_C #define BN_MP_ZERO_C
#define BN_MP_S_RMAP_C #define BN_MP_S_RMAP_C
#define BN_MP_RADIX_SMAP_C
#define BN_MP_MUL_D_C #define BN_MP_MUL_D_C
#define BN_MP_ADD_D_C #define BN_MP_ADD_D_C
#define BN_MP_ISZERO_C #define BN_MP_ISZERO_C
@ -788,6 +825,12 @@
#define BN_MP_CLAMP_C #define BN_MP_CLAMP_C
#endif #endif
#if defined(BN_MP_SET_LONG_C)
#endif
#if defined(BN_MP_SET_LONG_LONG_C)
#endif
#if defined(BN_MP_SHRINK_C) #if defined(BN_MP_SHRINK_C)
#endif #endif
@ -823,6 +866,25 @@
#define BN_MP_CLEAR_C #define BN_MP_CLEAR_C
#endif #endif
#if defined(BN_MP_SQRTMOD_PRIME_C)
#define BN_MP_CMP_D_C
#define BN_MP_ZERO_C
#define BN_MP_JACOBI_C
#define BN_MP_INIT_MULTI_C
#define BN_MP_MOD_D_C
#define BN_MP_ADD_D_C
#define BN_MP_DIV_2_C
#define BN_MP_EXPTMOD_C
#define BN_MP_COPY_C
#define BN_MP_SUB_D_C
#define BN_MP_ISEVEN_C
#define BN_MP_SET_INT_C
#define BN_MP_SQRMOD_C
#define BN_MP_MULMOD_C
#define BN_MP_SET_C
#define BN_MP_CLEAR_MULTI_C
#endif
#if defined(BN_MP_SUB_C) #if defined(BN_MP_SUB_C)
#define BN_S_MP_ADD_C #define BN_S_MP_ADD_C
#define BN_MP_CMP_MAG_C #define BN_MP_CMP_MAG_C
@ -852,7 +914,6 @@
#endif #endif
#if defined(BN_MP_TO_UNSIGNED_BIN_C) #if defined(BN_MP_TO_UNSIGNED_BIN_C)
#define BN_REVERSE_C
#define BN_MP_INIT_COPY_C #define BN_MP_INIT_COPY_C
#define BN_MP_ISZERO_C #define BN_MP_ISZERO_C
#define BN_MP_DIV_2D_C #define BN_MP_DIV_2D_C
@ -994,7 +1055,3 @@
#else #else
#define LTM_LAST #define LTM_LAST
#endif #endif
/* $Source: /cvs/libtom/libtommath/tommath_class.h,v $ */
/* $Revision: 1.3 $ */
/* $Date: 2005/07/28 11:59:32 $ */

119
include/libtorrent/tommath_private.h Executable file
View File

@ -0,0 +1,119 @@
/* LibTomMath, multiple-precision integer library -- Tom St Denis
*
* LibTomMath is a library that provides multiple-precision
* integer arithmetic as well as number theoretic functionality.
*
* The library was designed directly after the MPI library by
* Michael Fromberger but has been written from scratch with
* additional optimizations in place.
*
* The library is free for all purposes without any express
* guarantee it works.
*
* Tom St Denis, tstdenis82@gmail.com, http://math.libtomcrypt.com
*/
#ifndef TOMMATH_PRIV_H_
#define TOMMATH_PRIV_H_
#include "libtorrent/tommath.h"
#include <ctype.h>
#define MIN(x,y) (((x) < (y)) ? (x) : (y))
#define MAX(x,y) (((x) > (y)) ? (x) : (y))
#ifdef __cplusplus
extern "C" {
/* C++ compilers don't like assigning void * to mp_digit * */
#define OPT_CAST(x) (x *)
#else
/* C on the other hand doesn't care */
#define OPT_CAST(x)
#endif
/* define heap macros */
#ifndef XMALLOC
/* default to libc stuff */
#define XMALLOC malloc
#define XFREE free
#define XREALLOC realloc
#define XCALLOC calloc
#else
/* prototypes for our heap functions */
extern void *XMALLOC(size_t n);
extern void *XREALLOC(void *p, size_t n);
extern void *XCALLOC(size_t n, size_t s);
extern void XFREE(void *p);
#endif
/* lowlevel functions, do not call! */
int s_mp_add(mp_int *a, mp_int *b, mp_int *c);
int s_mp_sub(mp_int *a, mp_int *b, mp_int *c);
#define s_mp_mul(a, b, c) s_mp_mul_digs(a, b, c, (a)->used + (b)->used + 1)
int fast_s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c, int digs);
int s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c, int digs);
int fast_s_mp_mul_high_digs(mp_int *a, mp_int *b, mp_int *c, int digs);
int s_mp_mul_high_digs(mp_int *a, mp_int *b, mp_int *c, int digs);
int fast_s_mp_sqr(mp_int *a, mp_int *b);
int s_mp_sqr(mp_int *a, mp_int *b);
int mp_karatsuba_mul(mp_int *a, mp_int *b, mp_int *c);
int mp_toom_mul(mp_int *a, mp_int *b, mp_int *c);
int mp_karatsuba_sqr(mp_int *a, mp_int *b);
int mp_toom_sqr(mp_int *a, mp_int *b);
int fast_mp_invmod(mp_int *a, mp_int *b, mp_int *c);
int mp_invmod_slow (mp_int * a, mp_int * b, mp_int * c);
int fast_mp_montgomery_reduce(mp_int *x, mp_int *n, mp_digit rho);
int mp_exptmod_fast(mp_int *G, mp_int *X, mp_int *P, mp_int *Y, int redmode);
int s_mp_exptmod (mp_int * G, mp_int * X, mp_int * P, mp_int * Y, int redmode);
void bn_reverse(unsigned char *s, int len);
extern const char *mp_s_rmap;
/* Fancy macro to set an MPI from another type.
* There are several things assumed:
* x is the counter and unsigned
* a is the pointer to the MPI
* b is the original value that should be set in the MPI.
*/
#define MP_SET_XLONG(func_name, type) \
int func_name (mp_int * a, type b) \
{ \
unsigned int x; \
int res; \
\
mp_zero (a); \
\
/* set four bits at a time */ \
for (x = 0; x < (sizeof(type) * 2u); x++) { \
/* shift the number up four bits */ \
if ((res = mp_mul_2d (a, 4, a)) != MP_OKAY) { \
return res; \
} \
\
/* OR in the top four bits of the source */ \
a->dp[0] |= (b >> ((sizeof(type) * 8u) - 4u)) & 15u; \
\
/* shift the source up to the next four bits */ \
b <<= 4; \
\
/* ensure that digits are not clamped off */ \
a->used += 1; \
} \
mp_clamp (a); \
return MP_OKAY; \
}
#ifdef __cplusplus
}
#endif
#endif
/* $Source$ */
/* $Revision$ */
/* $Date$ */

16
include/libtorrent/tommath_superclass.h
View File

@ -1,15 +1,7 @@
/* super class file for PK algos */ /* super class file for PK algos */
/* default ... include all MPI */ /* default ... include all MPI */
//#define LTM_ALL #define LTM_ALL
// these are the only functions used by libtorrent
#define BN_MP_EXPTMOD_C
#define BN_MP_UNSIGNED_BIN_SIZE_C
#define BN_MP_TO_UNSIGNED_BIN_C
#define BN_MP_READ_UNSIGNED_BIN_C
#define BN_MP_SET_INT_C
#define BNCORE_C
/* RSA only (does not support DH/DSA/ECC) */ /* RSA only (does not support DH/DSA/ECC) */
/* #define SC_RSA_1 */ /* #define SC_RSA_1 */
@ -79,6 +71,6 @@
#endif #endif
/* $Source: /cvs/libtom/libtommath/tommath_superclass.h,v $ */ /* $Source$ */
/* $Revision: 1.3 $ */ /* $Revision$ */
/* $Date: 2005/05/14 13:29:17 $ */ /* $Date$ */

3165
src/mpi.c
View File

File diff suppressed because it is too large Load Diff

26
test/test_pe_crypto.cpp
View File

@ -41,6 +41,10 @@ POSSIBILITY OF SUCH DAMAGE.
#include "setup_transfer.hpp" #include "setup_transfer.hpp"
#include "test.hpp" #include "test.hpp"
extern "C" {
#include "libtorrent/tommath.h"
}
#if !defined(TORRENT_DISABLE_ENCRYPTION) && !defined(TORRENT_DISABLE_EXTENSIONS) #if !defined(TORRENT_DISABLE_ENCRYPTION) && !defined(TORRENT_DISABLE_EXTENSIONS)
void test_enc_handler(libtorrent::crypto_plugin* a, libtorrent::crypto_plugin* b) void test_enc_handler(libtorrent::crypto_plugin* a, libtorrent::crypto_plugin* b)
@ -146,6 +150,28 @@ TORRENT_TEST(rc4)
test_enc_handler(&rc41, &rc42); test_enc_handler(&rc41, &rc42);
} }
TORRENT_TEST(tommath)
{
const unsigned char key[96] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2,
0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6,
0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD,
0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B, 0x30, 0x2B, 0x0A, 0x6D,
0xF2, 0x5F, 0x14, 0x37, 0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45,
0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6, 0xF4, 0x4C, 0x42, 0xE9,
0xA6, 0x3A, 0x36, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x05, 0x63
};
mp_int bigint;
mp_init(&bigint);
TEST_CHECK(mp_read_unsigned_bin(&bigint, key, sizeof(key)) == 0);
TEST_EQUAL(mp_unsigned_bin_size(&bigint), sizeof(key));
mp_clear(&bigint);
}
#else #else
TORRENT_TEST(disabled) TORRENT_TEST(disabled)
{ {