Add kludge for broken HTTP proxies.

This commit is contained in:
Werner Koch 2001-04-23 11:44:46 +00:00
parent 7c67adea66
commit fda386855b
20 changed files with 140 additions and 83 deletions

12
NOTES
View File

@ -32,3 +32,15 @@ rndw32 tested on:
tried to compile GnuPG on AIX 4.3 on a power CPU based machine. It
doesn't work out of the box but i found a way to do so:
PowerPC based machines:
CFLAGS="-g -O2 -mcpu=powerpc" ./configure --disable-asm --disable-dynload
+--enable-static-rnd=egd
Power1 and Power2 machines:
CFLAGS="-g -O2 -mcpu=power" ./configure --disable-asm --disable-dynload
+--enable-static-rnd=egd

7
TODO
View File

@ -2,15 +2,14 @@
* Check that no secret temporary results are stored in the result parameter
of the mpi functions. We have already done this for mpi-mul.c
* Dlopen does not yet work under W32.
* check whether we can remove all the expire stuff in trustdb because this
is now done in getkey.
* Can we output things like the preferences?
* We need another special packet at the end of a clearsign message to mark
it's end and allow for multiple signature for one message.
it's end and allow for multiple signature for one message. And
add a real grammar to the code in mainproc.c
* option to set the signature expiration time for key sigs.
@ -43,6 +42,8 @@
* Add an is_valid flag to each user ID.
* Do notcreate a secring.pgpif it is not needed; I have fixed this
sometime ago but it has later reappeared.
Scheduled for 1.1
-----------------

View File

@ -1,5 +1,8 @@
2001-04-20 Werner Koch <wk@gnupg.org>
* faq.raw (Maintained-by): Removed note that load-extension is not
available under Windoze.
* gpg.sgml: Add new --charset UTF-8.
2001-04-19 Werner Koch <wk@gnupg.org>

View File

@ -205,9 +205,6 @@ you could search in the mailing list archive.
the following line to your ~/.gnupg/options:
load-extension idea
The extension is not available for the Windows version of GnuPG.
4. USAGE
4.1) What is the recommended key size?

View File

@ -147,9 +147,6 @@ you could search in the mailing list archive.
load-extension idea
[H /pre]
The extension is not available for the Windows version of GnuPG.
<S> USAGE
<Q> What is the recommended key size?

View File

@ -1,3 +1,10 @@
2001-04-23 Werner Koch <wk@gnupg.org>
* hkp.c (hkp_ask_import): Allow to specify a port number for the
keyserver. Add a kudge to set the no_shutdown flag.
(hkp_export): Ditto.
* options.skel: Document the changes
2001-04-20 Werner Koch <wk@gnupg.org>
* options.skel: Add some more comments.

View File

@ -65,8 +65,19 @@ hkp_ask_import( u32 *keyid )
* down to the import function. Marc told that there is such a
* binary mode ... how?
*/
sprintf( request, "x-hkp://%s:11371/pks/lookup?op=get&search=0x%08lX",
if ( !strncmp (opt.keyserver_name, "x-broken-hkp://", 15) ) {
sprintf( request, "x-hkp://%s/pks/lookup?op=get&search=0x%08lX",
opt.keyserver_name+15, (ulong)keyid[1] );
hflags |= HTTP_FLAG_NO_SHUTDOWN;
}
else if ( !strncmp (opt.keyserver_name, "x-hkp://", 8) ) {
sprintf( request, "%s/pks/lookup?op=get&search=0x%08lX",
opt.keyserver_name, (ulong)keyid[1] );
}
else {
sprintf( request, "x-hkp://%s:11371/pks/lookup?op=get&search=0x%08lX",
opt.keyserver_name, (ulong)keyid[1] );
}
rc = http_open_document( &hd, request, hflags );
if( rc ) {
log_info(_("can't get key from keyserver: %s\n"),
@ -141,7 +152,16 @@ hkp_export( STRLIST users )
iobuf_flush_temp( temp );
request = m_alloc( strlen( opt.keyserver_name ) + 100 );
sprintf( request, "x-hkp://%s:11371/pks/add", opt.keyserver_name );
if ( !strncmp (opt.keyserver_name, "x-broken-hkp://", 15) ) {
sprintf( request, "x-hkp://%s/pks/add", opt.keyserver_name+15 );
hflags |= HTTP_FLAG_NO_SHUTDOWN;
}
else if ( !strncmp (opt.keyserver_name, "x-hkp://", 8) ) {
sprintf( request, "%s/pks/add", opt.keyserver_name );
}
else {
sprintf( request, "x-hkp://%s:11371/pks/add", opt.keyserver_name );
}
rc = http_open( &hd, HTTP_REQ_POST, request , hflags );
if( rc ) {
log_error(_("can't connect to `%s': %s\n"),

View File

@ -236,7 +236,7 @@ print_cipher_algo_note( int algo )
if( !did_note ) {
did_note = 1;
log_info(_("this cipher algorithm is deprecated; "
"please use a more standard one!x\n"));
"please use a more standard one!\n"));
}
}
}

View File

@ -98,9 +98,22 @@ lock-once
# import the key from that server (server do syncronize with each
# other and DNS Round-Robin may give you a random server each time).
# Use "host -l pgp.net | grep www" to figure out a keyserver.
#
# If you do not want to use the default port 11371, you can give the
# name of the keyserver like this:
# x-hkp://keyserver.example.net:22742
# If you have problems connecting through a buggy proxy, you can use this:
# x-broken-hkp://keyserver.example.net:11371
# But first you should make sure that you have read the man page regarding
# proxies (--honor-http-proxy)
# Most users just set the name of the preferred keyserver.
#keyserver wwwkeys.nl.pgp.net
# The environment variable http_proxy is only used when the
# this option is set.
honor-http-proxy

View File

@ -483,8 +483,8 @@ do_we_trust( PKT_public_key *pk, int *trustlevel )
if( opt.verbose )
log_info("No trust check due to --always-trust option\n");
/* The problem with this, is that EXPIRE can't be checked as
* this needs to insert a ne key into the trustdb first and
* we don't want that */
* this needs to insert a new key into the trustdb first and
* we don't want that - IS this still true? */
return 1;
}

