Project homepage Mailing List  Warmcat.com  API Docs  Github Mirror 
{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1752656532, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"3263151457c1ce44a9125eddff38a12d", "commit": {"type":"commit", "time": 1486519855, "time_ofs": 18446744073709551316, "oid_tree": { "oid": "29cb37165e4455533d5c19037b158a0a1f729d91", "alias": []}, "oid":{ "oid": "e9681f8314c64c6802b11997c471bd763de38c8c", "alias": []}, "msg": "Centralize documentation about config file location", "sig_commit": { "git_time": { "time": 1486519855, "offset": -300 }, "name": "Rich Salz", "email": "rsalz@openssl.org", "md5": "3ed6b9cf7bbe83902a044f6590346d26" }, "sig_author": { "git_time": { "time": 1486485201, "offset": -300 }, "name": "Rich Salz", "email": "rsalz@openssl.org", "md5": "3ed6b9cf7bbe83902a044f6590346d26" }}, "body": "Centralize documentation about config file location\n\nReviewed-by: Richard Levitte \u003clevitte@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/2569)" , "diff": "diff --git a/doc/man1/CA.pl.pod b/doc/man1/CA.pl.pod\nindex 727cce1..a7f3970 100644\n--- a/doc/man1/CA.pl.pod\n+++ b/doc/man1/CA.pl.pod\n@@ -191,18 +191,12 @@ be wrong. In this case the command:\n perl -S CA.pl\n \n can be used and the B\u003cOPENSSL_CONF\u003e environment variable changed to point to\n-the correct path of the configuration file \u0022openssl.cnf\u0022.\n+the correct path of the configuration file.\n \n The script is intended as a simple front end for the B\u003copenssl\u003e program for use\n by a beginner. Its behaviour isn't always what is wanted. For more control over the\n behaviour of the certificate commands call the B\u003copenssl\u003e command directly.\n \n-\u003dhead1 ENVIRONMENT VARIABLES\n-\n-The variable B\u003cOPENSSL_CONF\u003e if defined allows an alternative configuration\n-file location to be specified, it should contain the full path to the\n-configuration file, not just its directory.\n-\n \u003dhead1 SEE ALSO\n \n L\u003cx509(1)\u003e, L\u003cca(1)\u003e, L\u003creq(1)\u003e, L\u003cpkcs12(1)\u003e,\ndiff --git a/doc/man1/ca.pod b/doc/man1/ca.pod\nindex 5d4cfda..c09db82 100644\n--- a/doc/man1/ca.pod\n+++ b/doc/man1/ca.pod\n@@ -77,6 +77,8 @@ this prints extra details about the operations being performed.\n \u003ditem B\u003c-config filename\u003e\n \n specifies the configuration file to use.\n+Optional; for a description of the default value,\n+see L\u003copenssl(1)/COMMAND SUMMARY\u003e.\n \n \u003ditem B\u003c-name section\u003e\n \n@@ -633,11 +635,6 @@ The values below reflect the default values.\n ./demoCA/certs - certificate output file\n ./demoCA/.rnd - CA random seed information\n \n-\u003dhead1 ENVIRONMENT VARIABLES\n-\n-B\u003cOPENSSL_CONF\u003e reflects the location of master configuration file it can\n-be overridden by the B\u003c-config\u003e command line option.\n-\n \u003dhead1 RESTRICTIONS\n \n The text database index file is a critical part of the process and\ndiff --git a/doc/man1/openssl.pod b/doc/man1/openssl.pod\nindex a7e65ff..da07cd5 100644\n--- a/doc/man1/openssl.pod\n+++ b/doc/man1/openssl.pod\n@@ -40,6 +40,15 @@ The B\u003copenssl\u003e program provides a rich variety of commands (I\u003ccommand\u003e in the\n SYNOPSIS above), each of which often has a wealth of options and arguments\n (I\u003ccommand_opts\u003e and I\u003ccommand_args\u003e in the SYNOPSIS).\n \n+Many commands use an external configuration file for some or all of their\n+arguments and have a B\u003c-config\u003e option to specify that file.\n+The environment variable B\u003cOPENSSL_CONF\u003e can be used to specify\n+the location of the file.\n+If the environment variable is not specified, then the file is named\n+B\u003copenssl.cnf\u003e in the default certificate storage area, whose value\n+depends on the configuration flags specified when the OpenSSL\n+was built.\n+\n The list parameters B\u003cstandard-commands\u003e, B\u003cdigest-commands\u003e,\n and B\u003ccipher-commands\u003e output a list (one entry per line) of the names\n of all standard commands, message digest commands, or cipher commands,\ndiff --git a/doc/man1/req.pod b/doc/man1/req.pod\nindex 8ba04ae..83b5704 100644\n--- a/doc/man1/req.pod\n+++ b/doc/man1/req.pod\n@@ -204,9 +204,9 @@ GOST R 34.11-94 (B\u003c-md_gost94\u003e).\n \n \u003ditem B\u003c-config filename\u003e\n \n-this allows an alternative configuration file to be specified,\n-this overrides the compile time filename or any specified in\n-the B\u003cOPENSSL_CONF\u003e environment variable.\n+this allows an alternative configuration file to be specified.\n+Optional; for a description of the default value,\n+see L\u003copenssl(1)/COMMAND SUMMARY\u003e.\n \n \u003ditem B\u003c-subj arg\u003e\n \n@@ -623,12 +623,6 @@ then the B\u003cSET OF\u003e is missing and the encoding is technically invalid (but\n it is tolerated). See the description of the command line option B\u003c-asn1-kludge\u003e\n for more information.\n \n-\u003dhead1 ENVIRONMENT VARIABLES\n-\n-The variable B\u003cOPENSSL_CONF\u003e if defined allows an alternative configuration\n-file location to be specified, it will be overridden by the B\u003c-config\u003e command\n-line switch if it is present.\n-\n \u003dhead1 BUGS\n \n OpenSSL's handling of T61Strings (aka TeletexStrings) is broken: it effectively\ndiff --git a/doc/man1/ts.pod b/doc/man1/ts.pod\nindex 95fdfcf..d807394 100644\n--- a/doc/man1/ts.pod\n+++ b/doc/man1/ts.pod\n@@ -139,9 +139,9 @@ MS-Windows, B\u003c,\u003e for VMS and B\u003c:\u003e for all other platforms. (Optional)\n \n \u003ditem B\u003c-config\u003e configfile\n \n-The configuration file to use, this option overrides the\n-B\u003cOPENSSL_CONF\u003e environment variable. Only the OID section\n-of the config file is used with the B\u003c-query\u003e command. (Optional)\n+The configuration file to use.\n+Optional; for a description of the default value,\n+see L\u003copenssl(1)/COMMAND SUMMARY\u003e.\n \n \u003ditem B\u003c-data\u003e file_to_hash\n \n@@ -216,9 +216,10 @@ otherwise it is a time stamp token (ContentInfo).\n \n \u003ditem B\u003c-config\u003e configfile\n \n-The configuration file to use, this option overrides the\n-B\u003cOPENSSL_CONF\u003e environment variable. See B\u003cCONFIGURATION FILE\n-OPTIONS\u003e for configurable variables. (Optional)\n+The configuration file to use.\n+Optional; for a description of the default value,\n+see L\u003copenssl(1)/COMMAND SUMMARY\u003e.\n+See B\u003cCONFIGURATION FILE OPTIONS\u003e for configurable variables.\n \n \u003ditem B\u003c-section\u003e tsa_section\n \n@@ -386,8 +387,8 @@ verification. See L\u003cverify(1)\u003e.\n \n \u003dhead1 CONFIGURATION FILE OPTIONS\n \n-The B\u003c-query\u003e and B\u003c-reply\u003e commands make use of a configuration file\n-defined by the B\u003cOPENSSL_CONF\u003e environment variable. See L\u003cconfig(5)\u003e\n+The B\u003c-query\u003e and B\u003c-reply\u003e commands make use of a configuration file.\n+See L\u003cconfig(5)\u003e\n for a general description of the syntax of the config file. The\n B\u003c-query\u003e command uses only the symbolic OID names section\n and it can work without it. However, the B\u003c-reply\u003e command needs the\n@@ -505,11 +506,6 @@ included. Default is no. (Optional)\n \n \u003dback\n \n-\u003dhead1 ENVIRONMENT VARIABLES\n-\n-B\u003cOPENSSL_CONF\u003e contains the path of the configuration file and can be\n-overridden by the B\u003c-config\u003e command line option.\n-\n \u003dhead1 EXAMPLES\n \n All the examples below presume that B\u003cOPENSSL_CONF\u003e is set to a proper\n","s":{"c":1752656532,"u": 29289}} ],"g": 31236,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}