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

See ChangeLog: Sat Jun 26 12:15:59 CEST 1999 Werner Koch

Browse source
This commit is contained in:
Werner Koch 1999-06-26 10:23:06 +00:00
parent 1423b4239b
commit 080c9ca49f
39 changed files with 2651 additions and 1912 deletions
Download patch file Download diff file Expand all files Collapse all files

14
g10/ChangeLog
View file

@ -1,6 +1,16 @@
Tue Jun 15 12:21:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
Sat Jun 26 12:15:59 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* dearmor.c (enarmor_file): Fixed comment string.
* tdbdump.c (export_ownertrust): Text fix.
* tbio.c (tdbio_invalid): Ditto.
* parse-packet.c (parse_key): Made temp buffer larger.
* Makefile.am (install-data-local): Add missing backslashes
Tue Jun 15 12:21:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* g10.c (main): Made iterated+salted the default S2K method.
* Makefile.am (install-data-local): Use DESTDIR.
@ -13,7 +23,7 @@ Tue Jun 15 12:21:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
Mon Jun 14 21:18:54 CEST 1999 Michael Roth <mroth@nessie.de>
* g10.c: New options --openpgp, --no-tty, --emit-version,
--default-comment and --lock-multiple
--default-comment and --lock-multiple
Thu Jun 10 14:18:23 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

6
g10/Makefile.am
View file

@ -86,8 +86,8 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/options.skel \
$(DESTDIR)$(pkgdatadir)/options.skel
@set -e;\
if test -f $(DESTDIR)$(bindir)/gpgm ; then
echo "removing obsolete gpgm binary"
rm $(DESTDIR)$(bindir)/gpgm ;
if test -f $(DESTDIR)$(bindir)/gpgm ; then \
echo "removing obsolete gpgm binary" ; \
rm $(DESTDIR)$(bindir)/gpgm ; \
fi

2
g10/dearmor.c
View file

@ -103,7 +103,7 @@ enarmor_file( const char *fname )
goto leave;
afx.what = 4;
afx.hdrlines = "Comment: Use \"gpgm --dearmor\" for unpacking\n";
afx.hdrlines = "Comment: Use \"gpg --dearmor\" for unpacking\n";
iobuf_push_filter( out, armor_filter, &afx );
while( (c = iobuf_get(inp)) != -1 )

2
g10/keyedit.c
View file

@ -842,10 +842,12 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands )
break;
case cmdADDKEY:
secmem_dump_stats();
if( generate_subkeypair( keyblock, sec_keyblock ) ) {
redisplay = 1;
sec_modified = modified = 1;
}
secmem_dump_stats();
break;

4
g10/parse-packet.c
View file

@ -1281,7 +1281,7 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
if( pkttype == PKT_SECRET_KEY || pkttype == PKT_SECRET_SUBKEY ) {
PKT_secret_key *sk = pkt->pkt.secret_key;
byte temp[8];
byte temp[16];
if( !npkey ) {
sk->skey[0] = mpi_set_opaque( NULL,
@ -1370,6 +1370,8 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
* so a
* sk->protect.ivlen = cipher_get_blocksize(sk->protect.algo);
* won't work. The only solution I see is to hardwire it here.
* NOTE: if you change the ivlen above 16, don't forget to
* enlarge temp.
*/
switch( sk->protect.algo ) {
case 7: case 8: case 9: /* reserved for AES */

2
g10/tdbdump.c
View file

@ -399,7 +399,7 @@ export_ownertrust()
init_trustdb();
printf(_("# List of assigned trustvalues, created %s\n"
"# (Use \"gpgm --import-ownertrust\" to restore them)\n"),
"# (Use \"gpg --import-ownertrust\" to restore them)\n"),
asctimestamp( make_timestamp() ) );
for(recnum=0; !tdbio_read_record( recnum, &rec, 0); recnum++ ) {
if( rec.rectype == RECTYPE_DIR ) {

2
g10/tdbio.c
View file

@ -1627,7 +1627,7 @@ void
tdbio_invalid(void)
{
log_error(_(
"The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n") );
"the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n") );
g10_exit(2);
}