fix indentation and enum conflict

This commit is contained in:
Moisés Guimarães 2015-10-28 12:20:20 -03:00
parent cddebfa941
commit 071a452bec
2 changed files with 21 additions and 7 deletions

View File

@ -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;
}

View File

@ -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 */