X-Git-Url: https://bearssl.org/gitweb//home/git/?p=BearSSL;a=blobdiff_plain;f=src%2Fssl%2Fssl_scert_single_rsa.c;fp=src%2Fssl%2Fssl_scert_single_rsa.c;h=b5f0e69d943540b8b11c0b6cddbd7cf0ccdf48b1;hp=2ddbff99754c7566e36335834cf01e927a06ab73;hb=ef318ef83a3a58b0a9e036676b84d11261ed7bb4;hpb=44c79c1add4cd4a217b1dd77c8421c1d3a08dcef

diff --git a/src/ssl/ssl_scert_single_rsa.c b/src/ssl/ssl_scert_single_rsa.c
index 2ddbff9..b5f0e69 100644
--- a/src/ssl/ssl_scert_single_rsa.c
+++ b/src/ssl/ssl_scert_single_rsa.c
@@ -32,7 +32,7 @@ sr_choose(const br_ssl_server_policy_class **pctx,
 	br_ssl_server_policy_rsa_context *pc;
 	const br_suite_translated *st;
 	size_t u, st_num;
-	int hash_id;
+	unsigned hash_id;
 
 	pc = (br_ssl_server_policy_rsa_context *)pctx;
 	st = br_ssl_server_get_client_suites(cc, &st_num);
@@ -58,7 +58,7 @@ sr_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;
@@ -110,7 +110,7 @@ static const unsigned char *HASH_OID[] = {
 
 static size_t
 sr_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_rsa_context *pc;
 	unsigned char hv[64];
@@ -119,10 +119,11 @@ sr_do_sign(const br_ssl_server_policy_class **pctx,
 
 	pc = (br_ssl_server_policy_rsa_context *)pctx;
 	memcpy(hv, data, hv_len);
-	if (hash_id == 0) {
+	algo_id &= 0xFF;
+	if (algo_id == 0) {
 		hash_oid = NULL;
-	} else if (hash_id >= 2 && hash_id <= 6) {
-		hash_oid = HASH_OID[hash_id - 2];
+	} else if (algo_id >= 2 && algo_id <= 6) {
+		hash_oid = HASH_OID[algo_id - 2];
 	} else {
 		return 0;
 	}