dirmngr (7 files)

cvs user wk cvs at cvs.gnupg.org
Tue Jan 4 15:10:17 CET 2005


    Date: Tuesday, January 4, 2005 @ 15:16:39
  Author: wk
    Path: /cvs/dirmngr/dirmngr

   Added: tests/percent-escape.c
Modified: ChangeLog NEWS doc/dirmngr.texi po/ChangeLog po/de.po
          tests/Makefile.am

* de.po: Updated.

* doc/dirmngr.texi: Cleaned up. Use @copying.


------------------------+
 ChangeLog              |    9 ++
 NEWS                   |    5 +
 doc/dirmngr.texi       |  133 +++++++++++++++++------------------
 po/ChangeLog           |    4 +
 po/de.po               |  176 ++++++++++++++++++++++++-----------------------
 tests/Makefile.am      |    6 +
 tests/percent-escape.c |  113 ++++++++++++++++++++++++++++++
 7 files changed, 292 insertions(+), 154 deletions(-)


Index: dirmngr/ChangeLog
diff -u dirmngr/ChangeLog:1.82 dirmngr/ChangeLog:1.83
--- dirmngr/ChangeLog:1.82	Sat Dec 18 09:50:39 2004
+++ dirmngr/ChangeLog	Tue Jan  4 15:16:39 2005
@@ -1,3 +1,12 @@
+2005-01-04  Werner Koch  <wk at g10code.com>
+
+	* doc/dirmngr.texi: Cleaned up. Use @copying.
+
+2005-01-03  Werner Koch  <wk at g10code.com>
+
+	* tests/percent-escape.c: New.
+	* tests/Makefile.am (noinst_PROGRAMS): Add it.
+
 2004-12-18  Werner Koch  <wk at g10code.com>
 
 	* configure.ac: Include /usr/local for FreeBSD.
Index: dirmngr/NEWS
diff -u dirmngr/NEWS:1.33 dirmngr/NEWS:1.34
--- dirmngr/NEWS:1.33	Fri Dec 17 12:11:22 2004
+++ dirmngr/NEWS	Tue Jan  4 15:16:39 2005
@@ -1,6 +1,11 @@
 Noteworthy changes in version 0.9.1
 ------------------------------------------------
 
+ * New option --pem for dirmngr-client to allow requesing service
+   using a PEM encoded certificate.
+
+ * New option --squid-mode to allow using dirmngr-client directly as a
+   Squid helper.
 
 
 Noteworthy changes in version 0.9.0 (2004-12-17)
Index: dirmngr/doc/dirmngr.texi
diff -u dirmngr/doc/dirmngr.texi:1.19 dirmngr/doc/dirmngr.texi:1.20
--- dirmngr/doc/dirmngr.texi:1.19	Mon Dec 13 16:16:35 2004
+++ dirmngr/doc/dirmngr.texi	Tue Jan  4 15:16:39 2005
@@ -1,39 +1,44 @@
 \input texinfo                             @c -*-texinfo-*-
- at c Copyright (C) 2002 Klarälvdalens Datakonsult AB
- at c Copyright (c) 2004 g10 Code GmbH
- at c This is part of the Dirmngr manual.
- at c For copying conditions, see the file gpl.texi.
 @c %**start of header
 @setfilename dirmngr.info
-
 @include version.texi
+ at settitle Using Dirmngr
+ at c Create a separate index for command line options.
+ at defcodeindex op
+ at c Merge the standard indexes into a single one.
+ at syncodeindex fn cp
+ at syncodeindex vr cp
+ at syncodeindex ky cp
+ at syncodeindex pg cp
+ at syncodeindex tp cp
+ at c %**end of header
+ at copying
+This manual is for Dirmngr
+(version @value{VERSION}, @value{UPDATED}),
+which is an X.509 CRL and OCSP manager.
 
- at macro copyrightnotice
 Copyright @copyright{} 2002 Klarälvdalens Datakonsult AB
 
 Copyright @copyright{} 2004 g10 Code GmbH
