Merge branch 'master' of https://github.com/guanzhi/GmSSL

guanzhi · guanzhi · commit 644386fab6ff · 2020-05-25T17:53:28.000+08:00
diff --git a/crypto/ec/asm/ecp_sm2z256-x86_64.pl b/crypto/ec/asm/ecp_sm2z256-x86_64.pl
@@ -1267,6 +1267,9 @@
 	 shrx	$a_ptr, $acc0, $t4
 	 mov	.Lpoly+8*3(%rip), $t1
 
+    # set of = 0
+    add \$0, $acc2
+
 	# reduction step 1
 	xor	$t1, $t1
 	adox	$acc0, $acc1
@@ -1281,6 +1284,9 @@
 	shlx	$a_ptr, $acc1, $t0
 	shrx	$a_ptr, $acc1, $t4
 
+    # set of = 0
+    add \$0, $acc2
+
 	# reduction step 2
 	adox	$acc1, $acc2
 	adox	$t1, $acc3
@@ -1294,6 +1300,9 @@
 	shlx	$a_ptr, $acc2, $t0
 	shrx	$a_ptr, $acc2, $t4
 
+    # set of = 0
+    add \$0, $acc2
+
 	# reduction step 3
 	adox	$acc2, $acc3
 	adox	$t1, $acc0
@@ -1307,6 +1316,9 @@
 	shlx	$a_ptr, $acc3, $t0
 	shrx	$a_ptr, $acc3, $t4
 
+    # set of = 0
+    add \$0, $acc2
+
 	# reduction step 4
 	adox	$acc3, $acc0
 	adox	$t1, $acc1
diff --git a/test/sm9test.c b/test/sm9test.c
@@ -356,7 +356,7 @@ static int sm9test_exch(const char *idA, const char *idB)
 		goto end;
 	}
 
-	if (memcmp(SKA, SKA, sizeof(SKA)) != 0 || memcmp(SA, S2, sizeof(SA)) != 0) {
+	if (memcmp(SKA, SKB, sizeof(SKA)) != 0 || memcmp(SA, S2, sizeof(SA)) != 0) {
 		goto end;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ static int sm9test_exch(const char idA, const char idB)`
`356`	`356`	`goto end;`
`357`	`357`	`}`
`358`	`358`
`359`		`- if (memcmp(SKA, SKA, sizeof(SKA)) != 0 \|\| memcmp(SA, S2, sizeof(SA)) != 0) {`
	`359`	`+ if (memcmp(SKA, SKB, sizeof(SKA)) != 0 \|\| memcmp(SA, S2, sizeof(SA)) != 0) {`
`360`	`360`	`goto end;`
`361`	`361`	`}`
`362`	`362`