mirror of git://git.gnupg.org/gnupg.git
Some experimental support for other random gatheres
This commit is contained in:
Werner Koch
parent
2e494682b6
commit
71134011e3
9
AUTHORS
9
AUTHORS
|
|
@ -48,3 +48,12 @@ TRANSLATIONS Urko Lusa ??????????
|
|||
es_ES.po
|
||||
|
||||
|
||||
Other notes:
|
||||
============
|
||||
The file cipher/rndunix.c is heavily based on Peter Gutmann's
|
||||
rndunix.c from cryptlib. - He promised to add the GPL as an alternative
|
||||
license to this and some other files. We don't have a dissclaimer for
|
||||
this file, but due to the fact that this is only needed for non-free
|
||||
system we can easily remove this from the distribution and put it as
|
||||
a module on some FTP server.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
Wed Nov 25 12:38:29 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
* configure.in (USE_RNDLINUX): New.
|
||||
|
||||
Fri Nov 20 19:34:57 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
* VERSION: Released 0.4.4
|
||||
|
|
|
|||
6
NEWS
6
NEWS
|
|
@ -1,3 +1,9 @@
|
|||
|
||||
*
|
||||
|
||||
|
||||
|
||||
|
||||
Noteworthy changes in version 0.4.4
|
||||
-----------------------------------
|
||||
|
||||
|
|
|
|||
2
TODO
2
TODO
|
|
@ -14,8 +14,6 @@
|
|||
a next pointer ro more records - check wehther the reuse code really
|
||||
works. Maybe this is the reason for the "Hmmm public key lost"
|
||||
|
||||
* Update the keyring at ftp.guug.de
|
||||
|
||||
* check support for mpi/powerpc (see Brian's mail)
|
||||
|
||||
* use zlib 1.1.13 to avoid a bug with 13 bit windows
|
||||
|
|
|
|||
11
acconfig.h
11
acconfig.h
|
|
@ -65,10 +65,13 @@
|
|||
#undef HAVE_BROKEN_MLOCK
|
||||
|
||||
/* One of the following macros is defined to select which of
|
||||
* the cipher/rand-xxxx.c should be used */
|
||||
#undef USE_RAND_DUMMY
|
||||
#undef USE_RAND_UNIX
|
||||
#undef USE_RAND_W32
|
||||
* the cipher/rndxxxx.c is linked into the program */
|
||||
#undef USE_RNDLINUX
|
||||
#undef USE_RNDUNIX
|
||||
#undef USE_RNDOS2
|
||||
#undef USE_RNDATARI
|
||||
#undef USE_RNDW32
|
||||
#undef USE_RNDMVS
|
||||
/* defined if we have a /dev/random and /dev/urandom */
|
||||
#undef HAVE_DEV_RANDOM
|
||||
/* and the real names of the random devices */
|
||||
|
|
|
|||
|
|
@ -61,7 +61,12 @@ chdir () {
|
|||
|
||||
|
||||
have_hash_algo () {
|
||||
../g10/gpgm --homedir . --version | grep "Hash:.*$1" >/dev/null
|
||||
if ../g10/gpgm --homedir . --version | grep "Hash:.*$1" >/dev/null
|
||||
then
|
||||
true
|
||||
else
|
||||
false
|
||||
fi
|
||||
}
|
||||
|
||||
set -e
|
||||
|
|
|
|||
|
|
@ -96,16 +96,15 @@ case "${target}" in
|
|||
CPP="i386--mingw32-gcc -E"
|
||||
RANLIB="i386--mingw32-ranlib"
|
||||
ac_cv_have_dev_random=no
|
||||
AC_DEFINE(USE_RAND_W32)
|
||||
AC_DEFINE(USE_RNDW32)
|
||||
;;
|
||||
*-*-hpux*)
|
||||
if test -z "$GCC" ; then
|
||||
CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"
|
||||
fi
|
||||
AC_DEFINE(USE_RAND_UNIX)
|
||||
AC_DEFINE(USE_RNDUNIX)
|
||||
;;
|
||||
*)
|
||||
AC_DEFINE(USE_RAND_UNIX)
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -227,6 +226,7 @@ AC_CACHE_CHECK(for random device, ac_cv_have_dev_random,
|
|||
ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi])
|
||||
if test "$ac_cv_have_dev_random" = yes; then
|
||||
AC_DEFINE(HAVE_DEV_RANDOM)
|
||||
AC_DEFINE(USE_RNDLINUX)
|
||||
fi
|
||||
else
|
||||
AC_MSG_CHECKING(for random device)
|
||||
|
|
|
|||
15
doc/FAQ
15
doc/FAQ
|
|
@ -299,3 +299,18 @@
|
|||
above key and user ID, if it is a signature which is direct
|
||||
on a key, the user ID part is empty (..//..).
|
||||
|
||||
|
||||
Q: How do I sign a patch file?
|
||||
A: Use "gpg --clearsign --not-dash-escaped ...".
|
||||
The problem with --clearsign is
|
||||
that all lines starting with a dash are quoted with "- "; obviously
|
||||
diff produces many of lines starting with a dash and these are
|
||||
then quoted and that is not good for patch ;-). In order to use
|
||||
a patch file without removing the cleartext signature, the special
|
||||
option --not-dash-escaped may be used to suppress generation of
|
||||
these escape sequences. You should not mail such a patch because
|
||||
spaces and line endings are also subject to the signature and a mailer
|
||||
may not preserve these. If you want to mail a file you can simply sign
|
||||
it using your MUA.
|
||||
|
||||
|
||||
|
|
|
|||
28
g10/g10.c
28
g10/g10.c
|
|
@ -25,7 +25,7 @@
|
|||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
/* #define MAINTAINER_OPTIONS */
|
||||
#define MAINTAINER_OPTIONS
|
||||
|
||||
#include "packet.h"
|
||||
#include "iobuf.h"
|
||||
|
|
@ -262,7 +262,6 @@ static ARGPARSE_OPTS opts[] = {
|
|||
|
||||
/* hidden options */
|
||||
#ifdef IS_G10MAINT
|
||||
{ aTest, "test" , 0, "@" },
|
||||
{ aExportOwnerTrust, "list-ownertrust",0 , "@"}, /* alias */
|
||||
{ aListTrustDB, "list-trustdb",0 , "@"},
|
||||
{ aListTrustPath, "list-trust-path",0, "@"},
|
||||
|
|
@ -652,7 +651,6 @@ main( int argc, char **argv )
|
|||
#else
|
||||
#ifdef MAINTAINER_OPTIONS
|
||||
case aPrimegen: set_cmd( &cmd, aPrimegen); break;
|
||||
case aTest: set_cmd( &cmd, aTest); break;
|
||||
case aGenRandom: set_cmd( &cmd, aGenRandom); break;
|
||||
#endif
|
||||
case aPrintMD: set_cmd( &cmd, aPrintMD); break;
|
||||
|
|
@ -1148,15 +1146,20 @@ main( int argc, char **argv )
|
|||
if( argc < 1 || argc > 2 )
|
||||
wrong_args("--gen-random level [hex]");
|
||||
{
|
||||
int c;
|
||||
int level = atoi(*argv);
|
||||
for(;;) {
|
||||
byte *p = get_random_bits( 8, level, 0);
|
||||
if( argc == 1 ) {
|
||||
byte *p;
|
||||
if( argc == 2 ) {
|
||||
p = get_random_bits( 8, level, 0);
|
||||
printf("%02x", *p );
|
||||
fflush(stdout);
|
||||
}
|
||||
else
|
||||
putchar(c&0xff);
|
||||
else {
|
||||
p = get_random_bits( 800, level, 0);
|
||||
for(c=0; c < 100; c++ )
|
||||
putchar( p[c] );
|
||||
}
|
||||
m_free(p);
|
||||
}
|
||||
}
|
||||
|
|
@ -1192,10 +1195,6 @@ main( int argc, char **argv )
|
|||
}
|
||||
break;
|
||||
|
||||
#ifdef MAINTAINER_OPTIONS
|
||||
case aTest: do_test( argc? atoi(*argv): 1 ); break;
|
||||
#endif /* MAINTAINER OPTIONS */
|
||||
|
||||
case aListTrustDB:
|
||||
if( !argc )
|
||||
list_trustdb(NULL);
|
||||
|
|
@ -1418,12 +1417,5 @@ print_mds( const char *fname, int algo )
|
|||
|
||||
|
||||
|
||||
#ifdef MAINTAINER_OPTIONS
|
||||
static void
|
||||
do_test(int times)
|
||||
{
|
||||
m_check(NULL);
|
||||
}
|
||||
#endif /* MAINTAINER OPTIONS */
|
||||
#endif /* IS_G10MAINT */
|
||||
|
||||
|
|
|
|||
|
|
@ -291,7 +291,7 @@ do_we_trust( PKT_public_key *pk, int trustlevel )
|
|||
|
||||
case TRUST_MARGINAL:
|
||||
log_info(
|
||||
_("%08lX: It is not sure taht this key really belongs to the owner\n"
|
||||
_("%08lX: It is not sure that this key really belongs to the owner\n"
|
||||
"but it is accepted anyway\n"), (ulong)keyid_from_pk( pk, NULL) );
|
||||
return 1; /* yes */
|
||||
|
||||
|
|
|
|||
61
po/de.glo
61
po/de.glo
|
|
@ -1,51 +1,80 @@
|
|||
# Glossary for GnuPG german translation
|
||||
# Copyright (C) 1998 Free Software Foundation, Inc.
|
||||
# Walter Koch <walterk@dip.de>, 1998.
|
||||
# This is just a textfile for your information.
|
||||
# It will _not_ be read or processed automatically by any program
|
||||
|
||||
........ Authentisierung
|
||||
algorithm Verfahren
|
||||
anonymous ungenannter
|
||||
armor ASCII-Hülle
|
||||
bad [signature] falsch[e] Unterschrift
|
||||
bug Wanze (Programmfehler)
|
||||
certificate Zertifikat
|
||||
character set Zeichensatz
|
||||
checksum Prüfsumme
|
||||
cipher algorithm Verschlüsselungsverfahren
|
||||
compress algorithm Komprimierverfahren
|
||||
clearsig header Klartextsignatur-Einleitung
|
||||
compress algorithm Komprimierverfahren *
|
||||
core dump core-dump
|
||||
corrupted beschädigter
|
||||
dash escaped mit Bindestrich \"escapte\"
|
||||
decryption Enschlüsselung
|
||||
DEK Session Schlüssel \"data encryption key\" (wk)
|
||||
delete entfernen
|
||||
digest algorithm Hashmethode
|
||||
encrypted verschlüsselte
|
||||
expire date Verfallsdatum
|
||||
failed fehlgeschlagen
|
||||
fingerprint Fingerabdruck
|
||||
for-your-eyes-only Vertraulichkeit (\"for-your-eyes-only\")
|
||||
generated erzeugter
|
||||
Good certificate Korrektes Zertifikat
|
||||
good certificate Korrektes Zertifikat
|
||||
handle benutzt
|
||||
hint Tip
|
||||
key-ID Schlüssel-ID
|
||||
keyring Schlüsselring -> Schlüsselbund
|
||||
malformed Ungünstig aufgebaute
|
||||
keyring Schlüsselbund
|
||||
maintenance utility Wartungs-Hilfsprogramm
|
||||
malformed ungünstig aufgebaute
|
||||
message Botschaft
|
||||
mode Modus, Methode *
|
||||
note Hinweis
|
||||
okay in Ordnung
|
||||
Ooops Huch
|
||||
original Ursprünglicher
|
||||
ownertrust \"Owner trust\"
|
||||
packet Paket
|
||||
packet type Pakettyp
|
||||
passphrase \"Passphrase\"
|
||||
preferences bevorzugt
|
||||
preference items ????
|
||||
preferences Einstellungen
|
||||
preferred bevorzugt
|
||||
primary keys Hauptschlüssel
|
||||
protection algorithm Schutzmethode
|
||||
pubkey algorithm Public-Key Verfahren (*1)
|
||||
protection algorithm Schutzverfahren
|
||||
pubkey algorithm Public-Key Verfahren (*)
|
||||
public key öffentlicher Schüssel
|
||||
........ Authentisierung
|
||||
public key algorithm Public-Key Verfahren
|
||||
radix64 radix64
|
||||
retry ????
|
||||
revo... Widerruf
|
||||
secondary key Zweitschlüssel
|
||||
secret key geheimer Schlüssel
|
||||
self-signature Eigensignatur
|
||||
self-signature Eigenbeglaubigung
|
||||
sender Absender
|
||||
sign user id User-ID beglaubigen
|
||||
sign user id User-ID beglaubigen *
|
||||
signature (files) Unterschrift *
|
||||
signature (keys) Beglaubigung *
|
||||
simple S2K mode ????
|
||||
terminal charset Terminalzeichensatz
|
||||
throw verwerfe
|
||||
Timestamp conflict Zeitangaben differieren
|
||||
Trust-DB 'Trust'-Datenbank
|
||||
trying Versuch
|
||||
update
|
||||
update Ändern, Änderung
|
||||
user ID User-ID
|
||||
user IDs User-IDs
|
||||
username Username
|
||||
warning Warnung
|
||||
weak key unsicherer Schlüssel
|
||||
|
||||
(*1) Uneinheitlich verwendet
|
||||
--
|
||||
Walter Koch Hochdahl am Neandertal
|
||||
walterk@mail.dip.de ham:dg9ep@db0iz
|
||||
http://home.pages.de/~dg9ep/ qrv:db0iz-9
|
||||
(*) Uneinheitlich verwendet
|
||||
|
|
|
|||
50
po/fr.po
50
po/fr.po
|
|
@ -5,7 +5,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg-0.4.1a\n"
|
||||
"POT-Creation-Date: 1998-11-20 15:17+0100\n"
|
||||
"POT-Creation-Date: 1998-11-20 19:52+0100\n"
|
||||
"PO-Revision-Date: 1998-10-29 19:01+0100\n"
|
||||
"Last-Translator: Gaël Quéri <gqueri@mail.dotcom.fr>\n"
|
||||
"Language-Team: French <fr@li.org>\n"
|
||||
|
|
@ -737,45 +737,45 @@ msgstr "ent
|
|||
msgid "armor: %s\n"
|
||||
msgstr "armure: %s\n"
|
||||
|
||||
#: g10/armor.c:530
|
||||
#: g10/armor.c:532
|
||||
msgid "invalid dash escaped line: "
|
||||
msgstr "ligne d'échappement invalide: "
|
||||
|
||||
#: g10/armor.c:599
|
||||
#: g10/armor.c:601
|
||||
msgid "invalid clear text header: "
|
||||
msgstr "entête de texte clair invalide: "
|
||||
|
||||
#: g10/armor.c:841
|
||||
#: g10/armor.c:843
|
||||
#, c-format
|
||||
msgid "invalid radix64 character %02x skipped\n"
|
||||
msgstr "caractère %02x invalide en base 64 sauté\n"
|
||||
|
||||
#: g10/armor.c:874
|
||||
#: g10/armor.c:876
|
||||
msgid "premature eof (no CRC)\n"
|
||||
msgstr "fin de fichier prématurée (pas de CRC)\n"
|
||||
|
||||
#: g10/armor.c:893
|
||||
#: g10/armor.c:895
|
||||
msgid "premature eof (in CRC)\n"
|
||||
msgstr "fin de fichier prématurée (dans le CRC)\n"
|
||||
|
||||
#: g10/armor.c:897
|
||||
#: g10/armor.c:899
|
||||
msgid "malformed CRC\n"
|
||||
msgstr "CRC malformé\n"
|
||||
|
||||
#: g10/armor.c:901
|
||||
#: g10/armor.c:903
|
||||
#, c-format
|
||||
msgid "CRC error; %06lx - %06lx\n"
|
||||
msgstr "Erreur de CRC; 06lx - %06lx\n"
|
||||
|
||||
#: g10/armor.c:920
|
||||
#: g10/armor.c:922
|
||||
msgid "premature eof (in Trailer)\n"
|
||||
msgstr "fin de fichier prématurée (dans la remorque)\n"
|
||||
|
||||
#: g10/armor.c:924
|
||||
#: g10/armor.c:926
|
||||
msgid "error in trailer line\n"
|
||||
msgstr "erreur dans la ligne de remorque\n"
|
||||
|
||||
#: g10/armor.c:1178
|
||||
#: g10/armor.c:1180
|
||||
msgid "no valid RFC1991 or OpenPGP data found.\n"
|
||||
msgstr "pas de donnée RFC1991 ou OpenPGP valide trouvée.\n"
|
||||
|
||||
|
|
@ -1377,15 +1377,15 @@ msgstr "%s crypt
|
|||
msgid "WARNING: nothing exported\n"
|
||||
msgstr "ATTENTION: Utilisation d'une clé sans confiance!\n"
|
||||
|
||||
#: g10/getkey.c:163
|
||||
#: g10/getkey.c:164
|
||||
msgid "too many entries in pk cache - disabled\n"
|
||||
msgstr ""
|
||||
|
||||
#: g10/getkey.c:261
|
||||
#: g10/getkey.c:263
|
||||
msgid "too many entries in unk cache - disabled\n"
|
||||
msgstr ""
|
||||
|
||||
#: g10/getkey.c:967
|
||||
#: g10/getkey.c:969
|
||||
#, c-format
|
||||
msgid "using secondary key %08lX instead of primary key %08lX\n"
|
||||
msgstr ""
|
||||
|
|
@ -2066,15 +2066,19 @@ msgid "Changing exiration time for the primary key.\n"
|
|||
msgstr "Changer la date d'expiration de la clé primaire.\n"
|
||||
|
||||
#: g10/keyedit.c:1250
|
||||
msgid "You can't change the expiration date of a v3 key\n"
|
||||
msgstr ""
|
||||
|
||||
#: g10/keyedit.c:1266
|
||||
msgid "No corresponding signature in secret ring\n"
|
||||
msgstr "Pas de signature correspondante dans le porte-clés secret\n"
|
||||
|
||||
#: g10/keyedit.c:1310
|
||||
#: g10/keyedit.c:1326
|
||||
#, c-format
|
||||
msgid "No user id with index %d\n"
|
||||
msgstr "Pas d'utilisateur avec l'index %d\n"
|
||||
|
||||
#: g10/keyedit.c:1355
|
||||
#: g10/keyedit.c:1371
|
||||
#, c-format
|
||||
msgid "No secondary key with index %d\n"
|
||||
msgstr "Pas de clé secondaire avec l'index %d\n"
|
||||
|
|
@ -2109,33 +2113,33 @@ msgstr "note: l'exp
|
|||
msgid "original file name='%.*s'\n"
|
||||
msgstr ""
|
||||
|
||||
#: g10/mainproc.c:837
|
||||
#: g10/mainproc.c:833
|
||||
msgid "signature verification suppressed\n"
|
||||
msgstr ""
|
||||
|
||||
#: g10/mainproc.c:843
|
||||
#: g10/mainproc.c:839
|
||||
#, c-format
|
||||
msgid "Signature made %.*s using %s key ID %08lX\n"
|
||||
msgstr "Signature faite %.*s avec %s clé ID %08lX\n"
|
||||
|
||||
#: g10/mainproc.c:851
|
||||
#: g10/mainproc.c:847
|
||||
msgid "BAD signature from \""
|
||||
msgstr "MAUVAISE signature de \""
|
||||
|
||||
#: g10/mainproc.c:852
|
||||
#: g10/mainproc.c:848
|
||||
msgid "Good signature from \""
|
||||
msgstr "Bonne signature de \""
|
||||
|
||||
#: g10/mainproc.c:865
|
||||
#: g10/mainproc.c:861
|
||||
#, c-format
|
||||
msgid "Can't check signature: %s\n"
|
||||
msgstr "Ne peut vérifier la signature: %s\n"
|
||||
|
||||
#: g10/mainproc.c:938
|
||||
#: g10/mainproc.c:934
|
||||
msgid "old style (PGP 2.x) signature\n"
|
||||
msgstr ""
|
||||
|
||||
#: g10/mainproc.c:943
|
||||
#: g10/mainproc.c:939
|
||||
msgid "invalid root packet detected in proc_tree()\n"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/include
|
||||
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
|
||||
needed_libs = ../cipher/libcipher.a ../util/libutil.a \
|
||||
../mpi/libmpi.a ../util/libutil.a @INTLLIBS@
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
Wed Nov 25 11:30:07 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
* iobuf.c (iobuf_pop_filter): Fixed sigsegv after error.
|
||||
|
||||
Thu Nov 19 07:09:55 1998 Werner Koch <werner.koch@guug.de>
|
||||
|
||||
* miscutil.c (strtimevalue): New.
|
||||
|
|
|
|||
|
|
@ -756,7 +756,7 @@ iobuf_pop_filter( IOBUF a, int (*f)(void *opaque, int control,
|
|||
return rc;
|
||||
}
|
||||
/* and tell the filter to free it self */
|
||||
if( (rc = b->filter(b->filter_ov, IOBUFCTRL_FREE, b->chain,
|
||||
if( b->filter && (rc = b->filter(b->filter_ov, IOBUFCTRL_FREE, b->chain,
|
||||
NULL, &dummy_len)) ) {
|
||||
log_error("IOBUFCTRL_FREE failed: %s\n", g10_errstr(rc) );
|
||||
return rc;
|
||||
|
|
|
|||
Loading…
Reference in New Issue