From b04afab972c480fd6e1b66f28a2146dda2fbb363 Mon Sep 17 00:00:00 2001
From: Quan Nguyen <quannguyen@google.com>
Date: Mon, 23 Jul 2018 11:34:28 -0700
Subject: [PATCH] Automated g4 rollback of changelist 204232671.
*** Reason for rollback ***
We split rsa PSS from PKCS1, this encoding is not needed.
*** Original change description ***
Add enum RsaSignatureEncoding
***
PiperOrigin-RevId: 205695849
GitOrigin-RevId: 6a207fb0de4aa24def3531e6f663b978099c67db
---
cc/subtle/common_enums.cc | 13 -------------
cc/subtle/common_enums.h | 7 -------
cc/subtle/common_enums_test.cc | 9 ---------
3 files changed, 29 deletions(-)
diff --git a/cc/subtle/common_enums.cc b/cc/subtle/common_enums.cc
index 6f4e0f4b9..62d4c3096 100644
--- a/cc/subtle/common_enums.cc
+++ b/cc/subtle/common_enums.cc
@@ -67,19 +67,6 @@ std::string EnumToString(HashType type) {
}
}
-std::string EnumToString(RsaSignatureEncoding encoding) {
- switch (encoding) {
- case RsaSignatureEncoding::PKCS1_ENCODING:
- return "PKCS1_ENCODING";
- case RsaSignatureEncoding::PSS_ENCODING:
- return "PSS_ENCODING";
- case RsaSignatureEncoding::UNKNOWN_ENCODING:
- return "UNKNOWN_ENCODING";
- default:
- return "UNKNOWN_ENCODING" + std::to_string(encoding);
- }
-}
-
} // namespace subtle
} // namespace tink
} // namespace crypto
diff --git a/cc/subtle/common_enums.h b/cc/subtle/common_enums.h
index 37cc30d5d..ef8ee5ffa 100644
--- a/cc/subtle/common_enums.h
+++ b/cc/subtle/common_enums.h
@@ -47,16 +47,9 @@ enum HashType {
SHA512 = 4,
};
-enum RsaSignatureEncoding {
- UNKNOWN_ENCODING = 0,
- PKCS1_ENCODING = 1,
- PSS_ENCODING = 2,
-};
-
std::string EnumToString(EllipticCurveType type);
std::string EnumToString(EcPointFormat format);
std::string EnumToString(HashType type);
-std::string EnumToString(RsaSignatureEncoding encoding);
} // namespace subtle
} // namespace tink
diff --git a/cc/subtle/common_enums_test.cc b/cc/subtle/common_enums_test.cc
index ab553950e..15dc5570e 100644
--- a/cc/subtle/common_enums_test.cc
+++ b/cc/subtle/common_enums_test.cc
@@ -50,15 +50,6 @@ TEST_F(CommonEnumsTest, testEcPointFormatToString) {
EXPECT_EQ("UNKNOWN_FORMAT: 42", EnumToString((EcPointFormat)42));
}
-TEST_F(CommonEnumsTest, testRsaSignatureEncodingToString) {
- EXPECT_EQ("UNKNOWN_ENCODING",
- EnumToString(RsaSignatureEncoding::UNKNOWN_ENCODING));
- EXPECT_EQ("PKCS1_ENCODING",
- EnumToString(RsaSignatureEncoding::PKCS1_ENCODING));
- EXPECT_EQ("PSS_ENCODING",
- EnumToString(RsaSignatureEncoding::PSS_ENCODING));
-}
-
} // namespace
} // namespace subtle
} // namespace tink
--
GitLab