1. Bug fix for taking the size of something.

(Used wrong variable name.)
2. Renamed PKCS7 signed data test output file.
3. Added PKCS7 data test output files to gitignore.
This commit is contained in:
John Safranek
2014-01-15 15:42:27 -08:00
parent cd44227945
commit 36f78c5e1d
3 changed files with 4 additions and 4 deletions

4
.gitignore vendored
View File

@@ -54,8 +54,8 @@ key.der
key.pem key.pem
certreq.der certreq.der
certreq.pem certreq.pem
pkcs7test.der pkcs7signedData.der
pkcs7test.pem pkcs7envelopedData.der
diff diff
sslSniffer/sslSnifferTest/tracefile.txt sslSniffer/sslSnifferTest/tracefile.txt
*.gz *.gz

View File

@@ -317,7 +317,7 @@ int PKCS7_EncodeSignedData(PKCS7* pkcs7, byte* output, word32 outputSz)
byte* flatSignedAttribs = NULL; byte* flatSignedAttribs = NULL;
word32 flatSignedAttribsSz = 0; word32 flatSignedAttribsSz = 0;
word32 innerOidSz = sizeof(innerOid); word32 innerOidSz = sizeof(innerOid);
word32 outerOidSz = sizeof(outerOidSz); word32 outerOidSz = sizeof(outerOid);
XMEMSET(&esd, 0, sizeof(esd)); XMEMSET(&esd, 0, sizeof(esd));
InitSha(&esd.sha); InitSha(&esd.sha);

View File

@@ -4125,7 +4125,7 @@ int pkcs7_test(void)
outSz = ret; outSz = ret;
/* write PKCS#7 to output file for more testing */ /* write PKCS#7 to output file for more testing */
pkcs7File = fopen("./pkcs7test.der", "wb"); pkcs7File = fopen("./pkcs7signedData.der", "wb");
if (!pkcs7File) if (!pkcs7File)
return -43; return -43;
ret = (int)fwrite(out, outSz, 1, pkcs7File); ret = (int)fwrite(out, outSz, 1, pkcs7File);