diff --git a/.gitignore b/.gitignore
index c9629d289..d5d705070 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,8 +54,8 @@ key.der
 key.pem
 certreq.der
 certreq.pem
-pkcs7test.der
-pkcs7test.pem
+pkcs7signedData.der
+pkcs7envelopedData.der
 diff
 sslSniffer/sslSnifferTest/tracefile.txt
 *.gz
diff --git a/ctaocrypt/src/pkcs7.c b/ctaocrypt/src/pkcs7.c
index e47971a2f..2dc3bcd3c 100644
--- a/ctaocrypt/src/pkcs7.c
+++ b/ctaocrypt/src/pkcs7.c
@@ -317,7 +317,7 @@ int PKCS7_EncodeSignedData(PKCS7* pkcs7, byte* output, word32 outputSz)
     byte* flatSignedAttribs = NULL;
     word32 flatSignedAttribsSz = 0;
     word32 innerOidSz = sizeof(innerOid);
-    word32 outerOidSz = sizeof(outerOidSz);
+    word32 outerOidSz = sizeof(outerOid);
 
     XMEMSET(&esd, 0, sizeof(esd));
     InitSha(&esd.sha);
diff --git a/ctaocrypt/test/test.c b/ctaocrypt/test/test.c
index 2ac13908f..b55ed6d13 100644
--- a/ctaocrypt/test/test.c
+++ b/ctaocrypt/test/test.c
@@ -4125,7 +4125,7 @@ int pkcs7_test(void)
             outSz = ret;
 
         /* write PKCS#7 to output file for more testing */
-        pkcs7File = fopen("./pkcs7test.der", "wb");
+        pkcs7File = fopen("./pkcs7signedData.der", "wb");
         if (!pkcs7File)
             return -43;
         ret = (int)fwrite(out, outSz, 1, pkcs7File);