Merge pull request #17 from djw8605/fix-ec-detect

djw8605 · web-flow · commit f28c52821b6a · 2019-11-08T11:11:39.000-06:00
Fix EC curve detection
diff --git a/src/scitokens_internal.cpp b/src/scitokens_internal.cpp
@@ -431,9 +431,9 @@ Validator::get_public_key_pem(const std::string &issuer, const std::string &kid,
                 if (iter3 == key_obj.end() || !iter3->second.is<std::string>()) {
                     throw JsonException("EC key is missing curve name");
                 }
-                auto crv = iter2->second.get<std::string>();
+                auto crv = iter3->second.get<std::string>();
                 if (crv == "P-256") {
-                    alg = "EC256";
+                    alg = "ES256";
                 } else {
                     throw JsonException("Unsupported EC curve in public key");
                 }

Original file line number	Diff line number	Diff line change
`@@ -431,9 +431,9 @@ Validator::get_public_key_pem(const std::string &issuer, const std::string &kid,`
`431`	`431`	`if (iter3 == key_obj.end() \|\| !iter3->second.is<std::string>()) {`
`432`	`432`	`throw JsonException("EC key is missing curve name");`
`433`	`433`	`}`
`434`		`- auto crv = iter2->second.get<std::string>();`
	`434`	`+ auto crv = iter3->second.get<std::string>();`
`435`	`435`	`if (crv == "P-256") {`
`436`		`- alg = "EC256";`
	`436`	`+ alg = "ES256";`
`437`	`437`	`} else {`
`438`	`438`	`throw JsonException("Unsupported EC curve in public key");`
`439`	`439`	`}`