2ba77c303c
The key name is encoded into the filename containing the (encrypted) key material. Since the key name might contain characters that are not valid in a filename, the name is encoded using a multi-character custom encoding scheme. However, the decoding function did not decode the key name correctly - in particular, spaces were decoded to 'P', causing CtsVerifier tests that install a key with a space in the name to fail (due to internal inconsistency between the key names in KeyChain's DB and key names obtained from Keystore). Fix by correctly compensating for the "carrier" character. Test: atest keystore_unit_tests Bug: 116716944 Change-Id: I0326a9d9e6912b04bb13b3b350ead8ddcfcc12f8
42 lines
1.1 KiB
C++
42 lines
1.1 KiB
C++
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
#include <string>
|
|
#include <utils/String16.h>
|
|
|
|
#include "../blob.h"
|
|
|
|
namespace keystore {
|
|
|
|
namespace test {
|
|
|
|
namespace {
|
|
|
|
constexpr const char* kNameToEncode = "some key name !\\ %#|\"";
|
|
|
|
} // namespace
|
|
|
|
TEST(BlobTest, nameEncodingAndDecodingTest) {
|
|
std::string toEncode(kNameToEncode);
|
|
std::string decoded(decodeKeyName(encodeKeyName(toEncode)));
|
|
|
|
ASSERT_EQ(toEncode, decoded);
|
|
}
|
|
|
|
} // namespace test
|
|
} // namespace keystore
|