From 4d9a4865f4446306e2815ac4da409c92243b85b2 Mon Sep 17 00:00:00 2001
From: couturie <you@example.com>
Date: Mon, 16 Apr 2018 17:36:35 +0200
Subject: [PATCH 1/1] new
---
OneRoundIoT/OneRound/one_round_auth.cpp | 1 -
OneRoundIoT/OneRound/one_round_hash_new.cpp | 25 +--------------------
OneRoundIoT/openssl/openssl_evp_gcm.c | 2 +-
3 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/OneRoundIoT/OneRound/one_round_auth.cpp b/OneRoundIoT/OneRound/one_round_auth.cpp
index 9062cad..c47f546 100644
--- a/OneRoundIoT/OneRound/one_round_auth.cpp
+++ b/OneRoundIoT/OneRound/one_round_auth.cpp
@@ -287,7 +287,6 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,uchar *RM2,in
RM2[a+2]=Z[a+2];
RM2[a+3]=Z[a+3];
}
-
}
}
diff --git a/OneRoundIoT/OneRound/one_round_hash_new.cpp b/OneRoundIoT/OneRound/one_round_hash_new.cpp
index a72d301..03242cd 100644
--- a/OneRoundIoT/OneRound/one_round_hash_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_hash_new.cpp
@@ -168,16 +168,7 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, int *PboxRM, uchar *Sbox1,
X[a+3]=RM1[a+3]^seq_in[ind2+a+3];
}
-/* Y[0]=Sbox1[X[0]^X[h-1]];
- for(int a=1;a<h;a++) {
- Y[a]=Sbox1[Y[a-1]^X[a-1]];
- }
- Z[h-1]=Sbox2[Y[h-1]^Y[0]];
- for(int a=h-1;a>0;a--) {
- Z[a-1]=Sbox2[Z[a]^Y[a]];
- }
-*/
Y[0]=X[0]^X[h-1];
for(int a=1;a<h;a++) {
@@ -200,15 +191,6 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, int *PboxRM, uchar *Sbox1,
Z[a-1]=Z[a]^Y[a];
}
- /* for(int a=0;a<h;a+=4) {
- Z[a]=Sbox2[Z[a]];
- Z[a+1]=Sbox2[Z[a+1]];
- Z[a+2]=Sbox2[Z[a+2]];
- Z[a+3]=Sbox2[Z[a+3]];
-
- }*/
-
-
for(int a=0;a<h;a+=4) {
RM1[a]=Z[a];
@@ -216,12 +198,7 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, int *PboxRM, uchar *Sbox1,
RM1[a+2]=Z[a+2];
RM1[a+3]=Z[a+3];
-/*
- RM1[a]=Z[a]^RM1[PboxRM[a]];
- RM1[a+1]=Z[a+1]^RM1[PboxRM[a+1]];
- RM1[a+2]=Z[a+2]^RM1[PboxRM[a+2]];
- RM1[a+3]=Z[a+3]^RM1[PboxRM[a+3]];
-*/
+
}
}
diff --git a/OneRoundIoT/openssl/openssl_evp_gcm.c b/OneRoundIoT/openssl/openssl_evp_gcm.c
index 889d9f5..b49a51c 100644
--- a/OneRoundIoT/openssl/openssl_evp_gcm.c
+++ b/OneRoundIoT/openssl/openssl_evp_gcm.c
@@ -149,7 +149,7 @@ int decryptgcm(unsigned char *ciphertext, int ciphertext_len, unsigned char *aad
* anything else is a failure - the plaintext is not trustworthy.
*/
ret = EVP_DecryptFinal_ex(ctx, plaintext + len, &len);
-CPU }
+ }
/* Clean up */
--
2.39.5