- at end macro
- at macro permissionnotice
+
+ at quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU General Public License as published by the
 Free Software Foundation; either version 2 of the License, or (at your
 option) any later version. The text of the license can be found in the
 section entitled ``Copying''.
- at end macro
-
+ at end quotation
+ at end copying
 
- at settitle Using Dirmngr
-
- at c Create a separate index for command line options.
- at defcodeindex op
- at c Merge the standard indexes into a single one.
- at syncodeindex fn cp
- at syncodeindex vr cp
- at syncodeindex ky cp
- at syncodeindex pg cp
- at syncodeindex tp cp
+ at dircategory GNU Utilities
+ at direntry
+* dirmngr: (gnupg).        X.509 CRL and OCSP server.
+* dirmngr-client: (gnupg). X.509 CRL and OCSP client.
+ at end direntry
 
- at c printing stuff taken from gcc.
+ at c
+ at c Printing stuff taken from gcc.
+ at c
 @macro gnupgtabopt{body}
 @code{\body\}
 @end macro
@@ -53,66 +58,31 @@
 @end macro
 @end ifnottex
 
-
- at c Change the font used for @def... commands, since the default
- at c proportional one used is bad for names starting __.
- at tex
-\global\setfont\defbf\ttbshape{10}{\magstep1}
- at end tex
-
- at c %**end of header
-
- at ifnottex
- at dircategory GNU Utilities
- at direntry
-* dirmngr: (gnupg).        X.509 CRL and OCSP server.
-* dirmngr-client: (gnupg). X.509 CRL and OCSP client.
- at end direntry
-This file documents the use of dirmngr.
-
-This is Edition @value{EDITION}, last updated @value{UPDATED}, of
- at cite{The `Dirmngr' Manual}, for Version @value{VERSION}.
- at sp 1
- at copyrightnotice{}
- at sp 1
- at permissionnotice{}
- at end ifnottex
-
+ at c
+ at c Titlepage
+ at c
 @c  @setchapternewpage odd
-
 @titlepage
 @title Using Dirmngr
- at subtitle Version @value{VERSION}
- at subtitle @value{UPDATED}
- at author Steffen Hansen @code{(steffen@@klaralvdalens-datakonsult.se)}
- at author Werner Koch @code{(wk@@g10code.com)}
-
+ at subtitle for version @value{VERSION}, @value{UPDATED}
+ at author Steffen Hansen (@email{steffen@@klaralvdalens-datakonsult.se})
+ at author Werner Koch (@email{wk@@g10code.com})
 @page
 @vskip 0pt plus 1filll
- at copyrightnotice{}
- at sp 2
- at permissionnotice{}
+ at insertcopying
 @end titlepage
- at summarycontents
- at contents
- at page
 
+ at contents
 
+ at ifnottex
 @node Top
- at top Introduction
- at cindex introduction
-
- at c man begin DESCRIPTION
-
-Dirmngr is a server for managing and downloading certificate revocation
-lists (CRLs) for X.509 certificates and for downloading the certificates
-themselves. Dirmngr also handles OCSP requests as an alternative to
-CRLs. Dirmngr is either invoked internally by gpgsm (from gnupg 1.9) or
-when running as a system daemon through the @command{dirmngr-client} tool.
+ at top Dirmngr
+ at insertcopying
+ at end ifnottex
 
- at c man end
 
 @menu
+* Introduction::        About Dirmngr.
 * Installation::        How to install Dirmngr.
 * Dirmngr Commands::    List of all commands.
 * Dirmngr Options::     List of all options.
@@ -130,6 +100,21 @@
 @end menu
 
 
+ at node Introduction
+ at chapter About Dirmngr.
+
+
+ at c man begin DESCRIPTION
+
+Dirmngr is a server for managing and downloading certificate revocation
+lists (CRLs) for X.509 certificates and for downloading the certificates
+themselves. Dirmngr also handles OCSP requests as an alternative to
+CRLs. Dirmngr is either invoked internally by gpgsm (from gnupg 1.9) or
+when running as a system daemon through the @command{dirmngr-client} tool.
+
+ at c man end
+
+
 @node Installation
 @chapter How to install Dirmngr.
 
@@ -820,6 +805,10 @@
 You can increase the verbosity by giving several
 verbose commands to @sc{dirmngr}, such as @samp{-vv}.
 
+ at item --pem
+ at opindex pem
+Assume that the given certificate is in PEM (armored) format.
+
 @item --ocsp
 @opindex ocsp
 Do the check using the COSP protocol and ignore any CRLs.
@@ -850,6 +839,12 @@
 may be used to retrieve certificates from a server. However the output
 format is not very well suited if more than one certificate is returned.
 
+ at item --squid-mode
+ at opindex squid-mode
+Run @sc{dirmngr-client} in a mode suitable as a helper program for
+Squid's @option{external_acl_type} option.
+
+
 @end table
 
 
Index: dirmngr/po/ChangeLog
diff -u dirmngr/po/ChangeLog:1.2 dirmngr/po/ChangeLog:1.3
--- dirmngr/po/ChangeLog:1.2	Tue Sep 28 15:10:35 2004
+++ dirmngr/po/ChangeLog	Tue Jan  4 15:16:39 2005
@@ -1,3 +1,7 @@
+2005-01-04  Werner Koch  <wk at g10code.com>
+
+	* de.po: Updated.
+
 2004-09-28  Werner Koch  <wk at g10code.com>
 
 	* de.po: Converted to utf-8.
Index: dirmngr/po/de.po
diff -u dirmngr/po/de.po:1.10 dirmngr/po/de.po:1.11
--- dirmngr/po/de.po:1.10	Fri Dec 17 11:55:40 2004
+++ dirmngr/po/de.po	Tue Jan  4 15:16:39 2005
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: dirmngr 0.9.0\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2004-12-17 11:40+0100\n"
-"PO-Revision-Date: 2004-12-17 11:50+0100\n"
+"POT-Creation-Date: 2005-01-04 15:12+0100\n"
+"PO-Revision-Date: 2005-01-04 15:14+0100\n"
 "Last-Translator: Werner Koch <wk at g10code.com>\n"
 "Language-Team: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: jnlib/logging.c:624
+#: jnlib/logging.c:625
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben einen Bug (Softwarefehler) gefunden ... (%s:%d)\n"
@@ -45,7 +45,7 @@
 msgid "can't access directory `%s': %s\n"
 msgstr "Fehler beim Zugriff auf das Verzeichnis `%s': %s\n"
 
-#: src/certcache.c:323 src/crlcache.c:2173 src/ldap.c:615
+#: src/certcache.c:323 src/crlcache.c:2173 src/ldap.c:625
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' kann nicht geöffnet werden: %s\n"
@@ -90,7 +90,7 @@
 msgid "    runtime cached certificates: %u\n"
 msgstr "zur Laufzeit geladene Zertifikate: %u\n"
 
-#: src/certcache.c:457 src/dirmngr-client.c:317
+#: src/certcache.c:457 src/dirmngr-client.c:365
 msgid "certificate already cached\n"
 msgstr "Zertifikat ist bereits im Cache\n"
 
@@ -98,7 +98,7 @@
 msgid "certificate cached\n"
 msgstr "Zertifikat wurde gecachet\n"
 
-#: src/certcache.c:461 src/dirmngr-client.c:321
+#: src/certcache.c:461 src/dirmngr-client.c:369
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "Fehler beim Cachen des Zertifikats: %s\n"
@@ -215,7 +215,7 @@
 msgid "unsupported record type in `%s' line %u skipped\n"
 msgstr "Nicht unterstützter Datensatztyp in `%s', Zeile %u übergangen\n"
 
-#: src/crlcache.c:574 src/crlcache.c:803 src/dirmngr.c:1203
+#: src/crlcache.c:574 src/crlcache.c:803 src/dirmngr.c:1210
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
@@ -593,7 +593,7 @@
 msgid "End CRL dump\n"
 msgstr "Ende CRL Ausgabe\n"
 
-#: src/crlcache.c:2182 src/crlfetch.c:97 src/ldap.c:683
+#: src/crlcache.c:2182 src/crlfetch.c:97 src/ldap.c:693
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "Fehler beim Initialisieren des \"reader\" Objekts: %s\n"
@@ -688,11 +688,11 @@
 "Optionen:\n"
 " "
 
-#: src/dirmngr.c:119 src/dirmngr-client.c:64 src/dirmngr_ldap.c:76
+#: src/dirmngr.c:119 src/dirmngr-client.c:67 src/dirmngr_ldap.c:76
 msgid "verbose"
 msgstr "ausführlich"
 
-#: src/dirmngr.c:120 src/dirmngr-client.c:65 src/dirmngr_ldap.c:77
+#: src/dirmngr.c:120 src/dirmngr-client.c:68 src/dirmngr_ldap.c:77
 msgid "be somewhat more quiet"
 msgstr "etwas weniger Ausgaben erzeugen"
 
@@ -792,7 +792,7 @@
 msgid "|FILE|listen on socket FILE"
 msgstr "|DATEI|Anfragen auf Socket DATEI annehmen"
 
-#: src/dirmngr.c:218 src/dirmngr-client.c:128 src/dirmngr_ldap.c:140
+#: src/dirmngr.c:218 src/dirmngr-client.c:143 src/dirmngr_ldap.c:140
 msgid "Please report bugs to <gpa-dev at gnupg.org>.\n"
 msgstr "Berichte über Bugs (Programmfehler) bitte an <gpa-dev at gnupg.org>.\n"
 
@@ -824,163 +824,163 @@
 
 #: src/dirmngr.c:360
 #, c-format
-msgid "error spawning ldap wrapper ripper thread: %s\n"
-msgstr "Fehler beim Starten des LDAP Wrapper Thread: %s\n"
+msgid "error spawning ldap wrapper reaper thread: %s\n"
+msgstr "Fehler beim Starten des LDAP Wrapper Kontrollthreads: %s\n"
 
-#: src/dirmngr.c:490 src/dirmngr.c:500
+#: src/dirmngr.c:495 src/dirmngr.c:505
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s ist zu alt (benötige %s, habe %s)\n"
 
-#: src/dirmngr.c:597
+#: src/dirmngr.c:602
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Voreingestellte Optionendatei `%s' nicht vorhanden\n"
 
-#: src/dirmngr.c:602 src/dirmngr.c:1260
+#: src/dirmngr.c:607 src/dirmngr.c:1267
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei `%s': %s\n"
 
-#: src/dirmngr.c:610
+#: src/dirmngr.c:615
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden von `%s' gelesen\n"
 
-#: src/dirmngr.c:710
+#: src/dirmngr.c:715
 #, c-format
 msgid "WARNING: running with faked system time %s\n"
 msgstr "WARNUNG: Prozess läuft mit getürkter Systemzeit %s\n"
 
-#: src/dirmngr.c:786
+#: src/dirmngr.c:792
 msgid "colons are not allowed in the socket name\n"
 msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
 
-#: src/dirmngr.c:791
+#: src/dirmngr.c:797
 msgid "name of socket too long\n"
 msgstr "Name des Sockets ist zu lang\n"
 
-#: src/dirmngr.c:798
+#: src/dirmngr.c:804
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Fehler beim Erzeugen des Sockets: %s\n"
 
-#: src/dirmngr.c:817
+#: src/dirmngr.c:823
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "Fehler beim Binden des Sockets an `%s': %s\n"
 
-#: src/dirmngr.c:826
+#: src/dirmngr.c:832
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() fehlgeschlagen: %s\n"
 
-#: src/dirmngr.c:832
+#: src/dirmngr.c:838
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "Anfragen werden auf Socket `%s' engegengenommen\n"
 
-#: src/dirmngr.c:838
+#: src/dirmngr.c:844
 #, c-format
 msgid "fork failed: %s\n"
 msgstr "fork() fehlgeschlagen: %s\n"
 
-#: src/dirmngr.c:856
+#: src/dirmngr.c:862
 msgid "out of core\n"
 msgstr "Nicht genügend Hauptspeicher vorhanden\n"
 
-#: src/dirmngr.c:895
+#: src/dirmngr.c:901
 #, c-format
 msgid "setsid() failed: %s\n"
 msgstr "setsid() fehlgeschlagen: %s\n"
 
-#: src/dirmngr.c:905
+#: src/dirmngr.c:911
 #, c-format
 msgid "chdir to / failed: %s\n"
 msgstr "chdir nach / fehlgeschlagen: %s\n"
 
-#: src/dirmngr.c:954
+#: src/dirmngr.c:961
 #, c-format
 msgid "fetching CRL from `%s' failed: %s\n"
 msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
 
-#: src/dirmngr.c:960
+#: src/dirmngr.c:967
 #, c-format
 msgid "processing CRL from `%s' failed: %s\n"
 msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
 
-#: src/dirmngr.c:1107
+#: src/dirmngr.c:1114
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "Fehler beim Öffnen von `%s': %s\n"
 
-#: src/dirmngr.c:1124
+#: src/dirmngr.c:1131
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: Zeile ist zu lang - übergangen\n"
 
-#: src/dirmngr.c:1152
+#: src/dirmngr.c:1159
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: Kein Hostname angegeben\n"
 
-#: src/dirmngr.c:1171
+#: src/dirmngr.c:1178
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: Passwort angegeben ohne Username\n"
 
-#: src/dirmngr.c:1192
+#: src/dirmngr.c:1199
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: Diese Zeile wird übersprungen\n"
 
-#: src/dirmngr.c:1292
+#: src/dirmngr.c:1299
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 "SIGHUP empfangen - lese die Konfiguration erneut und lösche die Caches\n"
 
-#: src/dirmngr.c:1306
+#: src/dirmngr.c:1313
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 empfangen - keine Aktion definiert\n"
 
-#: src/dirmngr.c:1311
+#: src/dirmngr.c:1318
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM empfangen - wird heruntergefahren ...\n"
 
-#: src/dirmngr.c:1313
+#: src/dirmngr.c:1320
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n"
 
-#: src/dirmngr.c:1318
+#: src/dirmngr.c:1325
 msgid "shutdown forced\n"
 msgstr "Herunterfahren wurde erzwungen\n"
 
-#: src/dirmngr.c:1326
+#: src/dirmngr.c:1333
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT empfangen - wird sofort heruntergefahren\n"
 
-#: src/dirmngr.c:1333
+#: src/dirmngr.c:1340
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "Signal %d empfangen - keine Aktion definiert\n"
 
-#: src/dirmngr.c:1347
+#: src/dirmngr.c:1354
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "Routine für fd %d gestartet\n"
 
-#: src/dirmngr.c:1352
+#: src/dirmngr.c:1359
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "Routine für fd %d beendet\n"
 
-#: src/dirmngr.c:1408
+#: src/dirmngr.c:1415
 #, c-format
 msgid "accept failed: %s - waiting 1s\n"
 msgstr "accept() fehlgeschlagen: %s - warte 1s\n"
 
-#: src/dirmngr.c:1415
+#: src/dirmngr.c:1422
 #, c-format
 msgid "error spawning connection handler: %s\n"
 msgstr "Fehler beim Starten des Verbindungshandler: %s\n"
@@ -1060,47 +1060,47 @@
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr "LDAP Wrapper %d versackt - abgeschossen\n"
 
-#: src/ldap.c:390 src/ldap.c:411
+#: src/ldap.c:401 src/ldap.c:422
 #, c-format
 msgid "reading from ldap wrapper %d failed: %s\n"
 msgstr "Lesen vom LDAP Wrapper %d fehlgeschlagen: %s\n"
 
-#: src/ldap.c:556 src/ldap.c:562
+#: src/ldap.c:566 src/ldap.c:572
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Fehler beim Erzeugen einer Pipe: %s\n"
 
-#: src/ldap.c:572
+#: src/ldap.c:582
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "Fehler beim Forken eines Prozesses: %s\n"
 
-#: src/ldap.c:620 src/ldap.c:627 src/ldap.c:634
+#: src/ldap.c:630 src/ldap.c:637 src/ldap.c:644
 #, c-format
 msgid "dup2 failed in child: %s\n"
 msgstr "dup2() im Kindprozess fehlgeschlagen: %s\n"
 
-#: src/ldap.c:652
+#: src/ldap.c:662
 #, c-format
 msgid "error running `%s': %s\n"
 msgstr "Fehler beim Ausführen von `%s': %s\n"
 
-#: src/ldap.c:664
+#: src/ldap.c:674
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr "Fehler beim Allozieren von Speicher: %s\n"
 
-#: src/ldap.c:696
+#: src/ldap.c:706
 #, c-format
 msgid "ldap wrapper %d started\n"
 msgstr "LDAP Wrapper %d gestartet\n"
 
-#: src/ldap.c:1160
+#: src/ldap.c:1170
 #, c-format
 msgid "start_cert_fetch: invalid pattern `%s'\n"
 msgstr "start_cert_fetch: Ungültiges Muster `%s'\n"
 
-#: src/ldap.c:1298
+#: src/ldap.c:1308
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search erreichte die Größengrenze des Servers\n"
 
@@ -1455,36 +1455,44 @@
 msgid "certificate is not usable for signing\n"
 msgstr "Das Zertifikat kann nicht zum Signieren benutzt werden\n"
 
-#: src/dirmngr-client.c:66
+#: src/dirmngr-client.c:69
 msgid "use OCSP instead of CRLs"
 msgstr "OCSP anstatt CRL benutzen"
 
-#: src/dirmngr-client.c:67
+#: src/dirmngr-client.c:70
 msgid "check whether a dirmngr is running"
 msgstr "Teste ob der dirmngr noch läuft"
 
-#: src/dirmngr-client.c:68
+#: src/dirmngr-client.c:71
 msgid "add a certificate to the cache"
 msgstr "Ein Zertifikat dem Cache zufügen"
 
-#: src/dirmngr-client.c:69
+#: src/dirmngr-client.c:72
 msgid "validate a certificate"
 msgstr "Zertifikat prüfen"
 
-#: src/dirmngr-client.c:70
+#: src/dirmngr-client.c:73
 msgid "lookup a certificate"
 msgstr "Zertifikat auffinden"
 
-#: src/dirmngr-client.c:71
+#: src/dirmngr-client.c:74
 msgid "load a CRL into the dirmngr"
 msgstr "CRL in den Dirmngr laden"
 
-#: src/dirmngr-client.c:132
+#: src/dirmngr-client.c:75
+msgid "special mode for use by Squid"
+msgstr "Sondermodus für Squid"
+
+#: src/dirmngr-client.c:76
+msgid "certificates are expected in PEM format"
+msgstr "Zertifikate werden im PEM Format erwartet"
+
+#: src/dirmngr-client.c:147
 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 msgstr ""
 "Gebrauch: dirmngr-client [Optionen] [Zertdatei|Muster] (-h für Hilfe)\n"
 
-#: src/dirmngr-client.c:136
+#: src/dirmngr-client.c:151
 msgid ""
 "Syntax: dirmngr-client [options] [certfile|pattern]\n"
 "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -1497,98 +1505,98 @@
 "The Prozess gibt 0 zurück wenn das Zertifikat gültig ist, 1 wenn es nicht\n"
 "gültig ist und weitere Werte bei anderen Fehlern.\n"
 
-#: src/dirmngr-client.c:224
+#: src/dirmngr-client.c:265 src/dirmngr-client.c:953
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr "Fehler beim Lesen des Zertifikats von der Standardeingabe: %s\n"
 
-#: src/dirmngr-client.c:231
+#: src/dirmngr-client.c:272
 #, c-format
 msgid "error reading certificate from `%s': %s\n"
 msgstr "Fehler beim Lesen des Zertifikats von `%s': %s\n"
 
-#: src/dirmngr-client.c:245
+#: src/dirmngr-client.c:286
 msgid "certificate too large to make any sense\n"
 msgstr "Zertifikat ist zu groß um Sinnvoll zu sein\n"
 
-#: src/dirmngr-client.c:264
+#: src/dirmngr-client.c:312
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "Aufsuchen fehlgeschlagen: %s\n"
 
-#: src/dirmngr-client.c:279
+#: src/dirmngr-client.c:327
 #, c-format
 msgid "loading CRL `%s' failed: %s\n"
 msgstr "Laden der CRL von `%s' fehlgeschlagen: %s\n"
 
-#: src/dirmngr-client.c:307
+#: src/dirmngr-client.c:355
 msgid "a dirmngr daemon is up and running\n"
 msgstr "Ein dirmngr ist vorhanden und aktiv\n"
 
-#: src/dirmngr-client.c:329
+#: src/dirmngr-client.c:377
 #, c-format
 msgid "validation of certificate failed: %s\n"
 msgstr "Prüfung des Zertifikats fehlgeschlagen: %s\n"
 
-#: src/dirmngr-client.c:336
+#: src/dirmngr-client.c:384 src/dirmngr-client.c:964
 msgid "certificate is valid\n"
 msgstr "Zertifikat ist gültig\n"
 
-#: src/dirmngr-client.c:342
+#: src/dirmngr-client.c:390 src/dirmngr-client.c:972
 msgid "certificate has been revoked\n"
 msgstr "Zertifikat wurde widerrufen\n"
 
-#: src/dirmngr-client.c:347
+#: src/dirmngr-client.c:395 src/dirmngr-client.c:974
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr "Zertifikatprüfung fehlgeschlagen: %s\n"
 
-#: src/dirmngr-client.c:358
+#: src/dirmngr-client.c:406
 #, c-format
 msgid "got status: `%s'\n"
 msgstr "Erhielt Status: `%s'\n"
 
-#: src/dirmngr-client.c:373
+#: src/dirmngr-client.c:421
 #, c-format
 msgid "error writing base64 encoding: %s\n"
 msgstr "Fehler beim Schreiben der Base-64 Darstellung: %s\n"
 
-#: src/dirmngr-client.c:405
+#: src/dirmngr-client.c:453
 msgid "apparently no running dirmngr\n"
 msgstr "Offensichtlich ist kein Dirmngr vorhanden\n"
 
-#: src/dirmngr-client.c:410
+#: src/dirmngr-client.c:458
 msgid "no running dirmngr - starting one\n"
 msgstr "Dirmngr läuft nicht - ein neuer wird gestartet\n"
 
-#: src/dirmngr-client.c:443
+#: src/dirmngr-client.c:491
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "Fehlerhafte DIRMNGR_INFO Variable\n"
 
-#: src/dirmngr-client.c:458
+#: src/dirmngr-client.c:506
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "Dirmngr Protocol Version %d wird nicht unterstützt\n"
 
-#: src/dirmngr-client.c:474
+#: src/dirmngr-client.c:522
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "Verbindung zum Dirmngr nicht möglich - Rückfallmethode wird versucht\n"
 
-#: src/dirmngr-client.c:482
+#: src/dirmngr-client.c:530
 #, c-format
 msgid "can't connect to the dirmngr: %s\n"
 msgstr "Verbindung zum Dirmngr nicht möglich: %s\n"
 
-#: src/dirmngr-client.c:565
+#: src/dirmngr-client.c:766
 #, c-format
 msgid "unsupported inquiry `%s'\n"
 msgstr "Nicht unterstützte INQUIRY `%s'\n"
 
-#: src/dirmngr-client.c:657
+#: src/dirmngr-client.c:858
 msgid "absolute file name expected\n"
 msgstr "Absoluter Dateiname erwartet\n"
 
-#: src/dirmngr-client.c:700
+#: src/dirmngr-client.c:901
 #, c-format
 msgid "looking up `%s'\n"
 msgstr "Auffinden von `%s'\n"
Index: dirmngr/tests/Makefile.am
diff -u dirmngr/tests/Makefile.am:1.9 dirmngr/tests/Makefile.am:1.10
--- dirmngr/tests/Makefile.am:1.9	Tue Nov 16 19:24:35 2004
+++ dirmngr/tests/Makefile.am	Tue Jan  4 15:16:38 2005
@@ -10,7 +10,7 @@
 
 TESTS = 
 
-noinst_PROGRAMS = test-dirmngr asschk show-multi
+noinst_PROGRAMS = test-dirmngr asschk show-multi percent-escape
 LDADD = ../jnlib/libjnlib.a @LIBASSUAN_LIBS@ @LIBGCRYPT_LIBS@ @KSBA_LIBS@
 
 asschk_SOURCES = asschk.c
@@ -18,6 +18,10 @@
 show_multi_SOURCERS = show-multi.c
 show_multi_LDADD = 
 
+percent_escape_SOURCERS = percent-escape.c
+percent_escape_LDADD = 
+
+
 
 
 
Index: dirmngr/tests/percent-escape.c
diff -u /dev/null dirmngr/tests/percent-escape.c:1.1
--- /dev/null	Tue Jan  4 15:16:39 2005
+++ dirmngr/tests/percent-escape.c	Tue Jan  4 15:16:38 2005
@@ -0,0 +1,113 @@
+/*percent-escape.c  - Test tool to create percent escaped data
+ *	Copyright (C) 2004 g10 Code GmbH
+ *
+ * This file is part of DirMngr.
+ *
+ * DirMngr is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * DirMngr is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <errno.h>
+#include <stdarg.h>
+
+#define PGM "percent-escape"
+
+/* Print diagnostic message and exit with failure. */
+static void
+die (const char *format, ...)
+{
+  va_list arg_ptr;
+
+  fflush (stdout);
+  fprintf (stderr, "%s: ", PGM);
+
+  va_start (arg_ptr, format);
+  vfprintf (stderr, format, arg_ptr);
+  va_end (arg_ptr);
+  putc ('\n', stderr);
+
+  exit (1);
+}
+
+
+static void
+proc (FILE *fp)
+{
+  int c;
+
+  while ((c=getc (fp))!= EOF)
+    if ( c <= ' ' || c >= 127 || c == '%' )
+      printf ("%%%02X", (unsigned int)c);
+    else
+      putchar (c);
+}
+
+
+
+int 
+main (int argc, char **argv)
+{
+  int last_argc = -1;
+ 
+  if (argc)
+    {
+      argc--; argv++;
+    }
+  while (argc && last_argc != argc )
+    {
+      last_argc = argc;
+      if (!strcmp (*argv, "--"))
+        {
+          argc--; argv++;
+          break;
+        }
+      else if (!strcmp (*argv, "--help"))
+        {
+          puts (
+                "Usage: " PGM " [OPTION] [FILE]\n"
+                "Percent escape the input\n\n"
+                "  --help      display this help and exit\n\n"
+                "With no FILE, or when FILE is -, read standard input.\n");
+          exit (0);
+        }
+    }          
+ 
+  if (argc > 1)
+    die ("usage: " PGM " [OPTION] [FILE] (try --help for more information)\n");
+
+  if (argc && strcmp (*argv, "-"))
+    {
+      FILE *fp = fopen (*argv, "rb");
+      if (!fp)
+        die ("can't open `%s': %s", *argv, strerror (errno));
+      proc (fp);
+      fclose (fp);
+    }
+  else
+    proc (stdin);
+
+  return 0;
+}
+
+
+/*
+Local Variables:
+compile-command: "gcc -Wall -g -o percent-escape percent-escape.c"
+End:
+*/




More information about the Gnupg-commits mailing list