nik/easyrsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v3.0.4'

Browse Source 
Merging up to master.

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
This commit is contained in:
Eric F Crist 2018-01-21 10:13:34 -06:00
commit 4c58b5eb89
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,12 +1,13 @@
Easy-RSA 3 ChangeLog Easy-RSA 3 ChangeLog
3.0.x (TBD) 3.0.4 (TBD)
* Remove use of egrep (#154) * Remove use of egrep (#154)
* Integrate with Travis-CI (#165) * Integrate with Travis-CI (#165)
* Remove "local" from variable assignment (#165) * Remove "local" from variable assignment (#165)
* Other changes related to Travis-CI fixes * Other changes related to Travis-CI fixes
* Assign values (even empty ones) to variables defined previously with * Assign values to variables defined previously w/local
"local" * Finally(?) fix the subjectAltName issues I presented earlier (really
fixes #168
3.0.3 (2017-08-22) 3.0.3 (2017-08-22)
* Include mktemp windows binary * Include mktemp windows binary

3
README.md
View File

@ -38,7 +38,8 @@ the most recent release.
The prior 2.x and 1.x versions are available as release branches for The prior 2.x and 1.x versions are available as release branches for
tracking and possible back-porting of relevant fixes. Branch layout is: tracking and possible back-porting of relevant fixes. Branch layout is:
master <- 3.x, at present master <- 3.x, at present
v3.x.x pre-release branches, used for staging branches
release/2.x release/2.x
release/1.x release/1.x

4
easyrsa3/easyrsa
View File

@ -658,7 +658,9 @@ $(display_dn req "$req_in")
# If type is server and no subjectAltName was requested, # If type is server and no subjectAltName was requested,
# add one to the extensions file # add one to the extensions file
if [ "$crt_type" = 'server' ]; then if [ "$crt_type" = 'server' ];
then
sname=$(basename $req_in | cut -d. -f1)
echo "$EASYRSA_EXTRA_EXTS" | echo "$EASYRSA_EXTRA_EXTS" |
grep -q subjectAltName || grep -q subjectAltName ||
default_server_san "$req_in" default_server_san "$req_in"