From 5ea09d266860dc20707b6d1ea3fbe33cbe423397 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Wed, 28 Oct 2015 09:59:33 +0100 Subject: [PATCH] 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 a93e84f3e..3b4ca37bc 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 5dd21e682..5ad01c7da 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 -- 2.30.2