Hello community, here is the log from the commit of package s3backer for openSUSE:Factory checked in at 2013-07-19 11:14:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/s3backer (Old) and /work/SRC/openSUSE:Factory/.s3backer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "s3backer" Changes: -------- --- /work/SRC/openSUSE:Factory/s3backer/s3backer.changes 2013-07-17 09:32:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.s3backer.new/s3backer.changes 2013-07-19 11:14:17.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 18 17:24:30 UTC 2013 - [email protected] + +- Update to version 1.3.7 + + Add `--keyLength' for overriding generated encryption key length + +------------------------------------------------------------------- Old: ---- s3backer-1.3.6.tar.gz New: ---- s3backer-1.3.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ s3backer.spec ++++++ --- /var/tmp/diff_new_pack.P3QfaR/_old 2013-07-19 11:14:18.000000000 +0200 +++ /var/tmp/diff_new_pack.P3QfaR/_new 2013-07-19 11:14:18.000000000 +0200 @@ -18,7 +18,7 @@ Name: s3backer -Version: 1.3.6 +Version: 1.3.7 Release: 0 Summary: FUSE-based single file backing store via Amazon S3 License: GPL-2.0+ ++++++ s3backer-1.3.6.tar.gz -> s3backer-1.3.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.3.6/CHANGES new/s3backer-1.3.7/CHANGES --- old/s3backer-1.3.6/CHANGES 2013-07-16 18:34:12.000000000 +0200 +++ new/s3backer-1.3.7/CHANGES 2013-07-18 19:17:52.000000000 +0200 @@ -1,4 +1,8 @@ +Version 1.3.7 (r496) released 18 July 2013 + + - Add `--keyLength' for overriding generated encryption key length + Version 1.3.6 (r493) released 16 July 2013 - Fix use of MAX_HOST_NAME in http_io.c (issue #42) @@ -144,4 +148,4 @@ Version 1.0.0 released 19 June 2008 -$Id: CHANGES 493 2013-07-16 16:34:11Z archie.cobbs $ +$Id: CHANGES 496 2013-07-18 17:17:51Z archie.cobbs $ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.3.6/configure new/s3backer-1.3.7/configure --- old/s3backer-1.3.6/configure 2013-07-16 18:34:31.000000000 +0200 +++ new/s3backer-1.3.7/configure 2013-07-18 19:19:52.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Id: configure.ac 487 2013-05-29 17:47:17Z archie.cobbs . +# From configure.ac Id: configure.ac 494 2013-07-16 16:44:19Z archie.cobbs . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for s3backer FUSE filesystem backed by Amazon S3 1.3.6. +# Generated by GNU Autoconf 2.69 for s3backer FUSE filesystem backed by Amazon S3 1.3.7. # # Report bugs to <http://s3backer.googlecode.com/>. # @@ -581,8 +581,8 @@ # Identity of this package. PACKAGE_NAME='s3backer FUSE filesystem backed by Amazon S3' PACKAGE_TARNAME='s3backer' -PACKAGE_VERSION='1.3.6' -PACKAGE_STRING='s3backer FUSE filesystem backed by Amazon S3 1.3.6' +PACKAGE_VERSION='1.3.7' +PACKAGE_STRING='s3backer FUSE filesystem backed by Amazon S3 1.3.7' PACKAGE_BUGREPORT='http://s3backer.googlecode.com/' PACKAGE_URL='' @@ -1275,7 +1275,7 @@ # 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 s3backer FUSE filesystem backed by Amazon S3 1.3.6 to adapt to many kinds of systems. +\`configure' configures s3backer FUSE filesystem backed by Amazon S3 1.3.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1341,7 +1341,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of s3backer FUSE filesystem backed by Amazon S3 1.3.6:";; + short | recursive ) echo "Configuration of s3backer FUSE filesystem backed by Amazon S3 1.3.7:";; esac cat <<\_ACEOF @@ -1440,7 +1440,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -s3backer FUSE filesystem backed by Amazon S3 configure 1.3.6 +s3backer FUSE filesystem backed by Amazon S3 configure 1.3.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1788,7 +1788,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by s3backer FUSE filesystem backed by Amazon S3 $as_me 1.3.6, which was +It was created by s3backer FUSE filesystem backed by Amazon S3 $as_me 1.3.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2612,7 +2612,7 @@ # Define the identity of the package. PACKAGE='s3backer' - VERSION='1.3.6' + VERSION='1.3.7' cat >>confdefs.h <<_ACEOF @@ -5335,7 +5335,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by s3backer FUSE filesystem backed by Amazon S3 $as_me 1.3.6, which was +This file was extended by s3backer FUSE filesystem backed by Amazon S3 $as_me 1.3.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5401,7 +5401,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -s3backer FUSE filesystem backed by Amazon S3 config.status 1.3.6 +s3backer FUSE filesystem backed by Amazon S3 config.status 1.3.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.3.6/configure.ac new/s3backer-1.3.7/configure.ac --- old/s3backer-1.3.6/configure.ac 2013-05-29 19:47:18.000000000 +0200 +++ new/s3backer-1.3.7/configure.ac 2013-07-16 18:44:20.000000000 +0200 @@ -18,15 +18,15 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. # -# $Id: configure.ac 487 2013-05-29 17:47:17Z archie.cobbs $ +# $Id: configure.ac 494 2013-07-16 16:44:19Z archie.cobbs $ # -AC_INIT([s3backer FUSE filesystem backed by Amazon S3], [1.3.6], [http://s3backer.googlecode.com/], [s3backer]) +AC_INIT([s3backer FUSE filesystem backed by Amazon S3], [1.3.7], [http://s3backer.googlecode.com/], [s3backer]) AC_CONFIG_AUX_DIR(scripts) AM_INIT_AUTOMAKE dnl AM_MAINTAINER_MODE AC_PREREQ(2.59) -AC_REVISION($Id: configure.ac 487 2013-05-29 17:47:17Z archie.cobbs $) +AC_REVISION($Id: configure.ac 494 2013-07-16 16:44:19Z archie.cobbs $) AC_PREFIX_DEFAULT(/usr) AC_PROG_MAKE_SET diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.3.6/http_io.c new/s3backer-1.3.7/http_io.c --- old/s3backer-1.3.6/http_io.c 2013-07-16 18:28:35.000000000 +0200 +++ new/s3backer-1.3.7/http_io.c 2013-07-17 18:01:50.000000000 +0200 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. * - * $Id: http_io.c 492 2013-07-16 16:28:35Z archie.cobbs $ + * $Id: http_io.c 495 2013-07-17 16:01:49Z archie.cobbs $ */ #include "s3backer.h" @@ -296,6 +296,7 @@ /* Initialize encryption */ if (config->encryption != NULL) { char saltbuf[strlen(config->bucket) + 1 + strlen(config->prefix) + 1]; + u_int cipher_key_len; /* Sanity checks */ assert(config->password != NULL); @@ -314,9 +315,10 @@ r = EINVAL; goto fail4; } - priv->keylen = EVP_CIPHER_key_length(priv->cipher); - if (priv->keylen <= 0 || priv->keylen > sizeof(priv->key)) { - (*config->log)(LOG_ERR, "cipher `%s' key length %d is out of range", config->encryption, priv->keylen); + cipher_key_len = EVP_CIPHER_key_length(priv->cipher); + priv->keylen = config->key_length > 0 ? config->key_length : cipher_key_len; + if (priv->keylen < cipher_key_len || priv->keylen > sizeof(priv->key)) { + (*config->log)(LOG_ERR, "key length %u for cipher `%s' is out of range", priv->keylen, config->encryption); r = EINVAL; goto fail4; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.3.6/http_io.h new/s3backer-1.3.7/http_io.h --- old/s3backer-1.3.6/http_io.h 2013-05-11 19:07:54.000000000 +0200 +++ new/s3backer-1.3.7/http_io.h 2013-07-17 18:01:50.000000000 +0200 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. * - * $Id: http_io.h 482 2013-05-11 17:07:49Z archie.cobbs $ + * $Id: http_io.h 495 2013-07-17 16:01:49Z archie.cobbs $ */ /* Upload/download indexes */ @@ -38,6 +38,7 @@ const char *cacert; const char *password; const char *encryption; + u_int key_length; int debug; int debug_http; int quiet; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.3.6/s3b_config.c new/s3backer-1.3.7/s3b_config.c --- old/s3backer-1.3.6/s3b_config.c 2013-05-11 19:07:54.000000000 +0200 +++ new/s3backer-1.3.7/s3b_config.c 2013-07-17 18:01:50.000000000 +0200 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. * - * $Id: s3b_config.c 482 2013-05-11 17:07:49Z archie.cobbs $ + * $Id: s3b_config.c 495 2013-07-17 16:01:49Z archie.cobbs $ */ #include "s3backer.h" @@ -383,6 +383,10 @@ .offset= offsetof(struct s3b_config, http_io.encryption), }, { + .templ= "--keyLength=%u", + .offset= offsetof(struct s3b_config, http_io.key_length), + }, + { .templ= "--password=%s", .offset= offsetof(struct s3b_config, http_io.password), }, @@ -1039,11 +1043,17 @@ } if (config.http_io.password == NULL && (config.http_io.password = strdup(s)) == NULL) err(1, "strdup()"); + if (config.http_io.key_length < 0 || config.http_io.key_length > EVP_MAX_KEY_LENGTH) { + warnx("`--keyLength' value must be positive and at most %u", EVP_MAX_KEY_LENGTH); + return -1; + } } else { if (config.http_io.password != NULL) warnx("unexpected flag `%s' (`--encrypt' was not specified)", "--password"); else if (config.password_file != NULL) warnx("unexpected flag `%s' (`--encrypt' was not specified)", "--passwordFile"); + if (config.http_io.key_length != 0) + warnx("unexpected flag `%s' (`--encrypt' was not specified)", "--keyLength"); } /* We always want to compress if we are encrypting */ @@ -1456,6 +1466,7 @@ (*config.log)(LOG_DEBUG, "%24s: %s", "read_only", config.fuse_ops.read_only ? "true" : "false"); (*config.log)(LOG_DEBUG, "%24s: %d", "compress", config.http_io.compress); (*config.log)(LOG_DEBUG, "%24s: %s", "encryption", config.http_io.encryption != NULL ? config.http_io.encryption : "(none)"); + (*config.log)(LOG_DEBUG, "%24s: %u", "key_length", config.http_io.key_length); (*config.log)(LOG_DEBUG, "%24s: \"%s\"", "password", config.http_io.password != NULL ? "****" : ""); (*config.log)(LOG_DEBUG, "%24s: %s bps (%ju)", "max_upload", config.max_speed_str[HTTP_UPLOAD] != NULL ? config.max_speed_str[HTTP_UPLOAD] : "-", @@ -1587,6 +1598,7 @@ fprintf(stderr, "\t--%-27s %s\n", "help", "Show this information and exit"); fprintf(stderr, "\t--%-27s %s\n", "initialRetryPause=MILLIS", "Inital retry pause after stale data or server error"); fprintf(stderr, "\t--%-27s %s\n", "insecure", "Don't verify SSL server identity"); + fprintf(stderr, "\t--%-27s %s\n", "keyLength", "Override generated cipher key length"); fprintf(stderr, "\t--%-27s %s\n", "listBlocks", "Auto-detect non-empty blocks at startup"); fprintf(stderr, "\t--%-27s %s\n", "maxDownloadSpeed=BITSPERSEC", "Max download bandwith for a single read"); fprintf(stderr, "\t--%-27s %s\n", "maxRetryPause=MILLIS", "Max total pause after stale data or server error"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.3.6/s3backer.1 new/s3backer-1.3.7/s3backer.1 --- old/s3backer-1.3.6/s3backer.1 2013-05-11 19:07:54.000000000 +0200 +++ new/s3backer-1.3.7/s3backer.1 2013-07-18 19:17:52.000000000 +0200 @@ -19,7 +19,7 @@ .\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA .\" 02110-1301, USA. .\" -.\" $Id: s3backer.1 482 2013-05-11 17:07:49Z archie.cobbs $ +.\" $Id: s3backer.1 496 2013-07-18 17:17:51Z archie.cobbs $ .\" .Dd September 7, 2009 .Dt S3BACKER 1 @@ -550,6 +550,22 @@ .Fl \-insecure flag documented in .Xr curl 1 . +.It Fl \-keyLength +Override the length of the generated block encryption key. +.Pp +Versions of +.Nm +prior to 1.3.6 contained a bug where the length of the generated encryption key was fixed but system-dependent, +causing it to be possibly incompatible on different systems for some ciphers. +In version 1.3.6, this bug was corrected; however, in some cases this changed the generated key length, +making the encryption no longer compatible with previously written data. +This flag can be used to force the older, fixed key length. +The value you want to use is whatever is defined for +.Pa EVP_MAX_KEY_LENGTH +on your system, typically 64. +.Pp +It is an error to specify a value smaller than the cipher's natural key length; +however, a value of zero is allowed and is equivalent to not specifying anything. .It Fl \-listBlocks Perform a query at startup to determine which blocks already exist. This enables optimizations whereby, for each block that does not yet exist, reads return zeroes and zeroed writes are omitted, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.3.6/s3backer.spec new/s3backer-1.3.7/s3backer.spec --- old/s3backer-1.3.6/s3backer.spec 2013-07-16 18:34:37.000000000 +0200 +++ new/s3backer-1.3.7/s3backer.spec 2013-07-18 19:20:07.000000000 +0200 @@ -17,7 +17,7 @@ # Name: s3backer -Version: 1.3.6 +Version: 1.3.7 Release: 1 License: GNU General Public License, Version 2 Summary: FUSE-based single file backing store via Amazon S3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.3.6/svnrev.c new/s3backer-1.3.7/svnrev.c --- old/s3backer-1.3.6/svnrev.c 2013-07-16 18:34:37.000000000 +0200 +++ new/s3backer-1.3.7/svnrev.c 2013-07-18 19:20:09.000000000 +0200 @@ -1 +1 @@ -const int s3backer_svnrev = 493; +const int s3backer_svnrev = 496; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
