[svn] Advertise DER rather than ASN1.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8853c868b7dd933b95bb4448f20fc87299eddb51..2478ddc8ccfc16e843373de07d4e2f8f96c2f346 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-27  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * main.c (print_help): Advertise "DER", not "ASN1".
+
 2005-04-27  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * openssl.c (init_prng): Disable the weak random seed by default.

diff --git a/src/main.c b/src/main.c
index 0be2c90c49e5e643a51bff330ab6554bf19fdfa1..3be046f24e848cf69c33f02ad9775d7d58ccd69d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -543,11 +543,11 @@ HTTPS (SSL/TLS) options:\n"),
     N_("\
        --certificate=FILE       client certificate file.\n"),
     N_("\
-       --certificate-type=TYPE  client certificate type, PEM or ASN1.\n"),
+       --certificate-type=TYPE  client certificate type, PEM or DER.\n"),
     N_("\
        --private-key=FILE       private key file.\n"),
     N_("\
-       --private-key-type=TYPE  private key type, PEM or ASN1.\n"),
+       --private-key-type=TYPE  private key type, PEM or DER.\n"),
     N_("\
        --ca-certificate=FILE    file with the bundle of CA's.\n"),
     N_("\