diff --git a/src/endpoint/s3/s3_utils.js b/src/endpoint/s3/s3_utils.js index dc34e988d8..8a71846dde 100644 --- a/src/endpoint/s3/s3_utils.js +++ b/src/endpoint/s3/s3_utils.js @@ -227,9 +227,9 @@ function parse_sse(req) { } } - if (algorithm !== 'AES256' && algorithm !== 'aws:kms') throw new S3Error(S3Error.InvalidDigest); + if (algorithm !== 'AES256' && algorithm !== 'aws:kms') throw new S3Error(S3Error.InvalidArgument); - if (algorithm === 'aws:kms' && !kms_key_id) throw new S3Error(S3Error.InvalidDigest); + if (algorithm === 'aws:kms' && !kms_key_id) throw new S3Error(S3Error.InvalidArgument); // const md5_regex = new RegExp('/^[a-f0-9]{32}$/'); // if (kms_key_id && !md5_regex.test(kms_key_id)) throw new S3Error(S3Error.InvalidDigest); diff --git a/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt b/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt index d7fd3580d7..5898ed58aa 100644 --- a/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt +++ b/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt @@ -33,7 +33,6 @@ s3tests_boto3.functional.test_s3.test_lifecycle_expiration_header_tags_head s3tests_boto3.functional.test_s3.test_put_obj_enc_conflict_c_s3 s3tests_boto3.functional.test_s3.test_put_obj_enc_conflict_c_kms s3tests_boto3.functional.test_s3.test_put_obj_enc_conflict_s3_kms -s3tests_boto3.functional.test_s3.test_put_obj_enc_conflict_bad_enc_kms s3tests_boto3.functional.test_s3.test_bucket_policy_put_obj_s3_noenc s3tests_boto3.functional.test_s3.test_bucket_policy_put_obj_s3_kms s3tests_boto3.functional.test_s3.test_bucket_policy_put_obj_kms_noenc