scrypt_nosse: Remove the 64-bit version of blkxor()

It broke strict aliasing. Also remove ARCH_BITS that is not required any longer. Fixes #1301
jedisct1 · Aug 31, 2023 · 6256e09 · 6256e09
1 parent 9e42094
commit 6256e09
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h b/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h
@@ -34,12 +34,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#if SIZE_MAX > 0xffffffffULL
-#define ARCH_BITS 64
-#else
-#define ARCH_BITS 32
-#endif
-
 #define crypto_pwhash_scryptsalsa208sha256_STRPREFIXBYTES 14
 #define crypto_pwhash_scryptsalsa208sha256_STRSETTINGBYTES 57
 #define crypto_pwhash_scryptsalsa208sha256_STRSALTBYTES 32

diff --git a/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c b/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c
@@ -49,17 +49,9 @@ blkxor(uint32_t *dest, const uint32_t *src, size_t len)
 {
     size_t i;
 
-#if ARCH_BITS == 32
     for (i = 0; i < len * 16; i++) {
         dest[i] ^= src[i];
     }
-#else
-    uint64_t       *dest_ = (uint64_t *) (void *) dest;
-    const uint64_t *src_  = (const uint64_t *) (const void *) src;
-    for (i = 0; i < len * 8; i++) {
-        dest_[i] ^= src_[i];
-    }
-#endif
 }
 
 /*