Page MenuHomeFreeBSD
Files F153006732

D26167.id76525.diff
No OneTemporary
Actions

D26167.id76525.diff
View Options

Index: usr.sbin/certctl/certctl.sh
===================================================================
--- usr.sbin/certctl/certctl.sh
+++ usr.sbin/certctl/certctl.sh
@@ -30,7 +30,7 @@
############################################################ CONFIGURATION
: ${DESTDIR:=}
-: ${FILEPAT:="\.pem$|\.crt$|\.cer$|\.crl$|\.0$"}
+: ${FILEPAT:="\.pem$|\.crt$|\.cer$|\.crl$|\.[0-9]$"}
: ${VERBOSE:=0}
############################################################ GLOBALS
@@ -56,31 +56,58 @@
fi
}
+get_decimal()
+{
+ local checkdir hash decimal
+
+ checkdir=$1
+ hash=$2
+ decimal=0
+
+ while [ -e "$checkdir/$hash.$decimal" ]; do
+ decimal=$((decimal + 1))
+ done
+
+ echo ${decimal}
+ return 0
+}
+
create_trusted_link()
{
local hash
+ local suffix
hash=$( do_hash "$1" ) || return
if [ -e "$BLACKLISTDESTDIR/$hash.0" ]; then
- echo "Skipping blacklisted certificate $1 ($BLACKLISTDESTDIR/$hash.0)"
- return 1
+ for blistfile in $BLACKLISTDESTDIR/$hash.*; do
+ if diff -q "$blistfile" "$1"; then
+ echo "Skipping blacklisted certificate $1 ($blistfile)"
+ return 1
+ fi
+ done
fi
- [ $VERBOSE -gt 0 ] && echo "Adding $hash.0 to trust store"
- [ $NOOP -eq 0 ] && install ${INSTALLFLAGS} -lrs $(realpath "$1") "$CERTDESTDIR/$hash.0"
+ suffix=$(get_decimal "$CERTDESTDIR" "$hash")
+ [ $VERBOSE -gt 0 ] && echo "Adding $hash.$suffix to trust store"
+ [ $NOOP -eq 0 ] && \
+ install ${INSTALLFLAGS} -lrs $(realpath "$1") "$CERTDESTDIR/$hash.$suffix"
}
create_blacklisted()
{
local hash srcfile filename
+ local suffix
# If it exists as a file, we'll try that; otherwise, we'll scan
if [ -e "$1" ]; then
hash=$( do_hash "$1" ) || return
srcfile=$(realpath "$1")
- filename="$hash.0"
+ suffix=$(get_decimal "$BLACKLISTDESTDIR" "$hash")
+ filename="$hash.$suffix"
elif [ -e "${CERTDESTDIR}/$1" ]; then
srcfile=$(realpath "${CERTDESTDIR}/$1")
- filename="$1"
+ hash=$(echo "$1" | sed -Ee 's/\.([0-9])+$//')
+ suffix=$(get_decimal "$BLACKLISTDESTDIR" "$hash")
+ filename="$hash.$suffix"
else
return
fi
@@ -115,7 +142,7 @@
if [ -e "$1" ]; then
cd "$1"
- for CFILE in *.0; do
+ for CFILE in *.[0-9]; do
if [ ! -s "$CFILE" ]; then
echo "Unable to read $CFILE" >&2
ERRORS=$(( $ERRORS + 1 ))
@@ -180,8 +207,12 @@
for BFILE in "$@"; do
if [ -s "$BFILE" ]; then
hash=$( do_hash "$BFILE" )
- echo "Removing $hash.0 from blacklist"
- [ $NOOP -eq 0 ] && rm -f "$BLACKLISTDESTDIR/$hash.0"
+ for BLISTEDFILE in $BLACKLISTDESTDIR/$hash.*; do
+ if diff -q "$BLISTEDFILE" "$BFILE"; then
+ echo "Removing $(basename "$BLISTEDFILE") from blacklist"
+ [ $NOOP -eq 0 ] && rm -f $BLISTEDFILE
+ fi
+ done
elif [ -e "$BLACKLISTDESTDIR/$BFILE" ]; then
echo "Removing $BFILE from blacklist"
[ $NOOP -eq 0 ] && rm -f "$BLACKLISTDESTDIR/$BFILE"

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 19, 2:31 PM (11 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31776909
Default Alt Text
D26167.id76525.diff (2 KB)

Event Timeline