salsa20: fix more merge conflicts

Author: micolous

salsa20/src/lib.rs

@@ -205,17 +205,6 @@ impl<R: Unsigned> KeyIvInit for SalsaCore<R, U16> {
 
         state[15] = CONSTANTS_16[3];
 
-        cfg_if! {
-            if #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] {
-                state = [
-                    state[0], state[5], state[10], state[15],
-                    state[4], state[9], state[14], state[3],
-                    state[8], state[13], state[2], state[7],
-                    state[12], state[1], state[6], state[11],
-                ];
-            }
-        }
-
         Self {
             state,
             rounds: PhantomData,

salsa20/tests/ecrypt.rs

@@ -51,6 +51,6 @@ fn salsa20_ecrypt16() {
         let mut buf = [0u8; 64];
         c.apply_keystream(&mut buf);
 
-        assert_eq!(buf, expected);
+        assert_eq!(buf, tv.expected);
     }
 }