View File

@ -1,3 +1,7 @@
2001-04-23 Werner Koch <wk@gnupg.org>
* http.h: New flag HTTP_FLAG_NO_SHUTDOWN.
2001-04-13 Werner Koch <wk@gnupg.org>
* iobuf.h: Removed iobuf_fopen.

View File

@ -50,7 +50,8 @@ typedef enum {
} HTTP_REQ_TYPE;
enum { /* put flag values into an enum, so that gdb can display them */
HTTP_FLAG_TRY_PROXY = 1
HTTP_FLAG_TRY_PROXY = 1,
HTTP_FLAG_NO_SHUTDOWN = 2,
};
struct http_context {

View File

@ -1,3 +1,7 @@
2001-04-22 Werner Koch <wk@gnupg.org>
* pl.po: Updated.
2001-04-17 Werner Koch <wk@gnupg.org>
* et.po: New.

View File

@ -2724,7 +2724,7 @@ msgid "Experimental algorithms should not be used!\n"
msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
#: g10/misc.c:238
msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr "Es ist davon abzuraten, diese Verschlüsselungsmethode zu benutzen!\n"
#: g10/parse-packet.c:119

View File

@ -2678,7 +2678,7 @@ msgstr "Eksperimentaalseid algoritme ei peaks kasutama!\n"
#: g10/misc.c:238
#, fuzzy
msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"see ¨iffri algoritm ei ole soovitatav; kasutage palun mõnd standardsemat!\n"

111
po/pl.po
View File

@ -1,5 +1,5 @@
# Gnu Privacy Guard.
# Copyright (C) 1998-1999 Free Software Foundation, Inc.
# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
# Janusz A. Urbanowicz <alex@bofh.net.pl>, 1999, 2000.
#
# To be included in GnuPG 1.0.5
@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.0.4\n"
"POT-Creation-Date: 2001-04-19 12:04+0200\n"
"PO-Revision-Date: 2000-10-18 22:54+02:00\n"
"PO-Revision-Date: 2001-04-21 01:03+02:00\n"
"Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
@ -85,7 +85,7 @@ msgstr "niepoprawny klucz publiczny"
#: util/errors.c:60
msgid "bad secret key"
msgstr "niepoprawny klucz prywatny"
msgstr "niepoprawny klucz tajny"
#: util/errors.c:61
msgid "bad signature"
@ -257,14 +257,12 @@ msgstr "nie zosta
#. the key cannot be used for a specific usage
#: util/errors.c:105
#, fuzzy
msgid "unusable public key"
msgstr "niepoprawny klucz publiczny"
msgstr "bezużyteczny klucz publiczny"
#: util/errors.c:106
#, fuzzy
msgid "unusable secret key"
msgstr "niepoprawny klucz prywatny"
msgstr "bezużyteczny klucz tajny"
#: util/logger.c:224
#, c-format
@ -570,7 +568,7 @@ msgstr "pozostawienie bez zmian"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
#: g10/g10.c:292
msgid "use the gpg-agent"
msgstr ""
msgstr "użyj gpg-agenta"
#: g10/g10.c:293
msgid "batch mode: never ask"
@ -658,7 +656,7 @@ msgstr "usuni
#: g10/g10.c:323
msgid "|NAME=VALUE|use this notation data"
msgstr "|NAZWA=WARTOŚĆ|adnotacje"
msgstr "|NAZWA=TREŚĆ|adnotacje"
#: g10/g10.c:326
msgid ""
@ -853,9 +851,8 @@ msgid "--delete-key user-id"
msgstr "--delete-key nazwa u¿ytkownika"
#: g10/g10.c:1305
#, fuzzy
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-key nazwa użytkownika"
msgstr "--delete-secret-and-public-key key nazwa użytkownika"
#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
#, c-format
@ -1341,7 +1338,7 @@ msgstr "Czy na pewno chcesz stworzy
#: g10/keygen.c:580
msgid "The use of this algorithm is deprecated - create anyway? "
msgstr ""
msgstr "Używanie tego algorytmu jest odradzane - tworzyć mimo to? "
#: g10/keygen.c:594
msgid "Invalid selection.\n"
@ -1596,7 +1593,7 @@ msgstr ""
"Musimy wygenerowaæ du¿o losowych bajtów. Dobrym pomys³em podczas "
"generowania\n"
"liczb pierszych jest wykonanywanie w tym czasie innych dzia³añ (pisanie na\n"
"klawiaturzeze, poruszanie myszką, odwołanie się do dysków); dzięki temu\n"
"klawiaturze, poruszanie myszką, odwołanie się do dysków); dzięki temu\n"
"generator liczb losowych ma mo¿liwo¶æ zebrania odpowiedniej ilo¶ci "
"entropii.\n"
@ -1903,7 +1900,7 @@ msgstr "klucz %08lX: bez zmian\n"
#: g10/import.c:610
#, c-format
msgid "secret key %08lX not imported (use %s to allow for it)\n"
msgstr ""
msgstr "klucz tajny %08lX nie został wczytany (aby to zrobić użyj %s)\n"
#: g10/import.c:640
#, c-format
@ -2587,7 +2584,7 @@ msgstr "Na pewno utworzy
#: g10/keyedit.c:1860
msgid "no secret key\n"
msgstr "brak klucza prywatnego\n"
msgstr "brak klucza tajnego\n"
#. of subkey
#: g10/keylist.c:279 g10/mainproc.c:851
@ -2664,9 +2661,8 @@ msgstr "wymuszono pomini
#. plaintext before signatures but no one-pass packets
#: g10/mainproc.c:1235 g10/mainproc.c:1245
#, fuzzy
msgid "can't handle these multiple signatures\n"
msgstr "złożenie podpisu oddzielonego od dokumentu"
msgstr "nie można obsłuzyć tych wielokrotnych podpisów\n"
#: g10/mainproc.c:1256
#, c-format
@ -2691,17 +2687,16 @@ msgstr " alias \""
#: g10/mainproc.c:1358
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nie mo sprawdzić podpisu: %s\n"
msgstr "Nie można sprawdzić podpisu: %s\n"
#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
#, fuzzy
msgid "not a detached signature\n"
msgstr "złożenie podpisu oddzielonego od dokumentu"
msgstr "nie jest oddzielonym podpisem\n"
#: g10/mainproc.c:1454
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "osobny podpis klasy 0x%02x\n"
msgstr "oddzielony podpis klasy 0x%02x\n"
#: g10/mainproc.c:1511
msgid "old style (PGP 2.x) signature\n"
@ -2721,10 +2716,10 @@ msgid "Experimental algorithms should not be used!\n"
msgstr "Nie nale¿y u¿ywaæ algorytmów do¶wiadczalnych!\n"
#: g10/misc.c:238
#, fuzzy
msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"odradza się stosowanie tego algortmu; proszę używać bardziej standardowych!\n"
"odradza się stosowanie tego algorytmu; proszę używać bardziej "
"standardowych!\n"
#: g10/parse-packet.c:119
#, c-format
@ -2738,11 +2733,11 @@ msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
#: g10/passphrase.c:223
msgid "gpg-agent is not available in this session\n"
msgstr ""
msgstr "gpg-agent nie jest dostępny w tej sesji\n"
#: g10/passphrase.c:229
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
msgstr "zły format zmiennej GPG_AGENT_INFO\n"
#: g10/hkp.c:147 g10/passphrase.c:248
#, c-format
@ -2755,43 +2750,40 @@ msgid " (main key ID %08lX)"
msgstr " (g³ówny ID klucza %08lX)"
#: g10/passphrase.c:323
#, fuzzy, c-format
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
"\"%.*s\"\n"
"%u-bit %s key, ID %08lX, created %s%s\n"
msgstr ""
"\n"
"Musisz podaæ wyra¿enie przej¶ciowe (has³o) aby uaktywniæ klucz tajny\n"
"dla użytkownika: \""
"dla użytkownika: \"%.*s\"\n"
"Klucz o długości %u bitów, typ %s, ID %08lX, stworzony %s%s\n"
#: g10/passphrase.c:344
#, fuzzy
msgid "Enter passphrase\n"
msgstr "Wyrażenie przejściowe: "
msgstr "Wyrażenie przejściowe\n"
#: g10/passphrase.c:346
#, fuzzy
msgid "Repeat passphrase\n"
msgstr "Powtórzone wyrażenie przejściowe: "
msgstr "Powtórzone wyrażenie przejściowe\n"
#: g10/passphrase.c:384
#, fuzzy
msgid "passphrase too long\n"
msgstr "linia za długa\n"
msgstr "wyrażenie zbyt długie\n"
#: g10/passphrase.c:396
msgid "invalid response from agent\n"
msgstr ""
msgstr "błędna odpowiedź agenta\n"
#: g10/passphrase.c:405
msgid "cancelled by user\n"
msgstr ""
msgstr "anulowane przez użytkownika\n"
#: g10/passphrase.c:408 g10/passphrase.c:477
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr ""
msgstr "problem agenta: zwrócił 0x%lx\n"
#: g10/passphrase.c:562
msgid ""
@ -2838,9 +2830,8 @@ msgid "reading stdin ...\n"
msgstr "czytam strumieñ standardowego wej¶cia\n"
#: g10/plaintext.c:391
#, fuzzy
msgid "no signed data\n"
msgstr "nie można otworzyć podpisanego pliku '%s'\n"
msgstr "brak podpisanych danych\n"
#: g10/plaintext.c:399
#, c-format
@ -2952,9 +2943,9 @@ msgid "public key is %lu seconds newer than the signature\n"
msgstr "klucz publiczny jest o %lu sekund m³odszy od podpisu\n"
#: g10/sig-check.c:328
#, fuzzy, c-format
#, c-format
msgid "NOTE: signature key %08lX expired %s\n"
msgstr "UWAGA: klucz podpisujący przekroczył datę ważności %s\n"
msgstr "UWAGA: klucz podpisujący %08lX przekroczył datę ważności %s\n"
#: g10/sig-check.c:398
msgid "assuming bad signature due to an unknown critical bit\n"
@ -2962,9 +2953,9 @@ msgstr ""
"przyjêto niewa¿no¶æ podpisu z powonu ustawienia nieznanego bitu krytycznego\n"
#: g10/sign.c:152
#, fuzzy, c-format
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "lid %lu: odczyt wpisu o podpisach nie powiódł się: %s\n"
msgstr "sprawdzenie złożonego podpisu nie powiodło się: %s\n"
#: g10/sign.c:161
#, c-format
@ -2974,7 +2965,7 @@ msgstr "%s podpis z
#: g10/sign.c:307 g10/sign.c:630
#, c-format
msgid "can't create %s: %s\n"
msgstr "nie mo utworzyć %s: %s\n"
msgstr "nie można utworzyć %s: %s\n"
#: g10/sign.c:405
msgid "signing:"
@ -2988,7 +2979,7 @@ msgstr "OSTRZE
#: g10/textfilter.c:134
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "nie mo obsłużyć linii tekstu dłuższej niż %d znaków\n"
msgstr "nie można obsłużyć linii tekstu dłuższej niż %d znaków\n"
#: g10/textfilter.c:231
#, c-format
@ -3022,12 +3013,12 @@ msgstr "%s: katalog nie istnieje!\n"
#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: nie mo utworzyć: %s\n"
msgstr "%s: nie można utworzyć: %s\n"
#: g10/tdbio.c:459 g10/tdbio.c:508
#, c-format
msgid "%s: can't create lock\n"
msgstr "%s: nie mo utworzyć blokady\n"
msgstr "%s: nie można utworzyć blokady\n"
#: g10/tdbio.c:473
#, c-format
@ -3462,9 +3453,9 @@ msgstr ""
"generatora liczb losowych!\n"
#: g10/skclist.c:138
#, fuzzy, c-format
#, c-format
msgid "skipped `%s': duplicated\n"
msgstr "pominięty '%s': %s\n"
msgstr "pominięty '%s': duplikat\n"
#: g10/skclist.c:145 g10/skclist.c:153
#, c-format
@ -3472,9 +3463,8 @@ msgid "skipped `%s': %s\n"
msgstr "pominiêty '%s': %s\n"
#: g10/skclist.c:149
#, fuzzy
msgid "skipped: secret key already present\n"
msgstr "%s: pominięty: klucz publiczny już znajduje się w bazie\n"
msgstr "pominięty: klucz tajny już znajduje się w bazie\n"
#: g10/skclist.c:160
#, c-format
@ -3521,7 +3511,7 @@ msgstr "%s: stworzono nowy plik ustawie
#: g10/openfile.c:350
#, c-format
msgid "%s: can't create directory: %s\n"
msgstr "%s: nie mo utworzyć katalogu: %s\n"
msgstr "%s: nie można utworzyć katalogu: %s\n"
#: g10/openfile.c:353
#, c-format
@ -3549,9 +3539,8 @@ msgstr ""
"OSTRZE¯ENIE: wiadomo¶æ by³a szyfrowana s³abym kluczem szyfru symetrycznego.\n"
#: g10/encr-data.c:97
#, fuzzy
msgid "problem handling encrypted packet\n"
msgstr "usunięcie identyfikatorów kluczy z pakietów"
msgstr "problem podczas obróbki pakietu szyfrowego\n"
#: g10/seskey.c:52
msgid "weak key created - retrying\n"
@ -3847,12 +3836,6 @@ msgstr "Pomoc niedost
msgid "No help available for `%s'"
msgstr "Brak pomocy o '%s'"
#~ msgid "invalid"
#~ msgstr "niepoprawny"
#~ msgid "revoked"
#~ msgstr "unieważniony"
#~ msgid "RSA key cannot be used in this version\n"
#~ msgstr "W tej wersji nie mo¿na u¿ywaæ kluczy RSA\n"
@ -3862,6 +3845,12 @@ msgstr "Brak pomocy o '%s'"
#~ msgid "No user ID for key\n"
#~ msgstr "Brak identyfikatora u¿ytkownika dla klucza.\n"
#~ msgid "invalid"
#~ msgstr "niepoprawny"
#~ msgid "revoked"
#~ msgstr "unieważniony"
#~ msgid "no secret key for decryption available\n"
#~ msgstr "odszyfrowuj±cy klucz tajny do jest niedostêpny\n"

View File

@ -2706,7 +2706,7 @@ msgid "Experimental algorithms should not be used!\n"
msgstr "Algoritmos experimentais não devem ser usados!\n"
#: g10/misc.c:238
msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"este algoritmo de criptografia está desctualizado; por favor use um "
"algoritmo mais standard!x\n"

View File

@ -2693,7 +2693,7 @@ msgstr "Deneyimsel algoritmalar kullan
#: g10/misc.c:238
#, fuzzy
msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"bu cipher algoritmasının değeri düşük; lütfem daha standard birini kullan!\n"

View File

@ -1,5 +1,14 @@
2001-04-23 Werner Koch <wk@gnupg.org>
* http.c (http_wait_response): Implement new flag to inhibit the
TCP shutdown.
2001-04-20 Werner Koch <wk@gnupg.org>
* http.c (http_start_data): Use write_server and not the iobuf
stuff. I wonder why we are at all using write_server - shouldn't
it be handled by iobuf?
* strgutil.c (set_native_charset): Allow utf-8 by introducing the
new no_translation variable.
(native_to_utf8): Handle no_translation.

View File

@ -150,8 +150,7 @@ void
http_start_data( HTTP_HD hd )
{
if( !hd->in_data ) {
iobuf_put( hd->fp_write, '\r' );
iobuf_put( hd->fp_write, '\n' );
write_server (hd->sock, "\r\n", 2);
hd->in_data = 1;
}
}
@ -173,7 +172,8 @@ http_wait_response( HTTP_HD hd, unsigned int *ret_status )
iobuf_ioctl (hd->fp_write, 1, 1, NULL); /* keep the socket open */
iobuf_close (hd->fp_write);
hd->fp_write = NULL;
shutdown( hd->sock, 1 );
if ( !(hd->flags & HTTP_FLAG_NO_SHUTDOWN) )
shutdown( hd->sock, 1 );
hd->in_data = 0;
hd->fp_read = iobuf_sockopen( hd->sock , "r" );