X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fmain.c;h=0be2c90c49e5e643a51bff330ab6554bf19fdfa1;hb=8f935cf74ce95a631788fb8a4cce4114df935a78;hp=935d16d7af0b099dc6e4962f41459d765f0e917e;hpb=625140337857bef6a35d61735c5e35b59b5d12ef;p=wget

diff --git a/src/main.c b/src/main.c
index 935d16d7..0be2c90c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -157,7 +157,12 @@ struct cmdline_option option_data[] =
     { "backups", 0, OPT_BOOLEAN, "backups", -1 },
     { "base", 'B', OPT_VALUE, "base", -1 },
     { "bind-address", 0, OPT_VALUE, "bindaddress", -1 },
+    { IF_SSL ("ca-certificate"), 0, OPT_VALUE, "cacertificate", -1 },
+    { IF_SSL ("ca-directory"), 0, OPT_VALUE, "cadirectory", -1 },
     { "cache", 0, OPT_BOOLEAN, "cache", -1 },
+    { IF_SSL ("certificate"), 0, OPT_VALUE, "certificate", -1 },
+    { IF_SSL ("certificate-type"), 0, OPT_VALUE, "certificatetype", -1 },
+    { IF_SSL ("check-certificate"), 0, OPT_BOOLEAN, "checkcertificate", -1 },
     { "clobber", 0, OPT__CLOBBER, NULL, optional_argument },
     { "connect-timeout", 0, OPT_VALUE, "connecttimeout", -1 },
     { "continue", 'c', OPT_BOOLEAN, "continue", -1 },
@@ -216,14 +221,17 @@ struct cmdline_option option_data[] =
     { "post-file", 0, OPT_VALUE, "postfile", -1 },
     { "prefer-family", 0, OPT_VALUE, "preferfamily", -1 },
     { "preserve-permissions", 0, OPT_BOOLEAN, "preservepermissions", -1 },
+    { IF_SSL ("private-key"), 0, OPT_VALUE, "privatekey", -1 },
+    { IF_SSL ("private-key-type"), 0, OPT_VALUE, "privatekeytype", -1 },
     { "progress", 0, OPT_VALUE, "progress", -1 },
     { "protocol-directories", 0, OPT_BOOLEAN, "protocoldirectories", -1 },
     { "proxy", 0, OPT_BOOLEAN, "useproxy", -1 },
-    { "_proxy-compat", 'Y', OPT_VALUE, "useproxy", -1 }, /* back-compatible */
+    { "proxy__compat", 'Y', OPT_VALUE, "useproxy", -1 }, /* back-compatible */
     { "proxy-passwd", 0, OPT_VALUE, "proxypasswd", -1 },
     { "proxy-user", 0, OPT_VALUE, "proxyuser", -1 },
     { "quiet", 'q', OPT_BOOLEAN, "quiet", -1 },
     { "quota", 'Q', OPT_VALUE, "quota", -1 },
+    { "random-file", 0, OPT_VALUE, "randomfile", -1 },
     { "random-wait", 0, OPT_BOOLEAN, "randomwait", -1 },
     { "read-timeout", 0, OPT_VALUE, "readtimeout", -1 },
     { "recursive", 'r', OPT_BOOLEAN, "recursive", -1 },
@@ -236,21 +244,14 @@ struct cmdline_option option_data[] =
     { "retry-connrefused", 0, OPT_BOOLEAN, "retryconnrefused", -1 },
     { "save-cookies", 0, OPT_VALUE, "savecookies", -1 },
     { "save-headers", 0, OPT_BOOLEAN, "saveheaders", -1 },
+    { IF_SSL ("secure-protocol"), 0, OPT_VALUE, "secureprotocol", -1 },
     { "server-response", 'S', OPT_BOOLEAN, "serverresponse", -1 },
     { "span-hosts", 'H', OPT_BOOLEAN, "spanhosts", -1 },
     { "spider", 0, OPT_BOOLEAN, "spider", -1 },
