[Pkg-owncloud-commits] [owncloud-client] 174/484: Checksum: Disallow ADLER32, use Adler32 #3735

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 5ea09d266860dc20707b6d1ea3fbe33cbe423397
Author: Christian Kamm <mail at ckamm.de>
Date:   Wed Oct 28 09:59:33 2015 +0100

    Checksum: Disallow ADLER32, use Adler32 #3735
---
 src/libsync/owncloudpropagator.cpp | 6 +++---
 src/libsync/propagatorjobs.h       | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index a93e84f..3b4ca37 100644
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -293,14 +293,14 @@ void OwncloudPropagator::start(const SyncFileItemVector& items)
 
     /* Check and log the transmission checksum type */
     ConfigFile cfg;
-    const QString checksumType = cfg.transmissionChecksum().toUpper();
+    const QString checksumType = cfg.transmissionChecksum();
 
     /* if the checksum type is empty, it is not sent. No error */
     if( !checksumType.isEmpty() ) {
-        if( checksumType == checkSumAdlerUpperC ||
+        if( checksumType == checkSumAdlerC ||
                 checksumType == checkSumMD5C    ||
                 checksumType == checkSumSHA1C ) {
-            qDebug() << "Client sends and expects transmission checksum type" << checksumType;
+            qDebug() << "Client sends transmission checksum type" << checksumType;
         } else {
             qWarning() << "Unknown transmission checksum type from config" << checksumType;
         }
diff --git a/src/libsync/propagatorjobs.h b/src/libsync/propagatorjobs.h
index 5dd21e6..5ad01c7 100644
--- a/src/libsync/propagatorjobs.h
+++ b/src/libsync/propagatorjobs.h
@@ -32,7 +32,6 @@ static const char checkSumHeaderC[] = "OC-Checksum";
 static const char checkSumMD5C[] = "MD5";
 static const char checkSumSHA1C[] = "SHA1";
 static const char checkSumAdlerC[] = "Adler32";
-static const char checkSumAdlerUpperC[] = "ADLER32";
 
 /**
  * @brief Declaration of the other propagation jobs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git