openssl/patches/openssl-1.0.0d-apps-dgst.patch

   1 diff -up openssl-1.0.0d/apps/ca.c.dgst openssl-1.0.0d/apps/ca.c
   2 --- openssl-1.0.0d/apps/ca.c.dgst       2009-12-02 15:41:24.000000000 +0100
   3 +++ openssl-1.0.0d/apps/ca.c    2011-04-05 21:09:42.000000000 +0200
   4 @@ -157,7 +157,7 @@ static const char *ca_usage[]={
   5  " -startdate YYMMDDHHMMSSZ  - certificate validity notBefore\n",
   6  " -enddate YYMMDDHHMMSSZ    - certificate validity notAfter (overrides -days)\n",
   7  " -days arg       - number of days to certify the certificate for\n",
   8 -" -md arg         - md to use, one of md2, md5, sha or sha1\n",
   9 +" -md arg         - md to use, see openssl dgst -h for list\n",
  10  " -policy arg     - The CA 'policy' to support\n",
  11  " -keyfile arg    - private key file\n",
  12  " -keyform arg    - private key file format (PEM or ENGINE)\n",
  13 diff -up openssl-1.0.0d/apps/enc.c.dgst openssl-1.0.0d/apps/enc.c
  14 --- openssl-1.0.0d/apps/enc.c.dgst      2010-06-15 19:25:02.000000000 +0200
  15 +++ openssl-1.0.0d/apps/enc.c   2011-04-05 21:11:54.000000000 +0200
  16 @@ -302,7 +302,7 @@ bad:
  17                         BIO_printf(bio_err,"%-14s passphrase is the next argument\n","-k");
  18                         BIO_printf(bio_err,"%-14s passphrase is the first line of the file argument\n","-kfile");
  19                         BIO_printf(bio_err,"%-14s the next argument is the md to use to create a key\n","-md");
  20 -                       BIO_printf(bio_err,"%-14s   from a passphrase.  One of md2, md5, sha or sha1\n","");
  21 +                       BIO_printf(bio_err,"%-14s   from a passphrase. See openssl dgst -h for list.\n","");
  22                         BIO_printf(bio_err,"%-14s salt in hex is the next argument\n","-S");
  23                         BIO_printf(bio_err,"%-14s key/iv in hex is the next argument\n","-K/-iv");
  24                         BIO_printf(bio_err,"%-14s print the iv/key (then exit if -P)\n","-[pP]");
  25 diff -up openssl-1.0.0d/apps/req.c.dgst openssl-1.0.0d/apps/req.c
  26 --- openssl-1.0.0d/apps/req.c.dgst      2010-03-10 14:48:21.000000000 +0100
  27 +++ openssl-1.0.0d/apps/req.c   2011-04-05 21:12:33.000000000 +0200
  28 @@ -421,7 +421,7 @@ bad:
  29  #ifndef OPENSSL_NO_ECDSA
  30                 BIO_printf(bio_err," -newkey ec:file generate a new EC key, parameters taken from CA in 'file'\n");
  31  #endif
  32 -               BIO_printf(bio_err," -[digest]      Digest to sign with (md5, sha1, md2, mdc2, md4)\n");
  33 +               BIO_printf(bio_err," -[digest]      Digest to sign with (see openssl dgst -h for list)\n");
  34                 BIO_printf(bio_err," -config file   request template file.\n");
  35                 BIO_printf(bio_err," -subj arg      set or modify request subject\n");
  36                 BIO_printf(bio_err," -multivalue-rdn enable support for multivalued RDNs\n");
  37 diff -up openssl-1.0.0d/apps/ts.c.dgst openssl-1.0.0d/apps/ts.c
  38 --- openssl-1.0.0d/apps/ts.c.dgst       2009-10-18 16:42:26.000000000 +0200
  39 +++ openssl-1.0.0d/apps/ts.c    2011-04-05 21:16:07.000000000 +0200
  40 @@ -368,7 +368,7 @@ int MAIN(int argc, char **argv)
  41         BIO_printf(bio_err, "usage:\n"
  42                    "ts -query [-rand file%cfile%c...] [-config configfile] "
  43                    "[-data file_to_hash] [-digest digest_bytes]"
  44 -                  "[-md2|-md4|-md5|-sha|-sha1|-mdc2|-ripemd160] "
  45 +                  "[-<hashalg>] "
  46                    "[-policy object_id] [-no_nonce] [-cert] "
  47                    "[-in request.tsq] [-out request.tsq] [-text]\n",
  48                    LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
  49 diff -up openssl-1.0.0d/apps/x509.c.dgst openssl-1.0.0d/apps/x509.c
  50 --- openssl-1.0.0d/apps/x509.c.dgst     2011-04-05 21:13:42.000000000 +0200
  51 +++ openssl-1.0.0d/apps/x509.c  2011-04-05 21:13:17.000000000 +0200
  52 @@ -141,7 +141,7 @@ static const char *x509_usage[]={
  53  " -set_serial     - serial number to use\n",
  54  " -text           - print the certificate in text form\n",
  55  " -C              - print out C code forms\n",
  56 -" -md2/-md5/-sha1/-mdc2 - digest to use\n",
  57 +" -<dgst>         - digest to use, see openssl dgst -h output for list\n",
  58  " -extfile        - configuration file with X509V3 extensions to add\n",
  59  " -extensions     - section from config file with X509V3 extensions to add\n",
  60  " -clrext         - delete extensions before signing and input certificate\n",
  61 diff -up openssl-1.0.0d/doc/apps/ca.pod.dgst openssl-1.0.0d/doc/apps/ca.pod
  62 --- openssl-1.0.0d/doc/apps/ca.pod.dgst 2009-04-10 13:25:53.000000000 +0200
  63 +++ openssl-1.0.0d/doc/apps/ca.pod      2011-04-05 21:16:39.000000000 +0200
  64 @@ -160,7 +160,8 @@ the number of days to certify the certif
  65  =item B<-md alg>
  66
  67  the message digest to use. Possible values include md5, sha1 and mdc2.
  68 -This option also applies to CRLs.
  69 +For full list of digests see openssl dgst -h output. This option also
  70 +applies to CRLs.
  71
  72  =item B<-policy arg>
  73
  74 diff -up openssl-1.0.0d/doc/apps/ocsp.pod.dgst openssl-1.0.0d/doc/apps/ocsp.pod
  75 --- openssl-1.0.0d/doc/apps/ocsp.pod.dgst       2008-02-25 19:11:47.000000000 +0100
  76 +++ openssl-1.0.0d/doc/apps/ocsp.pod    2011-04-05 21:18:17.000000000 +0200
  77 @@ -210,7 +210,8 @@ check is not performed.
  78  =item B<-md5|-sha1|-sha256|-ripemod160|...>
  79
  80  this option sets digest algorithm to use for certificate identification
  81 -in the OCSP request. By default SHA-1 is used.
  82 +in the OCSP request. By default SHA-1 is used. See openssl dgst -h output for
  83 +the list of available algorithms.
  84
  85  =back
  86
  87 diff -up openssl-1.0.0d/doc/apps/req.pod.dgst openssl-1.0.0d/doc/apps/req.pod
  88 --- openssl-1.0.0d/doc/apps/req.pod.dgst        2009-04-10 18:42:28.000000000 +0200
  89 +++ openssl-1.0.0d/doc/apps/req.pod     2011-04-05 21:20:47.000000000 +0200
  90 @@ -201,7 +201,8 @@ will not be encrypted.
  91
  92  this specifies the message digest to sign the request with (such as
  93  B<-md5>, B<-sha1>). This overrides the digest algorithm specified in
  94 -the configuration file.
  95 +the configuration file. For full list of possible digests see openssl
  96 +dgst -h output.
  97
  98  Some public key algorithms may override this choice. For instance, DSA
  99  signatures always use SHA1, GOST R 34.10 signatures always use
 100 diff -up openssl-1.0.0d/doc/apps/x509.pod.dgst openssl-1.0.0d/doc/apps/x509.pod
 101 --- openssl-1.0.0d/doc/apps/x509.pod.dgst       2010-01-12 18:27:11.000000000 +0100
 102 +++ openssl-1.0.0d/doc/apps/x509.pod    2011-04-05 21:19:56.000000000 +0200
 103 @@ -101,6 +101,7 @@ the digest to use. This affects any sign
 104  digest, such as the B<-fingerprint>, B<-signkey> and B<-CA> options. If not
 105  specified then SHA1 is used. If the key being used to sign with is a DSA key
 106  then this option has no effect: SHA1 is always used with DSA keys.
 107 +For full list of digests see openssl dgst -h output.
 108
 109  =item B<-engine id>
 110