Bläddra i källkod

Not announcing a use of an unaccelerated SHA, until we actually support accelerated version

Source commit: 23a20640ba27f5ae7d78e9524ac0f5ee11e35776
Martin Prikryl 6 år sedan
förälder
incheckning
aab32dd68b
2 ändrade filer med 3 tillägg och 2 borttagningar
  1. 2 1
      source/putty/sshsh256.c
  2. 1 1
      source/putty/sshsha.c

+ 2 - 1
source/putty/sshsh256.c

@@ -34,6 +34,7 @@
 
 // Should be (almost) working (when set to HW_SHA256_NI), but we do not have a HW to test this on.
 // Need to replace _mm_setr_epi8 and there's also objconv warning about alignment.
+// Restore "unaccelerated" annotation.
 #undef HW_SHA256
 
 #ifdef _FORCE_SHA_NEON
@@ -353,7 +354,7 @@ static void sha256_sw_final(ssh_hash *hash, uint8_t *digest)
 
 const ssh_hashalg ssh_sha256_sw = {
     sha256_sw_new, sha256_sw_copy, sha256_sw_final, sha256_sw_free,
-    32, 64, HASHALG_NAMES_ANNOTATED("SHA-256", "unaccelerated"),
+    32, 64, HASHALG_NAMES_BARE("SHA-256"), // WINSCP (removed "unaccelerated" annotation)
 };
 #endif // !WINSCP_VS
 

+ 1 - 1
source/putty/sshsha.c

@@ -320,7 +320,7 @@ static void sha1_sw_final(ssh_hash *hash, uint8_t *digest)
 
 const ssh_hashalg ssh_sha1_sw = {
     sha1_sw_new, sha1_sw_copy, sha1_sw_final, sha1_sw_free,
-    20, 64, HASHALG_NAMES_ANNOTATED("SHA-1", "unaccelerated"),
+    20, 64, HASHALG_NAMES_BARE("SHA-1"), // WINSCP (removed "unaccelerated" annotation)
 };
 
 /* ----------------------------------------------------------------------