See ChangeLog: Mon Jan 31 16:37:34 CET 2000 Werner Koch

ChangeLog

@@ -1,3 +1,7 @@
+Mon Jan 31 16:37:34 CET 2000  Werner Koch  <wk@gnupg.de>
+
+	* configure.in: Create a symlink for types.h in gcrypt/.
+
 Thu Jan 27 18:00:44 CET 2000  Werner Koch  <wk@gnupg.de>
 
 	* configure.in (g10defs.h): Replaced by gnupg-defs.h

cipher/ChangeLog

@@ -1,3 +1,8 @@
+Mon Jan 31 16:37:34 CET 2000  Werner Koch  <wk@gnupg.de>
+
+	* genprime.c (generate_elg_prime): Fixed returned factors which never
+	worked for non-DSA keys.
+
 Thu Jan 27 18:00:44 CET 2000  Werner Koch  <wk@gnupg.de>
 
 	* pubkey.c (sexp_to_key): Fixed mem leaks in case of errors.

cipher/primegen.c

@@ -221,7 +221,7 @@ generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
 		(*ret_factors)[i] = mpi_copy( factors[i] );
 	}
 	else {
-	    for(; i < n; i++ )
+	    for(i=0; i < n; i++ )
 		(*ret_factors)[i] = mpi_copy( factors[i] );
 	}
     }

configure.in

@@ -671,8 +671,9 @@ if echo "$VERSION" | sed 's/-.*//' | grep "$tmp_pat" >/dev/null ; then
     AC_DEFINE(IS_DEVELOPMENT_VERSION)
 fi
 
-dnl Temp workaround:
+dnl Temp workarounds:
 GNUPG_LINK_FILES(gcrypt/gcrypt.h, gcrypt.h )
+GNUPG_LINK_FILES(include/typtes.h, gcrypt/types.h )
 
 AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
 

g10/ChangeLog

@@ -1,3 +1,9 @@
+Mon Jan 31 16:37:34 CET 2000  Werner Koch  <wk@gnupg.de>
+
+	* keygen.c (gen_dsa): Modified to work with gcry_pk_genkey.
+
+	* Removed dummy-cipher.h from all files.
+
 Thu Jan 27 18:00:44 CET 2000  Werner Koch  <wk@gnupg.de>
 
 	* keygen.c (gen_elg): Modified to work with gcry_pk_genkey.

g10/build-packet.c

@@ -28,7 +28,6 @@
 #include "errors.h"
 #include "iobuf.h"
 #include "util.h"
-#include "dummy-cipher.h"
 #include <gcrypt.h>
 #include "options.h"
 #include "main.h"

g10/encr-data.c

@@ -26,7 +26,6 @@
 #include <gcrypt.h>
 #include "util.h"
 #include "packet.h"
-#include "dummy-cipher.h"
 #include "options.h"
 #include "i18n.h"
 

g10/free-packet.c

@@ -27,7 +27,6 @@
 #include "packet.h"
 #include "iobuf.h"
 #include "util.h"
-#include "dummy-cipher.h"
 #include <gcrypt.h>
 #include "options.h"
 #include "main.h"

g10/gpgd.c

@@ -38,7 +38,6 @@
 #include <sys/stat.h>
 
 #include "util.h"
-#include "dummy-cipher.h"
 #include "options.h"
 #include "main.h"
 

g10/keygen.c

@@ -29,7 +29,6 @@
 #include <gcrypt.h>
 #include "main.h"
 #include "packet.h"
-#include "dummy-cipher.h"
 #include "ttyio.h"
 #include "options.h"
 #include "keydb.h"
@@ -296,8 +295,6 @@ gen_elg(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
 				   algo == GCRY_PK_ELG	 ? "elg" : "x-oops",0),
 			    gcry_sexp_new_name_data( "nbits", buf, 0 ) )
 			);
-    log_debug("input is:\n");
-    gcry_sexp_dump( s_parms );
 
     rc = gcry_pk_genkey( &s_key, s_parms );
     gcry_sexp_release( s_parms );
@@ -305,8 +302,6 @@ gen_elg(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
 	log_error("pk_genkey failed: %s\n", gpg_errstr(rc) );
 	return rc;
     }
-    log_debug("output is:\n");
-    gcry_sexp_dump( s_key );
 
     sk = gcry_xcalloc( 1, sizeof *sk );
     pk = gcry_xcalloc( 1, sizeof *pk );
