gnupg extension are now working

4 files changed, 188 insertions, 14 deletions

diff --git a/include/ChangeLog b/include/ChangeLog
index 05b40fa04..0df9e6836 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 13 17:31:32 1998  Werner Koch  (wk@isil.d.shuttle.de)
+
+	* g10lib.h: New as interface for the g10lib.
+
 Mon Jun  8 22:14:48 1998  Werner Koch  (wk@isil.d.shuttle.de)
 
 	* cipher.h (CIPHER_ALGO_CAST5): Changed name from .. CAST
diff --git a/include/cipher.h b/include/cipher.h
index 3fe56c2e3..7913e4a33 100644
--- a/include/cipher.h
+++ b/include/cipher.h
@@ -25,7 +25,7 @@
 #ifndef G10_CIPHER_H
 #define G10_CIPHER_H
 
-#define DBG_CIPHER cipher_debug_mode
+#define DBG_CIPHER g10c_debug_mode
 
 #include "mpi.h"
 #include "../cipher/md.h"
@@ -84,9 +84,8 @@ struct cipher_handle_s { char does_not_matter[1]; };
 #define CIPHER_MODE_DUMMY     5  /* used with algo DUMMY for no encryption */
 
 
-
-
-int cipher_debug_mode;
+int g10c_debug_mode;
+int g10_opt_verbose;
 
 /*-- dynload.c --*/
 void register_cipher_extension( const char *fname );
@@ -110,27 +109,22 @@ void cipher_sync( CIPHER_HANDLE c );
 #define PUBKEY_MAX_NSIG   2
 #define PUBKEY_MAX_NENC   2
 
+int string_to_pubkey_algo( const char *string );
+const char * pubkey_algo_to_string( int algo );
+int check_pubkey_algo( int algo );
+int check_pubkey_algo2( int algo, unsigned usage );
 int pubkey_get_npkey( int algo );
 int pubkey_get_nskey( int algo );
 int pubkey_get_nsig( int algo );
 int pubkey_get_nenc( int algo );
 unsigned pubkey_nbits( int algo, MPI *pkey );
+int pubkey_generate( int algo, unsigned nbits, MPI *skey, MPI **retfactors );
 int pubkey_check_secret_key( int algo, MPI *skey );
 int pubkey_encrypt( int algo, MPI *resarr, MPI data, MPI *pkey );
 int pubkey_decrypt( int algo, MPI *result, MPI *data, MPI *skey );
 int pubkey_sign( int algo, MPI *resarr, MPI hash, MPI *skey );
 int pubkey_verify( int algo, MPI hash, MPI *data, MPI *pkey );
 
-
-/*-- misc.c --*/
-int string_to_pubkey_algo( const char *string );
-int string_to_digest_algo( const char *string );
-const char * pubkey_algo_to_string( int algo );
-const char * digest_algo_to_string( int algo );
-int check_pubkey_algo( int algo );
-int check_pubkey_algo2( int algo, unsigned usage );
-int check_digest_algo( int algo );
-
 /*-- smallprime.c --*/
 extern ushort small_prime_numbers[];
 
diff --git a/include/distfiles b/include/distfiles
index 35ca3220b..6257e96ed 100644
--- a/include/distfiles
+++ b/include/distfiles
@@ -8,4 +8,6 @@ types.h
 util.h
 i18n.h
 
+g10lib.h
+
 ChangeLog
