diff options
author | mrjive <mrjive@mrjive.it> | 2015-10-02 09:45:03 +0200 |
---|---|---|
committer | mrjive <mrjive@mrjive.it> | 2015-10-02 09:45:03 +0200 |
commit | 32522b61f235266384c81c0669fceaf58afeb4fe (patch) | |
tree | 48427e8f48421b3bb8f344d85f2ebfe1271ea34e /library | |
parent | 11c1573b55f278a664a90a2872d06a40b3ac3026 (diff) | |
parent | 1da3828a09485a9b2bc6113cbab9ca9ca483ffc0 (diff) | |
download | volse-hubzilla-32522b61f235266384c81c0669fceaf58afeb4fe.tar.gz volse-hubzilla-32522b61f235266384c81c0669fceaf58afeb4fe.tar.bz2 volse-hubzilla-32522b61f235266384c81c0669fceaf58afeb4fe.zip |
Merge pull request #6 from redmatrix/master
updating from original codebase
Diffstat (limited to 'library')
-rw-r--r-- | library/cacert.pem | 2 | ||||
-rw-r--r-- | library/certs/README.md | 13 | ||||
-rw-r--r-- | library/certs/cacert.pem | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/library/cacert.pem b/library/cacert.pem index f71ec3f84..739128024 100644 --- a/library/cacert.pem +++ b/library/cacert.pem @@ -1,7 +1,7 @@ ## ## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Wed Apr 22 03:12:04 2015 +## Certificate data from Mozilla as of: Wed Sep 2 18:30:34 2015 ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates diff --git a/library/certs/README.md b/library/certs/README.md index 36a0cf30c..ee68fc06e 100644 --- a/library/certs/README.md +++ b/library/certs/README.md @@ -1 +1,12 @@ -This directory contains *browser valid* certs for use with hubzilla when using curl (server to server communication). The cacert.pem file in this directory is downloaded (when necessary) from the curl repository and tracks the Mozilla built-in certs. Additionally we've discovered we occasionally require intermediate certs from some cert providers which Mozilla and other browsers obtain automatically but curl does not. You may add these here if required. All these files are concatenated to create the library/cacert.pem file which we will use.
\ No newline at end of file +This directory contains *browser valid* certs for use with hubzilla when using curl (server to server communication). The cacert.pem file in this directory is downloaded (when necessary) from the curl repository and tracks the Mozilla built-in certs. Additionally we've discovered we occasionally require intermediate certs from some cert providers which Mozilla and other browsers obtain automatically but curl does not. You may add these here if required. All these files are concatenated to create the library/cacert.pem file which we will use. + +Obtain the converted mozilla certs here: +http://curl.haxx.se/docs/caextract.html + +Store as cacert.pem in this directory and then + +cat *.pem > ../cacert.pem + +to generate the master file in /library/cacert.pem + + diff --git a/library/certs/cacert.pem b/library/certs/cacert.pem index 440e52d0a..1ff34f9b5 100644 --- a/library/certs/cacert.pem +++ b/library/certs/cacert.pem @@ -1,7 +1,7 @@ ## ## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Wed Apr 22 03:12:04 2015 +## Certificate data from Mozilla as of: Wed Sep 2 18:30:34 2015 ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates |