From ff75266decbdadeb55cb5db6e6f63afc1150cbc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20B=C3=BCchau?= Date: Sun, 11 Jun 2017 11:08:26 +0200 Subject: [PATCH] don't force --cipher-algo AES256 on GPG en/-decryption --- configure | 18 +++++++++--------- configure.ac | 2 +- debian/changelog | 6 ++++++ .../system-uca/gpg.xml.m4 | 4 ++-- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 3d970c9..ef5303b 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for thunar-custom-actions 0.0.12. +# Generated by GNU Autoconf 2.69 for thunar-custom-actions 0.0.13. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='thunar-custom-actions' PACKAGE_TARNAME='thunar-custom-actions' -PACKAGE_VERSION='0.0.12' -PACKAGE_STRING='thunar-custom-actions 0.0.12' +PACKAGE_VERSION='0.0.13' +PACKAGE_STRING='thunar-custom-actions 0.0.13' PACKAGE_BUGREPORT='nobodyinperson@gmx.de' PACKAGE_URL='' @@ -1224,7 +1224,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures thunar-custom-actions 0.0.12 to adapt to many kinds of systems. +\`configure' configures thunar-custom-actions 0.0.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1287,7 +1287,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of thunar-custom-actions 0.0.12:";; + short | recursive ) echo "Configuration of thunar-custom-actions 0.0.13:";; esac cat <<\_ACEOF @@ -1385,7 +1385,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -thunar-custom-actions configure 0.0.12 +thunar-custom-actions configure 0.0.13 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1402,7 +1402,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by thunar-custom-actions $as_me 0.0.12, which was +It was created by thunar-custom-actions $as_me 0.0.13, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3229,7 +3229,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by thunar-custom-actions $as_me 0.0.12, which was +This file was extended by thunar-custom-actions $as_me 0.0.13, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3282,7 +3282,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -thunar-custom-actions config.status 0.0.12 +thunar-custom-actions config.status 0.0.13 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 30a4f02..82aacec 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([thunar-custom-actions], [0.0.12], [nobodyinperson@gmx.de]) +AC_INIT([thunar-custom-actions], [0.0.13], [nobodyinperson@gmx.de]) m4_include([m4/ax_python_module.m4]) diff --git a/debian/changelog b/debian/changelog index 6e588f4..f0f8c96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +thunar-custom-actions (0.0.13) UNRELEASED; urgency=medium + + * don't force AES256 on gpg symmectric decryption + + -- Yann Büchau Sun, 11 Jun 2017 11:04:24 +0200 + thunar-custom-actions (0.0.12) unstable; urgency=medium * add make_bin to shebang in uca-apply diff --git a/share/thunar-custom-actions/system-uca/gpg.xml.m4 b/share/thunar-custom-actions/system-uca/gpg.xml.m4 index 16b5b86..ec4eb6b 100644 --- a/share/thunar-custom-actions/system-uca/gpg.xml.m4 +++ b/share/thunar-custom-actions/system-uca/gpg.xml.m4 @@ -8,7 +8,7 @@ include(tuca.m4)dnl gcr-gnupg symmetrisch mit GPG verschlüsseln Encrypt symmetrically with GPG - TUCA_INIT();PASSWORD=$(TUCA_ZENITY() --password --text="$(eval_gettext 'Password?')") || exit;TUCA_LOOP(TUCA_LOOP_PB_TEXT($(eval_gettext 'encrypting... $TUCA_FILE_BASE_VAR()'));TUCA_OUT_VAR()=TUCA_FILE().asc;echo $PASSWORD | TUCA_GPG2() --batch --yes --passphrase-fd 0 --symmetric --armor --cipher-algo AES256 -o TUCA_TEMP() TUCA_FILE()) + TUCA_INIT();PASSWORD=$(TUCA_ZENITY() --password --text="$(eval_gettext 'Password?')") || exit;TUCA_LOOP(TUCA_LOOP_PB_TEXT($(eval_gettext 'encrypting... $TUCA_FILE_BASE_VAR()'));TUCA_OUT_VAR()=TUCA_FILE().asc;echo $PASSWORD | TUCA_GPG2() --batch --yes --passphrase-fd 0 --symmetric --armor -o TUCA_TEMP() TUCA_FILE()) Die ausgewählten Dateien werden symmetrisch mit einem Password mit GPG verschlüsselt. Each selected file is encrypted symmetrically with one given password with GPG. * @@ -22,7 +22,7 @@ include(tuca.m4)dnl gcr-gnupg symmetrisch mit GPG entschlüsseln Decrypt symmetrically with GPG - TUCA_INIT();PASSWORD=$(TUCA_ZENITY() --password --text="$(eval_gettext 'Password?')");TUCA_LOOP(TUCA_LOOP_PB_TEXT($(eval_gettext 'decrypting... $TUCA_FILE_BASE_VAR()'));base="$(basename TUCA_FILE() .asc)";TUCA_OUT_VAR()=$(dirname TUCA_FILE())/$base;echo $PASSWORD | TUCA_GPG2() --batch --yes --passphrase-fd 0 --decrypt --cipher-algo AES256 -o TUCA_TEMP() TUCA_FILE() || FAIL=yes;if test -n "$FAIL";then TUCA_ZENITY() --warning --text="$(eval_gettext 'Wrong Password for $TUCA_FILE_BASE_VAR()?')";exit;fi) + TUCA_INIT();PASSWORD=$(TUCA_ZENITY() --password --text="$(eval_gettext 'Password?')");TUCA_LOOP(TUCA_LOOP_PB_TEXT($(eval_gettext 'decrypting... $TUCA_FILE_BASE_VAR()'));base="$(basename TUCA_FILE() .asc)";TUCA_OUT_VAR()=$(dirname TUCA_FILE())/$base;echo $PASSWORD | TUCA_GPG2() --batch --yes --passphrase-fd 0 --decrypt -o TUCA_TEMP() TUCA_FILE() || FAIL=yes;if test -n "$FAIL";then TUCA_ZENITY() --warning --text="$(eval_gettext 'Wrong Password for $TUCA_FILE_BASE_VAR()?')";exit;fi) Die ausgewählten Dateien werden symmetrisch mit einem Password mit GPG entschlüsselt. Each selected file is decrypted symmetrically with one given password with GPG. *.asc