From 53ee1fe7589dce94eb7372f07a792a6c20319669 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Fri, 30 Sep 2016 08:30:05 +0200
Subject: [PATCH] Remove commented out code and avoid inconsistent indentation

---
 .../aes128ctr/portable/afternm_aes128ctr.c    | 65 +++++++++----------
 .../aes128ctr/portable/beforenm_aes128ctr.c   | 49 +++++---------
 2 files changed, 49 insertions(+), 65 deletions(-)

diff --git a/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c
index d8feca50..fea717a1 100644
--- a/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c
+++ b/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c
@@ -9,39 +9,37 @@
 
 int crypto_stream_aes128ctr_afternm(unsigned char *out, unsigned long long len, const unsigned char *nonce, const unsigned char *c)
 {
+    int128 xmm0;
+    int128 xmm1;
+    int128 xmm2;
+    int128 xmm3;
+    int128 xmm4;
+    int128 xmm5;
+    int128 xmm6;
+    int128 xmm7;
+    int128 xmm8;
+    int128 xmm9;
+    int128 xmm10;
+    int128 xmm11;
+    int128 xmm12;
+    int128 xmm13;
+    int128 xmm14;
+    int128 xmm15;
 
-  int128 xmm0;
-  int128 xmm1;
-  int128 xmm2;
-  int128 xmm3;
-  int128 xmm4;
-  int128 xmm5;
-  int128 xmm6;
-  int128 xmm7;
+    int128 nonce_stack;
+    unsigned long long lensav;
+    unsigned char bl[128];
+    unsigned char *blp;
+    unsigned char *np;
+    unsigned char b;
 
-  int128 xmm8;
-  int128 xmm9;
-  int128 xmm10;
-  int128 xmm11;
-  int128 xmm12;
-  int128 xmm13;
-  int128 xmm14;
-  int128 xmm15;
+    uint32_t tmp;
 
-  int128 nonce_stack;
-  unsigned long long lensav;
-  unsigned char bl[128];
-  unsigned char *blp;
-  unsigned char *np;
-  unsigned char b;
+    /* Copy nonce on the stack */
+    copy2(&nonce_stack, (const int128 *) (nonce + 0));
+    np = (unsigned char *)&nonce_stack;
 
-  uint32_t tmp;
-
-  /* Copy nonce on the stack */
-  copy2(&nonce_stack, (const int128 *) (nonce + 0));
-  np = (unsigned char *)&nonce_stack;
-
-    enc_block:
+enc_block:
 
     xmm0 = *(int128 *) (np + 0);
     copy2(&xmm1, &xmm0);
@@ -106,7 +104,7 @@ int crypto_stream_aes128ctr_afternm(unsigned char *out, unsigned long long len,
 
     goto enc_block;
 
-    partial:
+partial:
 
     lensav = len;
     len >>= 4;
@@ -125,7 +123,7 @@ int crypto_stream_aes128ctr_afternm(unsigned char *out, unsigned long long len,
     *(int128 *)(blp + 96) = xmm10;
     *(int128 *)(blp + 112) = xmm13;
 
-    bytes:
+bytes:
 
     if(lensav == 0) goto end;
 
@@ -138,7 +136,7 @@ int crypto_stream_aes128ctr_afternm(unsigned char *out, unsigned long long len,
 
     goto bytes;
 
-    full:
+full:
 
     tmp = LOAD32_BE(np + 12);
     tmp += 8;
@@ -153,7 +151,6 @@ int crypto_stream_aes128ctr_afternm(unsigned char *out, unsigned long long len,
     *(int128 *) (out + 96) = xmm10;
     *(int128 *) (out + 112) = xmm13;
 
-    end:
+end:
     return 0;
-
 }
diff --git a/src/libsodium/crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c
index 0105cf17..264ed3de 100644
--- a/src/libsodium/crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c
+++ b/src/libsodium/crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c
@@ -9,38 +9,25 @@
 
 int crypto_stream_aes128ctr_beforenm(unsigned char *c, const unsigned char *k)
 {
+    int128 xmm0;
+    int128 xmm1;
+    int128 xmm2;
+    int128 xmm3;
+    int128 xmm4;
+    int128 xmm5;
+    int128 xmm6;
+    int128 xmm7;
+    int128 xmm8;
+    int128 xmm9;
+    int128 xmm10;
+    int128 xmm11;
+    int128 xmm12;
+    int128 xmm13;
+    int128 xmm14;
+    int128 xmm15;
+    int128 t;
 
-  /*
-     int64 x0;
-     int64 x1;
-     int64 x2;
-     int64 x3;
-     int64 e;
-     int64 q0;
-     int64 q1;
-     int64 q2;
-     int64 q3;
-     */
-
-  int128 xmm0;
-  int128 xmm1;
-  int128 xmm2;
-  int128 xmm3;
-  int128 xmm4;
-  int128 xmm5;
-  int128 xmm6;
-  int128 xmm7;
-  int128 xmm8;
-  int128 xmm9;
-  int128 xmm10;
-  int128 xmm11;
-  int128 xmm12;
-  int128 xmm13;
-  int128 xmm14;
-  int128 xmm15;
-  int128 t;
-
-  bitslicekey0(k, c)
+    bitslicekey0(k, c)
 
     keyexpbs1(xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15,c)
     keyexpbs(xmm0, xmm1, xmm4, xmm6, xmm3, xmm7, xmm2, xmm5, xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15, xor_rcon(&xmm1);, 2,c)