Warmcat homepage andy@warmcat.com
libwebsockets
{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1753078684, "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":"8815e32b4dc89706d6cbe173e89962cd", "commit": {"type":"commit", "time": 1523540098, "time_ofs": 120, "oid_tree": { "oid": "032085e3214d21bd0b648816c806a0eb91414c9d", "alias": []}, "oid":{ "oid": "362ff3c39703633ac53ba9130c7acc02177bedc5", "alias": []}, "msg": "openssl rehash: use libcrypto variables for default dir", "sig_commit": { "git_time": { "time": 1523540098, "offset": 120 }, "name": "Richard Levitte", "email": "levitte@openssl.org", "md5": "b737120f0642a6a5c30c6291e6170c77" }, "sig_author": { "git_time": { "time": 1523532657, "offset": 120 }, "name": "Richard Levitte", "email": "levitte@openssl.org", "md5": "b737120f0642a6a5c30c6291e6170c77" }}, "body": "openssl rehash: use libcrypto variables for default dir\n\nX509_get_default_cert_dir_env() returns the default environment\nvariable to check for certificate directories.\nX509_get_default_cert_dir() returns the default configured certificate\ndirectory.\n\nUse these instead of hard coding our own values, and thereby be more\nintegrated with the rest of OpenSSL.\n\nReviewed-by: Andy Polyakov \u003cappro@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/5937)\n" , "diff": "diff --git a/apps/rehash.c b/apps/rehash.c\nindex 6f2b5da..2b6167f 100644\n--- a/apps/rehash.c\n+++ b/apps/rehash.c\n@@ -479,13 +479,14 @@ int rehash_main(int argc, char **argv)\n if (*argv !\u003d NULL) {\n while (*argv !\u003d NULL)\n errs +\u003d do_dir(*argv++, h);\n- } else if ((env \u003d getenv(\u0022SSL_CERT_DIR\u0022)) !\u003d NULL) {\n+ } else if ((env \u003d getenv(X509_get_default_cert_dir_env())) !\u003d NULL) {\n+ char lsc[2] \u003d { LIST_SEPARATOR_CHAR, '\u005c0' };\n m \u003d OPENSSL_strdup(env);\n- for (e \u003d strtok(m, \u0022:\u0022); e !\u003d NULL; e \u003d strtok(NULL, \u0022:\u0022))\n+ for (e \u003d strtok(m, lsc); e !\u003d NULL; e \u003d strtok(NULL, lsc))\n errs +\u003d do_dir(e, h);\n OPENSSL_free(m);\n } else {\n- errs +\u003d do_dir(\u0022/etc/ssl/certs\u0022, h);\n+ errs +\u003d do_dir(X509_get_default_cert_dir(), h);\n }\n \n end:\n","s":{"c":1753078684,"u": 36078}} ],"g": 37633,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}