Fixed merge conflict
This commit is contained in:
+2
-2
@@ -452,7 +452,7 @@ user_pref("security.tls.enable_0rtt_data", false);
|
|||||||
* [NOTE] This pref only controls OCSP fetching and does not affect OCSP stapling
|
* [NOTE] This pref only controls OCSP fetching and does not affect OCSP stapling
|
||||||
* [SETTING] Privacy & Security>Security>Certificates>Query OCSP responder servers...
|
* [SETTING] Privacy & Security>Security>Certificates>Query OCSP responder servers...
|
||||||
* [1] https://en.wikipedia.org/wiki/Ocsp ***/
|
* [1] https://en.wikipedia.org/wiki/Ocsp ***/
|
||||||
user_pref("security.OCSP.enabled", 1); // [DEFAULT: 1]
|
user_pref("security.OCSP.enabled", 0); // [DEFAULT: 1]
|
||||||
/* 1212: set OCSP fetch failures (non-stapled, see 1211) to hard-fail
|
/* 1212: set OCSP fetch failures (non-stapled, see 1211) to hard-fail
|
||||||
* [SETUP-WEB] SEC_ERROR_OCSP_SERVER_ERROR
|
* [SETUP-WEB] SEC_ERROR_OCSP_SERVER_ERROR
|
||||||
* When a CA cannot be reached to validate a cert, Firefox just continues the connection (=soft-fail)
|
* When a CA cannot be reached to validate a cert, Firefox just continues the connection (=soft-fail)
|
||||||
@@ -461,7 +461,7 @@ user_pref("security.OCSP.enabled", 1); // [DEFAULT: 1]
|
|||||||
* could have been revoked) and/or you could be under attack (e.g. malicious blocking of OCSP servers)
|
* could have been revoked) and/or you could be under attack (e.g. malicious blocking of OCSP servers)
|
||||||
* [1] https://blog.mozilla.org/security/2013/07/29/ocsp-stapling-in-firefox/
|
* [1] https://blog.mozilla.org/security/2013/07/29/ocsp-stapling-in-firefox/
|
||||||
* [2] https://www.imperialviolet.org/2014/04/19/revchecking.html ***/
|
* [2] https://www.imperialviolet.org/2014/04/19/revchecking.html ***/
|
||||||
user_pref("security.OCSP.require", true);
|
user_pref("security.OCSP.require", false);
|
||||||
|
|
||||||
/** CERTS / HPKP (HTTP Public Key Pinning) ***/
|
/** CERTS / HPKP (HTTP Public Key Pinning) ***/
|
||||||
/* 1221: disable Windows 8.1's Microsoft Family Safety cert [FF50+] [WINDOWS]
|
/* 1221: disable Windows 8.1's Microsoft Family Safety cert [FF50+] [WINDOWS]
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ set bg=dark " set dark background
|
|||||||
set wildmode=longest,list,full
|
set wildmode=longest,list,full
|
||||||
set mouse=a " enable mouse
|
set mouse=a " enable mouse
|
||||||
set splitright " always split right
|
set splitright " always split right
|
||||||
|
set viminfo+=n$HOME/.vim/viminfo " save viminfo in .vim dir to keep ~/ clean
|
||||||
|
|
||||||
" Set the runtime path to include Vundle and initialize
|
" Set the runtime path to include Vundle and initialize
|
||||||
set rtp+=~/.vim/bundle/Vundle.vim
|
set rtp+=~/.vim/bundle/Vundle.vim
|
||||||
|
|||||||
Reference in New Issue
Block a user