octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-04-01 14:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[curl] Assume long encryption keys are base64 encoded

Browse Source 
Correct tabs and whitespace.

Signed-off-by: Earl Chew <earl_chew@yahoo.com>
This commit is contained in:
Earl Chew 2019-01-05 21:08:41 +00:00
parent 41c23adb0e
commit ed5795eead
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/curl.cpp
View File

@ -972,23 +972,23 @@ bool S3fsCurl::PushbackSseKeys(string& onekey)
if(NULL != (p_key = (char *)s3fs_decode64(onekey.c_str(), &keylength))) { if(NULL != (p_key = (char *)s3fs_decode64(onekey.c_str(), &keylength))) {
raw_key = string(p_key, keylength); raw_key = string(p_key, keylength);
base64_key = onekey; base64_key = onekey;
free(p_key); free(p_key);
} else { } else {
S3FS_PRN_ERR("Failed to convert base64 to SSE-C key %s", onekey.c_str()); S3FS_PRN_ERR("Failed to convert base64 to SSE-C key %s", onekey.c_str());
return false; return false;
} }
} else { } else {
char* pbase64_key; char* pbase64_key;
if(NULL != (pbase64_key = s3fs_base64((unsigned char*)onekey.c_str(), onekey.length()))) { if(NULL != (pbase64_key = s3fs_base64((unsigned char*)onekey.c_str(), onekey.length()))) {
raw_key = onekey; raw_key = onekey;
base64_key = pbase64_key; base64_key = pbase64_key;
free(pbase64_key); free(pbase64_key);
} else { } else {
S3FS_PRN_ERR("Failed to convert base64 from SSE-C key %s", onekey.c_str()); S3FS_PRN_ERR("Failed to convert base64 from SSE-C key %s", onekey.c_str());
return false; return false;
} }
} }
// make MD5 // make MD5