security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

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

Browse source
This commit is contained in:
Werner Koch 2000-01-31 15:27:03 +00:00
parent baa30ad117
commit 100fc8da59
27 changed files with 3087 additions and 2975 deletions
Download patch file Download diff file Expand all files Collapse all files

6
g10/ChangeLog
View file

@ -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.

1
g10/build-packet.c
View file

@ -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"

1
g10/encr-data.c
View file

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

1
g10/free-packet.c
View file

@ -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"

1
g10/gpgd.c
View file

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

48
g10/keygen.c
View file

@ -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 );*/
rc = gcry_pk_genkey( NULL, NULL );
sprintf(buf, "%u", nbits );
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] );
pk->pkey[2] = mpi_copy( skey[2] );
pk->pkey[3] = mpi_copy( skey[3] );
sk->skey[0] = skey[0];
sk->skey[1] = skey[1];
sk->skey[2] = skey[2];
sk->skey[3] = skey[3];
sk->skey[4] = skey[4];
rc = key_from_sexp( pk->pkey, s_key, "public-key", "pqgy" );
if( rc ) {
log_error("key_from_sexp failed: rc=%d\n", rc );
return rc;
}
rc = key_from_sexp( sk->skey, s_key, "private-key", "pqgyx" );
if( rc ) {
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;
}

1
g10/packet.h
View file

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

1
g10/parse-packet.c
View file

@ -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"

1
g10/passphrase.c
View file

@ -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"

1
g10/pubkey-enc.c
View file

@ -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"

1
g10/seskey.c
View file

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

1
g10/skclist.c
View file

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