X-Git-Url: https://www.bearssl.org/gitweb//home/git/?p=BearSSL;a=blobdiff_plain;f=src%2Fssl%2Fssl_scert_single_ec.c;h=ce8d7539ab9068817bc91a5d17a2b25e5cafa66c;hp=2648670fa306ff18cde41eb85bc66290ecf5524e;hb=8cd3f8fecbb8eee7d4cd71c464694cf1621c5e99;hpb=e61ad42191511226309bad2cbde8cd9e8cc743cb;ds=sidebyside

diff --git a/src/ssl/ssl_scert_single_ec.c b/src/ssl/ssl_scert_single_ec.c
index 2648670..ce8d753 100644
--- a/src/ssl/ssl_scert_single_ec.c
+++ b/src/ssl/ssl_scert_single_ec.c
@@ -32,7 +32,7 @@ se_choose(const br_ssl_server_policy_class **pctx,
 	br_ssl_server_policy_ec_context *pc;
 	const br_suite_translated *st;
 	size_t u, st_num;
-	int hash_id;
+	unsigned hash_id;
 
 	pc = (br_ssl_server_policy_ec_context *)pctx;
 	st = br_ssl_server_get_client_suites(cc, &st_num);
@@ -68,7 +68,7 @@ se_choose(const br_ssl_server_policy_class **pctx,
 				&& hash_id != 0)
 			{
 				choices->cipher_suite = st[u][0];
-				choices->hash_id = hash_id;
+				choices->algo_id = hash_id + 0xFF00;
 				return 1;
 			}
 			break;
@@ -79,24 +79,31 @@ se_choose(const br_ssl_server_policy_class **pctx,
 
 static uint32_t
 se_do_keyx(const br_ssl_server_policy_class **pctx,
-	unsigned char *data, size_t len)
+	unsigned char *data, size_t *len)
 {
 	br_ssl_server_policy_ec_context *pc;
+	uint32_t r;
+	size_t xoff, xlen;
 
 	pc = (br_ssl_server_policy_ec_context *)pctx;
-	return pc->iec->mul(data, len, pc->sk->x, pc->sk->xlen, pc->sk->curve);
+	r = pc->iec->mul(data, *len, pc->sk->x, pc->sk->xlen, pc->sk->curve);
+	xoff = pc->iec->xoff(pc->sk->curve, &xlen);
+	memmove(data, data + xoff, xlen);
+	*len = xlen;
+	return r;
 }
 
 static size_t
 se_do_sign(const br_ssl_server_policy_class **pctx,
-	int hash_id, size_t hv_len, unsigned char *data, size_t len)
+	unsigned algo_id, unsigned char *data, size_t hv_len, size_t len)
 {
 	br_ssl_server_policy_ec_context *pc;
 	unsigned char hv[64];
 	const br_hash_class *hc;
 
+	algo_id &= 0xFF;
 	pc = (br_ssl_server_policy_ec_context *)pctx;
-	hc = br_multihash_getimpl(pc->mhash, hash_id);
+	hc = br_multihash_getimpl(pc->mhash, algo_id);
 	if (hc == NULL) {
 		return 0;
 	}