diff --git a/include/g10lib.h b/include/g10lib.h
new file mode 100644
index 000000000..12e846ca8
--- /dev/null
+++ b/include/g10lib.h
@@ -0,0 +1,174 @@
+/* g10lib.h -  GNU digital encryption libray interface
+ *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *
+ * FIXME:  This should allow XFree programs etc to use the header.
+ */
+
+#ifndef _g10lib_G10LIB_H
+#define _g10lib_G10LIB_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+#ifndef _g10lib_INTERNAL
+struct g10mpi_struct { int hidden_stuff; };
+typedef struct g10mpi_struct *MPI;
+#endif
+
+int g10c_debug_mode;
+int g10_opt_verbose;
+
+/********************************
+ *******  math functions  *******
+ ********************************/
+MPI  g10m_new( unsigned nbits );
+MPI  g10m_new_secure( unsigned nbits );
+void g10m_release( MPI a );
+void g10m_resize( MPI a, unsigned nbits );
+MPI  g10m_copy( MPI a );
+void g10m_swap( MPI a, MPI b);
+void g10m_set( MPI w, MPI u);
+void g10m_set_ui( MPI w, unsigned long u);
+void g10m_set_bytes( MPI a, unsigned nbits, unsigned char (*fnc)(int), int opaque );
+int  g10m_cmp( MPI u, MPI v );
+int  g10m_cmp_ui( MPI u, unsigned long v );
+
+
+void g10m_add(MPI w, MPI u, MPI v);
+void g10m_add_ui(MPI w, MPI u, unsigned long v );
+void g10m_sub( MPI w, MPI u, MPI v);
+void g10m_sub_ui(MPI w, MPI u, unsigned long v );
+
+void g10m_mul_ui(MPI w, MPI u, unsigned long v );
+void g10m_mul_2exp( MPI w, MPI u, unsigned long cnt);
+void g10m_mul( MPI w, MPI u, MPI v);
+void g10m_mulm( MPI w, MPI u, MPI v, MPI m);
+
+void g10m_fdiv_q( MPI quot, MPI dividend, MPI divisor );
+
+void g10m_powm( MPI res, MPI base, MPI exp, MPI mod);
+
+int  g10m_gcd( MPI g, MPI a, MPI b );
+int  g10m_invm( MPI x, MPI u, MPI v );
+
+unsigned g10m_get_nbits( MPI a );
+unsigned g10m_get_size( MPI a );
+
+
+/********************************************
+ *******  symmetric cipher functions  *******
+ ********************************************/
+
+
+
+/*********************************************
+ *******  asymmetric cipher functions  *******
+ *********************************************/
+
+
+
+
+/*********************************************
+ *******  cryptograhic hash functions  *******
+ *********************************************/
+
+
+/*****************************************
+ *******  miscellaneous functions  *******
+ *****************************************/
+
+MPI	      g10c_generate_secret_prime( unsigned nbits );
+unsigned char g10c_get_random_byte( int level );
+
+
+void *g10_malloc( size_t n );
+void *g10_calloc( size_t n );
+void *g10_malloc_secure( size_t n );
+void *g10_calloc_secure( size_t n );
+void *g10_realloc( void *a, size_t n );
+void  g10_free( void *p );
+char *g10_strdup( const char * a);
+
+void g10_log_bug( const char *fmt, ... );
+void g10_log_bug0( const char *, int );
+void g10_log_fatal( const char *fmt, ... );
+void g10_log_error( const char *fmt, ... );
+void g10_log_info( const char *fmt, ... );
+void g10_log_debug( const char *fmt, ... );
+void g10_log_hexdump( const char *text, char *buf, size_t len );
+void g10_log_mpidump( const char *text, MPI a );
+
+
+/***************************
+ *******  constants  *******
+ **************************/
+#define CIPHER_ALGO_NONE	 0
+#define CIPHER_ALGO_IDEA	 1
+#define CIPHER_ALGO_3DES	 2
+#define CIPHER_ALGO_CAST5	 3
+#define CIPHER_ALGO_BLOWFISH	 4  /* blowfish 128 bit key */
+#define CIPHER_ALGO_SAFER_SK128  5
+#define CIPHER_ALGO_DES_SK	 6
+#define CIPHER_ALGO_BLOWFISH160 42  /* blowfish 160 bit key (not in OpenPGP)*/
+#define CIPHER_ALGO_DUMMY      110  /* no encryption at all */
+
+#define PUBKEY_ALGO_RSA        1
+#define PUBKEY_ALGO_RSA_E      2     /* RSA encrypt only */
+#define PUBKEY_ALGO_RSA_S      3     /* RSA sign only */
+#define PUBKEY_ALGO_ELGAMAL_E 16     /* encrypt only ElGamal (but not vor v3)*/
+#define PUBKEY_ALGO_DSA       17
+#define PUBKEY_ALGO_ELGAMAL   20     /* sign and encrypt elgamal */
+
+#define DIGEST_ALGO_MD5       1
+#define DIGEST_ALGO_SHA1      2
+#define DIGEST_ALGO_RMD160    3
+#define DIGEST_ALGO_TIGER     6
+
+#define is_RSA(a)     ((a)==PUBKEY_ALGO_RSA || (a)==PUBKEY_ALGO_RSA_E \
+		       || (a)==PUBKEY_ALGO_RSA_S )
+#define is_ELGAMAL(a) ((a)==PUBKEY_ALGO_ELGAMAL || (a)==PUBKEY_ALGO_ELGAMAL_E)
+
+#define G10ERR_GENERAL	       1
+#define G10ERR_PUBKEY_ALGO     4
+#define G10ERR_DIGEST_ALGO     5
+#define G10ERR_BAD_PUBKEY      6
+#define G10ERR_BAD_SECKEY      7
+#define G10ERR_BAD_SIGN        8
+#define G10ERR_CIPHER_ALGO    12
+#define G10ERR_WRONG_SECKEY   18
+#define G10ERR_UNSUPPORTED    19
+#define G10ERR_NI_PUBKEY      27
+#define G10ERR_NI_CIPHER      28
+#define G10ERR_BAD_MPI	      30
+#define G10ERR_WR_PUBKEY_ALGO 41
+
+
+/***********************************
+ *******  some handy macros  *******
+ ***********************************/
+
+#ifndef BUG
+  #define BUG() g10_log_bug0( __FILE__ , __LINE__ )
+#endif
+
+#ifndef STR
+  #define STR(v) #v
+  #define STR2(v) STR(v)
+#endif
+
+#ifndef DIM
+  #define DIM(v) (sizeof(v)/sizeof((v)[0]))
+  #define DIMof(type,member)   DIM(((type *)0)->member)
+#endif
+
+
+#define DBG_CIPHER  g10c_debug_mode
+#define OPT_VERBOSE g10_opt_verbose
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _g10lib_G10LIB_H */