make-ca: Revert change to use p11label for naming anchors.

CHANGELOG

@@ -11,7 +11,7 @@
          - Use --filter=certificates for all stores
          - Fix output of NSSDB and Java PCKS#12 stores
          - Correct incorrectly named get_p11_val()
-         - Use p11label value and .p11-kit extension for anchor naming
+         - Use .p11-kit extension for anchors
          - Handle getopt style short options in get_args()
 1.7      - Revert help2man update (requires complete perl environment)
 1.6      - Fix install target for make -j#

make-ca

@@ -742,8 +742,7 @@ for tempfile in ${TEMPDIR}/certs/*.tmp; do
   echo "Keyhash:      ${keyhash}"
 
   # Place certificate into trust anchors dir
-  anchorlabel=$(echo ${p11label} | sed -e 's@ @_@g' -e 's@(@@g' -e 's@)@@g')
-  anchorfile="${TEMPDIR}/pki/anchors/${anchorlabel}.p11-kit"
+  anchorfile="${TEMPDIR}/pki/anchors/${keyhash}.p11-kit"
   moz_trust="true"
   write_anchor
 
@@ -760,7 +759,7 @@ for tempfile in ${TEMPDIR}/certs/*.tmp; do
   # Clean up the directory and environment as we go
   rm -f tempfile.crt
   unset keyhash subject count
-  unset mozsadistrust mozsmdistrust anchorlabel anchorfile moz_trust
+  unset mozsadistrust mozsmdistrust anchorfile moz_trust
   unset trustlist rejectlist satrust smtrust cstrust catrust
   unset p11trust p11oid p11value trustp11 p11label
 
@@ -849,8 +848,7 @@ if test -d "${LOCALDIR}"; then
     get_p11_trust
 
     # Place certificate into trust anchors dir
-    anchorlabel=$(echo ${p11label} | sed -e 's@ @_@g' -e 's@(@@g' -e 's@)@@')
-    anchorfile="${DESTDIR}${ANCHORDIR}/${anchorlabel}.p11-kit"
+    anchorfile="${DESTDIR}${ANCHORDIR}/${keyhash}.p11-kit"
     moz_trust="false"
     mozsadistrust="UNKNOWN"
     mozsmdistrust="UNKNOWN"
@@ -870,7 +868,7 @@ if test -d "${LOCALDIR}"; then
     fi
 
     unset keyhash subject count
-    unset mozsadistrust mozsmdistrust anchorlabel anchorfile moz_trust
+    unset mozsadistrust mozsmdistrust anchorfile moz_trust
     unset trustlist rejectlist satrust smtrust cstrust catrust
     unset p11trust p11oid p11value trustp11 p11label
     echo -e "\n"