Skip to content
Snippets Groups Projects

Symmetric encryption in dup handler is broken (#11274)

Merged Symmetric encryption in dup handler is broken (#11274)
(removed):master into master
Merged Matthijs Wensveen requested to merge (removed):master into master
Compare
and
1 file
+ 3
− 1
Compare changes
  • Side-by-side
  • Inline
handlers/dup.in
+ 3
− 1
@@ -50,7 +50,9 @@ destdir=${destdir%/}
@@ -50,7 +50,9 @@ destdir=${destdir%/}
[ -n "$desturl" -o -n "$destdir" ] || fatal "The destination directory (destdir) must be set when desturl is not used."
[ -n "$desturl" -o -n "$destdir" ] || fatal "The destination directory (destdir) must be set when desturl is not used."
[ -n "$include" -o -n "$vsinclude" ] || fatal "No source includes specified"
[ -n "$include" -o -n "$vsinclude" ] || fatal "No source includes specified"
[ -n "$password" ] || fatal "The password option must be set."
[ -n "$password" ] || fatal "The password option must be set."
[ -n "$signpassword" -a -n "$signkey" -a -n "$encryptkey" -a "$signkey" != "$encryptkey" ] || fatal "The signpassword option must be set because signkey is different from encryptkey."
if [ -n "$signkey" -a -n "$encryptkey" -a "$signkey" != "$encryptkey" ]; then
 
[ -n "$signpassword" ] || fatal "The signpassword option must be set because signkey is different from encryptkey."
 
fi
if [ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" == "s3+http" ]; then
if [ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" == "s3+http" ]; then
[ -n "$awsaccesskeyid" -a -n "$awssecretaccesskey" ] || fatal "AWS access keys must be set for S3 backups."
[ -n "$awsaccesskeyid" -a -n "$awssecretaccesskey" ] || fatal "AWS access keys must be set for S3 backups."
fi
fi