@@ -385,16 +380,23 @@ gen_dsa(unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
     PACKET *pkt;
     PKT_secret_key *sk;
     PKT_public_key *pk;
-    MPI skey[5];
     MPI *factors;
+    char buf[100];
+    GCRY_SEXP s_parms, s_key;
 
     if( nbits > 1024 )
 	nbits = 1024;
 
-    /*rc = pubkey_generate( GCRY_PK_DSA, nbits, skey, &factors );*/
+    sprintf(buf, "%u", nbits );
-    rc = gcry_pk_genkey( NULL, NULL );
+    s_parms = SEXP_CONS( SEXP_NEW( "genkey", 0 ),
+		 SEXP_CONS( SEXP_NEW("dsa",0),
+			    gcry_sexp_new_name_data( "nbits", buf, 0 ) )
+			);
+
+    rc = gcry_pk_genkey( &s_key, s_parms );
+    gcry_sexp_release( s_parms );
     if( rc ) {
-	log_error("pubkey_generate failed: %s\n", gpg_errstr(rc) );
+	log_error("pk_genkey failed: %s\n", gpg_errstr(rc) );
 	return rc;
     }
 
@@ -406,15 +408,23 @@ gen_dsa(unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
 	sk->expiredate = pk->expiredate = sk->timestamp + expireval;
     }
     sk->pubkey_algo = pk->pubkey_algo = GCRY_PK_DSA;
-		       pk->pkey[0] = mpi_copy( skey[0] );
+
-		       pk->pkey[1] = mpi_copy( skey[1] );
+    rc = key_from_sexp( pk->pkey, s_key, "public-key", "pqgy" );
-		       pk->pkey[2] = mpi_copy( skey[2] );
+    if( rc ) {
-		       pk->pkey[3] = mpi_copy( skey[3] );
+	log_error("key_from_sexp failed: rc=%d\n", rc );
-    sk->skey[0] = skey[0];
+	return rc;
-    sk->skey[1] = skey[1];
+    }
-    sk->skey[2] = skey[2];
+    rc = key_from_sexp( sk->skey, s_key, "private-key", "pqgyx" );
-    sk->skey[3] = skey[3];
+    if( rc ) {
-    sk->skey[4] = skey[4];
+	log_error("key_from_sexp failed: rc=%d\n", rc );
+	return rc;
+    }
+    rc = factors_from_sexp( &factors, s_key );
+    if( rc ) {
+	log_error("factors_from_sexp failed: rc=%d\n", rc );
+	return rc;
+    }
+
     sk->is_protected = 0;
     sk->protect.algo = 0;
 
@@ -453,6 +463,8 @@ gen_dsa(unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
 	add_kbnode( sec_root,
 		    make_mpi_comment_node("#:DSA_factor:", factors[i] ));
 
+    /* fixme: Merge this with the elg-generate function and release
+     * some more stuff */
     return 0;
 }
 

g10/packet.h

@@ -23,7 +23,6 @@
 
 #include "types.h"
 #include "iobuf.h"
-#include "dummy-cipher.h"
 #include "filter.h"
 
 #ifndef DID_MPI_TYPEDEF

g10/parse-packet.c

@@ -27,7 +27,6 @@
 #include "packet.h"
 #include "iobuf.h"
 #include "util.h"
-#include "dummy-cipher.h"
 #include <gcrypt.h>
 #include "filter.h"
 #include "options.h"

g10/passphrase.c

@@ -28,7 +28,6 @@
 #include <gcrypt.h>
 #include "options.h"
 #include "ttyio.h"
-#include "dummy-cipher.h"
 #include "keydb.h"
 #include "main.h"
 #include "i18n.h"

g10/pubkey-enc.c

@@ -29,7 +29,6 @@
 #include "main.h"
 #include "keydb.h"
 #include "trustdb.h"
-#include "dummy-cipher.h"
 #include "status.h"
 #include "options.h"
 #include "i18n.h"

g10/seskey.c

@@ -26,7 +26,6 @@
 
 #include <gcrypt.h>
 #include "util.h"
-#include "dummy-cipher.h"
 #include "main.h"
 #include "i18n.h"
 

g10/skclist.c

@@ -32,7 +32,6 @@
 #include "keydb.h"
 #include "util.h"
 #include "i18n.h"
-#include "dummy-cipher.h"
 #include "main.h"
 
 

include/distfiles

@@ -1,14 +1,10 @@
-cipher.h
 errors.h
 iobuf.h
-memory.h
-mpi.h
 ttyio.h
 types.h
 util.h
 i18n.h
 host2net.h
 http.h
-g10lib.h
 
 ChangeLog

jnlib/Makefile.am

@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 # Those 2 files are in the CVS but currently not used.
-EXTRA_DIST = README xmalloc.c xmalloc.h logging.c logging.c
+EXTRA_DIST = README xmalloc.c xmalloc.h logging.c logging.h
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
 

po/POTFILES.in

@@ -14,7 +14,7 @@ cipher/rndlinux.c
 
 # main program
 
-g10/g10.c
+g10/gpg.c
 g10/armor.c
 g10/pkclist.c
 g10/keygen.c