-    { IF_SSL ("sslcadir"), 0, OPT_VALUE, "sslcadir", -1 },
-    { IF_SSL ("sslcafile"), 0, OPT_VALUE, "sslcafile", -1 },
-    { IF_SSL ("sslcertfile"), 0, OPT_VALUE, "sslcertfile", -1 },
-    { IF_SSL ("sslcertkey"), 0, OPT_VALUE, "sslcertkey", -1 },
-    { IF_SSL ("sslcerttype"), 0, OPT_VALUE, "sslcerttype", -1 },
-    { IF_SSL ("sslcheckcert"), 0, OPT_VALUE, "sslcheckcert", -1 },
-    { IF_SSL ("sslprotocol"), 0, OPT_VALUE, "sslprotocol", -1 },
     { "strict-comments", 0, OPT_BOOLEAN, "strictcomments", -1 },
     { "timeout", 'T', OPT_VALUE, "timeout", -1 },
     { "timestamping", 'N', OPT_BOOLEAN, "timestamping", -1 },
     { "tries", 't', OPT_VALUE, "tries", -1 },
-    { "use-proxy", 'Y', OPT_BOOLEAN, "useproxy", -1 },
     { "user-agent", 'U', OPT_VALUE, "useragent", -1 },
     { "verbose", 'v', OPT_BOOLEAN, "verbose", -1 },
     { "verbose", 0, OPT_BOOLEAN, "verbose", -1 },
@@ -533,24 +534,28 @@ HTTP options:\n"),
 
 #ifdef HAVE_SSL
     N_("\
-HTTPS (SSL) options:\n"),
+HTTPS (SSL/TLS) options:\n"),
     N_("\
-       --sslcertfile=FILE    optional client certificate.\n"),
+       --secure-protocol=PR     choose SSL protocol, one of auto, SSLv2, SSLv3,\n\
+                                and TLSv1.\n"),
     N_("\
-       --sslcertkey=KEYFILE  optional keyfile for this certificate.\n"),
+       --no-check-certificate   don't validate the server's certificate.\n"),
     N_("\
-       --sslcadir=DIR        dir where hash list of CA's are stored.\n"),
+       --certificate=FILE       client certificate file.\n"),
     N_("\
-       --sslcafile=FILE      file with bundle of CA's.\n"),
+       --certificate-type=TYPE  client certificate type, PEM or ASN1.\n"),
     N_("\
-       --sslcerttype=0/1     Client-Cert type 0=PEM (default) / 1=ASN1 (DER).\n"),
+       --private-key=FILE       private key file.\n"),
     N_("\
-       --sslcheckcert=0/1    Check the server cert against given CA.\n"),
+       --private-key-type=TYPE  private key type, PEM or ASN1.\n"),
     N_("\
-       --sslprotocol=0-3     choose SSL protocol; 0=automatic,\n\
-                             1=SSLv2 2=SSLv3 3=TLSv1.\n"),
+       --ca-certificate=FILE    file with the bundle of CA's.\n"),
     N_("\
-       --egd-file=FILE       file name of the EGD socket.\n"),
+       --ca-directory=DIR       directory where hash list of CA's is stored.\n"),
+    N_("\
+       --random-file=FILE       file with random data for seeding the SSL PRNG.\n"),
+    N_("\
+       --egd-file=FILE          file naming the EGD socket with random data.\n"),
     "\n",
 #endif /* HAVE_SSL */
 
@@ -789,7 +794,7 @@ main (int argc, char *const *argv)
      interoption dependency checks. */
 
   if (opt.reclevel == 0)
-    opt.reclevel = INFINITE_RECURSION;  /* see wget.h for commentary on this */
+    opt.reclevel = INFINITE_RECURSION; /* see recur.h for commentary on this */
 
   if (opt.page_requisites && !opt.recursive)
     {