Skip to content

Commit

Permalink
Rename EASYTLS_TLSCV2_SCN to EASYTLS_TLSCV2_SUBKNAME
Browse files Browse the repository at this point in the history
Signed-off-by: Richard Bonhomme <[email protected]>
  • Loading branch information
TinCanTech committed Jan 1, 2021
1 parent 66f9435 commit cd19278
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions easytls
Original file line number Diff line number Diff line change
Expand Up @@ -1019,7 +1019,7 @@ inline_index_update ()

# Create new record
new_record="$name $inline_serial $inline_hash"
[ $EASYTLS_TLSCV2_SCN ] && new_record="$new_record $EASYTLS_TLSCV2_SCN"
[ $EASYTLS_TLSCV2_SUBKNAME ] && new_record="$new_record $EASYTLS_TLSCV2_SUBKNAME"
printf "%s\n" "$new_record" >> \
"$EASYTLS_INLINE_INDEX" || \
die "Failed to update $EASYTLS_INLINE_INDEX"
Expand All @@ -1030,8 +1030,8 @@ inline_index_update ()

# Identify old record
old_record='${name}[[:blank:]]${inline_serial}[[:blank:]]${inline_hash}'
[ $EASYTLS_TLSCV2_SCN ] && \
old_record='${name}[[:blank:]]${inline_serial}[[:blank:]]${inline_hash}[[:blank:]]$EASYTLS_TLSCV2_SCN'
[ $EASYTLS_TLSCV2_SUBKNAME ] && \
old_record='${name}[[:blank:]]${inline_serial}[[:blank:]]${inline_hash}[[:blank:]]$EASYTLS_TLSCV2_SUBKNAME'
eval old_record=${old_record}

# Verify old record
Expand Down Expand Up @@ -1300,12 +1300,14 @@ inline_remove ()

name="$1"
inline_file="$EASYTLS_PKI/$name.inline"
[ $EASYTLS_TLSCV2_SUBKNAME ] && \
inline_file="$EASYTLS_PKI/$name-$EASYTLS_TLSCV2_SUBKNAME.inline"

verify_tls_init

[ -f "$inline_file" ] || die "Missing: $inline_file"

# Get serial number from inline file
# Get cert serial number from inline file
inline_serial=""
inline_crt_serial

Expand Down

1 comment on commit cd19278

@TinCanTech
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.