Merge branch 'master' of https://www.bearssl.org/git/BearSSL

earlephilhower · earlephilhower · commit 6ae50f64ea86 · 2018-05-24T11:38:37.000-07:00
diff --git a/src/int/i31_montmul.c b/src/int/i31_montmul.c
@@ -34,7 +34,7 @@ br_i31_montymul(uint32_t *d, const uint32_t *x, const uint32_t *y,
 
 	len = (m[0] + 31) >> 5;
 	len4 = len & ~(size_t)3;
-	br_i32_zero(d, m[0]);
+	br_i31_zero(d, m[0]);
 	dh = 0;
 	for (u = 0; u < len; u ++) {
 		uint32_t f, xu;
diff --git a/src/rsa/rsa_oaep_unpad.c b/src/rsa/rsa_oaep_unpad.c
@@ -138,7 +138,7 @@ br_rsa_oaep_unpad(const br_hash_class *dig,
 
 		plen = 2 + hlen + zlen;
 		k -= plen;
-		memmove(data, data + plen, k);
+		memmove(buf, buf + plen, k);
 		*len = k;
 	}
 	return s;

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ br_rsa_oaep_unpad(const br_hash_class *dig,`
`138`	`138`
`139`	`139`	`plen = 2 + hlen + zlen;`
`140`	`140`	`k -= plen;`
`141`		`- memmove(data, data + plen, k);`
	`141`	`+ memmove(buf, buf + plen, k);`
`142`	`142`	`*len = k;`
`143`	`143`	`}`
`144`	`144`	`return s;`