Merge pull request #475 from Neilpang/dev

Dev
This commit is contained in:
neil 2016-12-18 21:43:45 +08:00 committed by GitHub
commit 059147b74a

View File

@ -637,8 +637,9 @@ _createcsr() {
_info "Multi domain" "$alt" _info "Multi domain" "$alt"
printf -- "\nsubjectAltName=$alt" >>"$csrconf" printf -- "\nsubjectAltName=$alt" >>"$csrconf"
fi fi
if [ "$Le_OCSP_Stable" ]; then if [ "$Le_OCSP_Staple" ] || [ "$Le_OCSP_Stable" ]; then
_savedomainconf Le_OCSP_Stable "$Le_OCSP_Stable" _savedomainconf Le_OCSP_Staple "$Le_OCSP_Staple"
_cleardomainconf Le_OCSP_Stable
printf -- "\nbasicConstraints = CA:FALSE\n1.3.6.1.5.5.7.1.24=DER:30:03:02:01:05" >>"$csrconf" printf -- "\nbasicConstraints = CA:FALSE\n1.3.6.1.5.5.7.1.24=DER:30:03:02:01:05" >>"$csrconf"
fi fi
@ -4365,7 +4366,7 @@ _process() {
shift shift
;; ;;
--ocsp-must-staple | --ocsp) --ocsp-must-staple | --ocsp)
Le_OCSP_Stable="1" Le_OCSP_Staple="1"
;; ;;
--log | --logfile) --log | --logfile)
_log="1" _log="1"