From 071a452bec4b981ce236a0a3243c528ce8149750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moise=CC=81s=20Guimara=CC=83es?= <moises@wolfssl.com>
Date: Wed, 28 Oct 2015 12:20:20 -0300
Subject: [PATCH] fix indentation and enum conflict

---
 wolfcrypt/src/asn.c       | 26 ++++++++++++++++++++------
 wolfssl/wolfcrypt/types.h |  2 +-
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 90e9e19b6..e6ef3e241 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -8824,14 +8824,28 @@ word32 EncodeOcspRequestExtensions(OcspRequest* req, byte* output, word32 size)
     if (totalSz < size)
     {
         totalSz = 0;
-        XMEMCPY(output + totalSz, seqArray[5], seqSz[5]); totalSz += seqSz[5];
-        XMEMCPY(output + totalSz, seqArray[4], seqSz[4]); totalSz += seqSz[4];
-        XMEMCPY(output + totalSz, seqArray[3], seqSz[3]); totalSz += seqSz[3];
-        XMEMCPY(output + totalSz, seqArray[2], seqSz[2]); totalSz += seqSz[2];
+        
+        XMEMCPY(output + totalSz, seqArray[5], seqSz[5]);
+        totalSz += seqSz[5];
+        
+        XMEMCPY(output + totalSz, seqArray[4], seqSz[4]);
+        totalSz += seqSz[4];
+        
+        XMEMCPY(output + totalSz, seqArray[3], seqSz[3]);
+        totalSz += seqSz[3];
+        
+        XMEMCPY(output + totalSz, seqArray[2], seqSz[2]);
+        totalSz += seqSz[2];
+        
         XMEMCPY(output + totalSz, NonceObjId, sizeof(NonceObjId));
         totalSz += (word32)sizeof(NonceObjId);
-        XMEMCPY(output + totalSz, seqArray[1], seqSz[1]); totalSz += seqSz[1];
-        XMEMCPY(output + totalSz, seqArray[0], seqSz[0]); totalSz += seqSz[0];
+        
+        XMEMCPY(output + totalSz, seqArray[1], seqSz[1]);
+        totalSz += seqSz[1];
+        
+        XMEMCPY(output + totalSz, seqArray[0], seqSz[0]);
+        totalSz += seqSz[0];
+        
         XMEMCPY(output + totalSz, req->nonce, req->nonceSz);
         totalSz += req->nonceSz;
     }
diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h
index 9532c26d9..8e49678c0 100644
--- a/wolfssl/wolfcrypt/types.h
+++ b/wolfssl/wolfcrypt/types.h
@@ -287,7 +287,7 @@
 	    DYNAMIC_TYPE_HASHES       = 46,
         DYNAMIC_TYPE_SRP          = 47,
         DYNAMIC_TYPE_COOKIE_PWD   = 48,
-        DYNAMIC_TYPE_OCSP_REQUEST = 49,
+        DYNAMIC_TYPE_OCSP_REQUEST = 50
 	};
 
 	/* max error buffer string size */