octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-09-23 06:49:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[curl] Assume long encryption keys are base64 encoded

Browse Source 
Amazon SSE-C https://tinyurl.com/ychug4cg writes:

> Use this header to provide the 256-bit, base64-encoded encryption key
> for Amazon S3 to use to encrypt or decrypt your data.

It seems likely that future keys would be as long, or longer, so
this change assumes that text longer than 32 characters are keys
that are base64 encoded.

Signed-off-by: Earl Chew <earl_chew@yahoo.com>
This commit is contained in:
Earl Chew 2018-09-16 21:19:33 +00:00
parent 06032aa661
commit 41c23adb0e
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/curl.cpp
View File

@ -963,19 +963,38 @@ bool S3fsCurl::PushbackSseKeys(string& onekey)
if('#' == onekey[0]){
return false;
}
// make base64
// make base64 if the key is short enough, otherwise assume it is already so
string base64_key;
string raw_key;
if(onekey.length() > 256 / 8){
char* p_key;
size_t keylength;
if(NULL != (p_key = (char *)s3fs_decode64(onekey.c_str(), &keylength))) {
raw_key = string(p_key, keylength);
base64_key = onekey;
free(p_key);
} else {
S3FS_PRN_ERR("Failed to convert base64 to SSE-C key %s", onekey.c_str());
return false;
}
} else {
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;
base64_key = pbase64_key;
free(pbase64_key);
} else {
S3FS_PRN_ERR("Failed to convert base64 from SSE-C key %s", onekey.c_str());
return false;
}
string base64_key = pbase64_key;
free(pbase64_key);
}
// make MD5
string strMd5;
if(!make_md5_from_string(onekey.c_str(), strMd5)){
S3FS_PRN_ERR("Could not make MD5 from SSE-C keys(%s).", onekey.c_str());
if(!make_md5_from_string(raw_key.c_str(), strMd5)){
S3FS_PRN_ERR("Could not make MD5 from SSE-C keys(%s).", raw_key.c_str());
return false;
}
// mapped MD5 = SSE Key