octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-12-23 17:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly calculate MD5 hash for SSE-C keys

Browse Source 
Previously s3fs calculated the strlen of a binary input instead of
using the stored length.  This yielded IO errors when interacting with
SSE-encrypted objects.  Fixes #696.
This commit is contained in:
Andrew Gaul 2019-04-08 21:49:42 +09:00
parent d7bb834bcb
commit 6f8ecb28c5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/curl.cpp
View File

@ -63,7 +63,7 @@ static const std::string empty_payload_hash = "e3b0c44298fc1c149afbf4c8996fb9242
// This function uses temporary file, but should not use it. // This function uses temporary file, but should not use it.
// For not using it, we implement function in each auth file(openssl, nss. gnutls). // For not using it, we implement function in each auth file(openssl, nss. gnutls).
// //
static bool make_md5_from_string(const char* pstr, string& md5) static bool make_md5_from_binary(const char* pstr, size_t length, string& md5)
{ {
if(!pstr || '\0' == pstr[0]){ if(!pstr || '\0' == pstr[0]){
S3FS_PRN_ERR("Parameter is wrong."); S3FS_PRN_ERR("Parameter is wrong.");
@ -74,7 +74,6 @@ static bool make_md5_from_string(const char* pstr, string& md5)
S3FS_PRN_ERR("Could not make tmpfile."); S3FS_PRN_ERR("Could not make tmpfile.");
return false; return false;
} }
size_t length = strlen(pstr);
if(length != fwrite(pstr, sizeof(char), length, fp)){ if(length != fwrite(pstr, sizeof(char), length, fp)){
S3FS_PRN_ERR("Failed to write tmpfile."); S3FS_PRN_ERR("Failed to write tmpfile.");
fclose(fp); fclose(fp);
@ -1006,7 +1005,7 @@ bool S3fsCurl::PushbackSseKeys(string& onekey)
// make MD5 // make MD5
string strMd5; string strMd5;
if(!make_md5_from_string(raw_key.c_str(), strMd5)){ if(!make_md5_from_binary(raw_key.c_str(), raw_key.length(), strMd5)){
S3FS_PRN_ERR("Could not make MD5 from SSE-C keys(%s).", raw_key.c_str()); S3FS_PRN_ERR("Could not make MD5 from SSE-C keys(%s).", raw_key.c_str());
return false; return false;
} }