Merge pull request #198 from ColtonWilley/wp_dh_type_specific_spki

SparkiDev · web-flow · commit febb1478a6fa · 2025-07-01T08:51:45.000+10:00
Add support for DH type specific SPKI decoder
diff --git a/src/wp_dh_kmgmt.c b/src/wp_dh_kmgmt.c
@@ -2208,6 +2208,12 @@ static int wp_dh_decode(wp_DhEncDecCtx* ctx, OSSL_CORE_BIO *cBio,
                 decoded = 0;
             }
         }
+        else if ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) {
+            if (!wp_dh_decode_spki(dh, data, len)) {
+                ok = 0;
+                decoded = 0;
+            }
+        }
         else {
             if (!wp_dh_decode_params(dh, data, len)) {
                 ok = 0;

Original file line number	Diff line number	Diff line change
`@@ -2208,6 +2208,12 @@ static int wp_dh_decode(wp_DhEncDecCtx* ctx, OSSL_CORE_BIO *cBio,`
`2208`	`2208`	`decoded = 0;`
`2209`	`2209`	`}`
`2210`	`2210`	`}`
	`2211`	`+ else if ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) {`
	`2212`	`+ if (!wp_dh_decode_spki(dh, data, len)) {`
	`2213`	`+ ok = 0;`
	`2214`	`+ decoded = 0;`
	`2215`	`+ }`
	`2216`	`+ }`
`2211`	`2217`	`else {`
`2212`	`2218`	`if (!wp_dh_decode_params(dh, data, len)) {`
`2213`	`2219`	`ok = 0;`