diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/cipher.h | 33 | ||||
| -rw-r--r-- | include/mpi.h | 6 |
2 files changed, 23 insertions, 16 deletions
diff --git a/include/cipher.h b/include/cipher.h index e178b5f4e..e3280428f 100644 --- a/include/cipher.h +++ b/include/cipher.h @@ -38,20 +38,27 @@ #include "../cipher/elgamal.h" -#define CIPHER_ALGO_NONE 0 -#define CIPHER_ALGO_IDEA 1 /* used only for documentation */ -#define CIPHER_ALGO_BLOWFISH 42 -#define CIPHER_ALGO_GOST 43 +#define CIPHER_ALGO_NONE 0 +#define CIPHER_ALGO_IDEA 1 +#define CIPHER_ALGO_3DES 2 +#define CIPHER_ALGO_CAST 3 +#define CIPHER_ALGO_BLOWFISH128 4 /* blowfish 128 bit key */ +#define CIPHER_ALGO_ROT_N 5 +#define CIPHER_ALGO_SAFER_SK128 6 +#define CIPHER_ALGO_DES_SK 7 +#define CIPHER_ALGO_BLOWFISH 42 /* blowfish 160 bit key (not in OpenPGP)*/ +#define CIPHER_ALGO_GOST 43 /* (Not in OpenPGP) */ #define PUBKEY_ALGO_RSA 1 -#define PUBKEY_ALGO_ELGAMAL 42 +#define PUBKEY_ALGO_RSA_E 2 /* RSA encrypt only */ +#define PUBKEY_ALGO_RSA_S 3 /* RSA sign only */ +#define PUBKEY_ALGO_ELGAMAL 16 +#define PUBKEY_ALGO_DSA 17 #define DIGEST_ALGO_MD5 1 -#define DIGEST_ALGO_RMD160 42 +#define DIGEST_ALGO_SHA1 2 +#define DIGEST_ALGO_RMD160 3 -#define DEFAULT_CIPHER_ALGO CIPHER_ALGO_BLOWFISH -#define DEFAULT_PUBKEY_ALGO PUBKEY_ALGO_RSA -#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_RMD160 typedef struct { int algo; @@ -78,12 +85,8 @@ byte get_random_byte( int level ); extern ushort small_prime_numbers[]; /*-- primegen.c --*/ -MPI generate_random_prime( unsigned nbits ); - -/*-- seskey.c --*/ -void make_session_key( DEK *dek ); -MPI encode_session_key( DEK *dek, unsigned nbits ); -MPI encode_rmd160_value( byte *md, unsigned len, unsigned nbits ); +MPI generate_secret_prime( unsigned nbits ); +MPI generate_public_prime( unsigned nbits ); #endif /*G10_CIPHER_H*/ diff --git a/include/mpi.h b/include/mpi.h index 096cffec9..25fa696c4 100644 --- a/include/mpi.h +++ b/include/mpi.h @@ -51,6 +51,7 @@ typedef struct mpi_struct { #define MPI_NULL NULL #define mpi_get_nlimbs(a) ((a)->nlimbs) +#define mpi_is_neg(a) ((a)->sign) /*-- mpiutil.c --*/ @@ -101,13 +102,16 @@ u32 mpi_get_keyid( MPI a, u32 *keyid ); /*-- mpi-add.c --*/ void mpi_add_ui(MPI w, MPI u, ulong v ); void mpi_add(MPI w, MPI u, MPI v); +void mpi_addm(MPI w, MPI u, MPI v, MPI m); void mpi_sub_ui(MPI w, MPI u, ulong v ); void mpi_sub( MPI w, MPI u, MPI v); +void mpi_subm( MPI w, MPI u, MPI v, MPI m); /*-- mpi-mul.c --*/ void mpi_mul_ui(MPI w, MPI u, ulong v ); void mpi_mul_2exp( MPI w, MPI u, ulong cnt); void mpi_mul( MPI w, MPI u, MPI v); +void mpi_mulm( MPI w, MPI u, MPI v, MPI m); /*-- mpi-div.c --*/ ulong mpi_fdiv_r_ui( MPI rem, MPI dividend, ulong divisor ); @@ -142,7 +146,7 @@ void mpi_set_bytes( MPI a, unsigned nbits, byte (*fnc)(int), int opaque ); void mpi_rshift( MPI x, MPI a, unsigned n ); /*-- mpi-inv.c --*/ -void mpi_inv_mod( MPI x, MPI u, MPI v ); +void mpi_invm( MPI x, MPI u, MPI v ); #endif /*G10_MPI_H*/ |