emo/make-ca
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make-ca: Use 'Subject:' line for certificate name, and use last OU= value for fallback.

Browse Source
This commit is contained in:
DJ Lucas 2021-08-04 20:38:53 -05:00
parent fd033af881
commit bb6015a224
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
make-ca
View File

@ -413,18 +413,17 @@ function get_p11_label() {
# $1 == individual nss certificate extracted from certdata.txt # $1 == individual nss certificate extracted from certdata.txt
# or x509 certificate with OpenSSL text values # or x509 certificate with OpenSSL text values
p11label="$(grep -m1 "Issuer" ${1} | grep -o CN=.*$ | \ subjectline=$(grep -m1 "Subject:" ${1} | sed 's@\s*=\s*@=@g')
cut -d ',' -f 1 | sed 's@CN=@@')"
# Fallback to the OU value if CN does not exeist in Issuer string p11label="$(echo ${subjectline} | grep -o "CN=.*$" | cut -d ',' -f 1 | sed 's@CN=@@')"
# Fallback to the last OU value if CN does not exeist in Subject string
if [ "${p11label}" == "" ]; then if [ "${p11label}" == "" ]; then
p11label="$(grep -m1 "Issuer" ${1} | grep -o "OU=.*$" | \ p11label="$(echo ${subjectline} | grep -o "OU=.*$" | sed 's@OU=.*, OU=@OU=@g'| cut -d ',' -f 1 | sed 's@OU=@@')"
cut -d ',' -f 1 | sed 's@OU=@@')"
# If still empty, fall back to Object value as a last resort # If still empty, fall back to Object value as a last resort
if [ "${p11label}" == "" ]; then if [ "${p11label}" == "" ]; then
p11label="$(grep -m1 "Issuer" ${1} | grep -o "O=.*$" | \ p11label="$(echo ${subjectline} | grep -o "O=.*$" | cut -d ',' -f 1 | sed 's@O=@@')"
cut -d ',' -f 1 | sed 's@O=@@')"
fi fi
fi fi
} }