Remove Into impls for Memzero.

util/mem/src/lib.rs

@@ -55,21 +55,3 @@ impl<T: AsMut<[u8]>> DerefMut for Memzero<T> {
 	}
 }
 
-impl Into<[u8; 8]> for Memzero<[u8; 8]> {
-	fn into(self) -> [u8; 8] {
-		self.mem
-	}
-}
-
-impl Into<[u8; 16]> for Memzero<[u8; 16]> {
-	fn into(self) -> [u8; 16] {
-		self.mem
-	}
-}
-
-impl Into<[u8; 32]> for Memzero<[u8; 32]> {
-	fn into(self) -> [u8; 32] {
-		self.mem
-	}
-}
-

whisper/src/rpc/crypto.rs

@@ -107,12 +107,10 @@ impl EncryptionInstance {
 					}
 					AesEncode::OnTopics(topics) => {
 						let mut buf = Vec::new();
-						let key = H256(key.into());
-
-						for topic in topics {
-							buf.extend(&*(topic ^ key));
+						for mut t in topics {
+							xor(&mut t.0, &key);
+							buf.extend(&t.0);
 						}
-
 						encrypt_plain(&mut buf);
 						buf
 					}
@@ -126,6 +124,13 @@ impl EncryptionInstance {
 	}
 }
 
+#[inline]
+fn xor(a: &mut [u8; 32], b: &[u8; 32]) {
+	for i in 0 .. 32 {
+		a[i] ^= b[i]
+	}
+}
+
 enum AesExtract {
 	AppendedNonce(Memzero<[u8; AES_KEY_LEN]>), // extract appended nonce.
 	OnTopics(usize, usize, H256), // number of topics, index we know, topic we know.