chromium/src
0
Fork 0
Code Activity

Update JWK output to match latest draft

Browse Source 
BUG=259097

Review URL: https://codereview.chromium.org/65353002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234133 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
juanlang@google.com
2013-11-09 18:07:08 +00:00
parent 9f0835f004
commit 797985c51d
3 changed files with 4 additions and 4 deletions

2
net/cert/jwk_serializer.h

@ -17,7 +17,7 @@ namespace net {
namespace JwkSerializer { namespace JwkSerializer {
// Converts a subject public key info from DER to JWK. // Converts a subject public key info from DER to JWK.
// See http://tools.ietf.org/html/draft-ietf-jose-json-web-algorithms-13 for // See http://tools.ietf.org/html/draft-ietf-jose-json-web-algorithms-17 for
// the output format. // the output format.
NET_EXPORT_PRIVATE bool ConvertSpkiFromDerToJwk( NET_EXPORT_PRIVATE bool ConvertSpkiFromDerToJwk(
const base::StringPiece& spki_der, const base::StringPiece& spki_der,

2
net/cert/jwk_serializer_nss.cc

@ -30,7 +30,7 @@ bool ConvertEcPrime256v1PublicKeyInfoToJwk(
spki->subjectPublicKey.data[0] != kUncompressedEncodingType) spki->subjectPublicKey.data[0] != kUncompressedEncodingType)
return false; return false;
public_key_jwk->SetString("alg", "EC"); public_key_jwk->SetString("kty", "EC");
public_key_jwk->SetString("crv", "P-256"); public_key_jwk->SetString("crv", "P-256");
base::StringPiece x( base::StringPiece x(

4
net/cert/jwk_serializer_unittest.cc

@ -75,7 +75,7 @@ TEST(JwkSerializerNSSTest, ConvertSpkiFromDerToJwkEc) {
EXPECT_TRUE(JwkSerializer::ConvertSpkiFromDerToJwk(spki, &public_key_jwk)); EXPECT_TRUE(JwkSerializer::ConvertSpkiFromDerToJwk(spki, &public_key_jwk));
std::string string_value; std::string string_value;
EXPECT_TRUE(public_key_jwk.GetString("alg", &string_value)); EXPECT_TRUE(public_key_jwk.GetString("kty", &string_value));
EXPECT_STREQ("EC", string_value.c_str()); EXPECT_STREQ("EC", string_value.c_str());
EXPECT_TRUE(public_key_jwk.GetString("crv", &string_value)); EXPECT_TRUE(public_key_jwk.GetString("crv", &string_value));
EXPECT_STREQ("P-256", string_value.c_str()); EXPECT_STREQ("P-256", string_value.c_str());
@ -103,7 +103,7 @@ TEST(JwkSerializerNSSTest, ConvertSpkiFromDerToJwkEc) {
sizeof(kSpkiEcWithZeroXY)); sizeof(kSpkiEcWithZeroXY));
EXPECT_TRUE(JwkSerializer::ConvertSpkiFromDerToJwk(spki, &public_key_jwk)); EXPECT_TRUE(JwkSerializer::ConvertSpkiFromDerToJwk(spki, &public_key_jwk));
EXPECT_TRUE(public_key_jwk.GetString("alg", &string_value)); EXPECT_TRUE(public_key_jwk.GetString("kty", &string_value));
EXPECT_STREQ("EC", string_value.c_str()); EXPECT_STREQ("EC", string_value.c_str());
EXPECT_TRUE(public_key_jwk.GetString("crv", &string_value)); EXPECT_TRUE(public_key_jwk.GetString("crv", &string_value));
EXPECT_STREQ("P-256", string_value.c_str()); EXPECT_STREQ("P-256", string_value.c_str());