From 7585e92fee5eac2bf7596bdf2cd60db64ae93cce Mon Sep 17 00:00:00 2001
From: toddouska <todd@wolfssl.com>
Date: Tue, 19 Nov 2013 16:56:49 -0800
Subject: [PATCH] allow cert signing w/o Cert object, buffer only

---
 IDE/MDK5-ARM/Projects/CryptTest/test.c   |  6 ++++--
 IDE/MDK5-ARM/Projects/CyaSSL-Full/test.c |  6 ++++--
 ctaocrypt/src/asn.c                      | 19 +++++++++----------
 ctaocrypt/test/test.c                    |  9 ++++++---
 cyassl/ctaocrypt/asn_public.h            |  4 ++--
 5 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/IDE/MDK5-ARM/Projects/CryptTest/test.c b/IDE/MDK5-ARM/Projects/CryptTest/test.c
index 7ba1b0b39..086032ab7 100644
--- a/IDE/MDK5-ARM/Projects/CryptTest/test.c
+++ b/IDE/MDK5-ARM/Projects/CryptTest/test.c
@@ -2779,7 +2779,8 @@ int rsa_test(void)
         if (certSz < 0)
             return -407;
 
-        certSz = SignCert(&myCert, derCert, FOURK_BUF, &caKey, &rng);
+        certSz = SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF,
+                          &caKey, &rng);
         if (certSz < 0)
             return -408;
 
@@ -2891,7 +2892,8 @@ int rsa_test(void)
         if (certSz < 0)
             return -456;
 
-        certSz = SignCert(&myCert, derCert, FOURK_BUF, &caKey, &rng);
+        certSz = SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF,
+                          &caKey, &rng);
         if (certSz < 0)
             return -457;
 
diff --git a/IDE/MDK5-ARM/Projects/CyaSSL-Full/test.c b/IDE/MDK5-ARM/Projects/CyaSSL-Full/test.c
index 6165cee31..22b4070eb 100644
--- a/IDE/MDK5-ARM/Projects/CyaSSL-Full/test.c
+++ b/IDE/MDK5-ARM/Projects/CyaSSL-Full/test.c
@@ -2550,7 +2550,8 @@ int rsa_test(void)
         if (certSz < 0)
             return -407;
 
-        certSz = SignCert(&myCert, derCert, FOURK_BUF, &caKey, &rng);
+        certSz = SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF,
+                          &caKey, &rng);
         if (certSz < 0)
             return -408;
 
@@ -2662,7 +2663,8 @@ int rsa_test(void)
         if (certSz < 0)
             return -456;
 
-        certSz = SignCert(&myCert, derCert, FOURK_BUF, &caKey, &rng);
+        certSz = SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF,
+                          &caKey, &rng);
         if (certSz < 0)
             return -457;
 
diff --git a/ctaocrypt/src/asn.c b/ctaocrypt/src/asn.c
index 5f276af4f..d36d43c92 100644
--- a/ctaocrypt/src/asn.c
+++ b/ctaocrypt/src/asn.c
@@ -4592,25 +4592,24 @@ int  MakeNtruCert(Cert* cert, byte* derBuffer, word32 derSz,
 #endif /* HAVE_NTRU */
 
 
-int SignCert(Cert* cert, byte* buffer, word32 buffSz, RsaKey* rsaKey,
-             ecc_key* eccKey, RNG* rng)
+int SignCert(int requestSz, int sigType, byte* buffer, word32 buffSz,
+             RsaKey* rsaKey, ecc_key* eccKey, RNG* rng)
 {
     byte    sig[MAX_ENCODED_SIG_SZ];
     int     sigSz;
-    int     bodySz = cert->bodySz;
 
-    if (bodySz < 0)
-        return bodySz;
+    if (requestSz < 0)
+        return requestSz;
 
-    sigSz  = MakeSignature(buffer, bodySz, sig, sizeof(sig), rsaKey, eccKey,
-                           rng, cert->sigType);
+    sigSz = MakeSignature(buffer, requestSz, sig, sizeof(sig), rsaKey, eccKey,
+                          rng, sigType);
     if (sigSz < 0)
         return sigSz; 
 
-    if (bodySz + MAX_SEQ_SZ * 2 + sigSz > (int)buffSz)
+    if (requestSz + MAX_SEQ_SZ * 2 + sigSz > (int)buffSz)
         return BUFFER_E; 
 
-    return AddSignature(buffer, bodySz, sig, sigSz, cert->sigType);
+    return AddSignature(buffer, requestSz, sig, sigSz, sigType);
 }
 
 
@@ -4621,7 +4620,7 @@ int MakeSelfCert(Cert* cert, byte* buffer, word32 buffSz, RsaKey* key, RNG* rng)
     if (ret < 0)
         return ret;
 
-    return SignCert(cert, buffer, buffSz, key, NULL, rng);
+    return SignCert(cert->bodySz, cert->sigType, buffer, buffSz, key, NULL,rng);
 }
 
 
diff --git a/ctaocrypt/test/test.c b/ctaocrypt/test/test.c
index 8d26487eb..b213ddd39 100644
--- a/ctaocrypt/test/test.c
+++ b/ctaocrypt/test/test.c
@@ -2802,7 +2802,8 @@ int rsa_test(void)
         if (certSz < 0)
             return -407;
 
-        certSz = SignCert(&myCert, derCert, FOURK_BUF, &caKey, NULL, &rng);
+        certSz = SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF,
+                          &caKey, NULL, &rng);
         if (certSz < 0)
             return -408;
 
@@ -2890,7 +2891,8 @@ int rsa_test(void)
         if (certSz < 0)
             return -5407;
 
-        certSz = SignCert(&myCert, derCert, FOURK_BUF, NULL, &caKey, &rng);
+        certSz = SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF,
+                          NULL, &caKey, &rng);
         if (certSz < 0)
             return -5408;
 
@@ -3002,7 +3004,8 @@ int rsa_test(void)
         if (certSz < 0)
             return -456;
 
-        certSz = SignCert(&myCert, derCert, FOURK_BUF, &caKey, NULL, &rng);
+        certSz = SignCert(myCert.bodySz, myCert.sigType, derCert, FOURK_BUF,
+                          &caKey, NULL, &rng);
         if (certSz < 0)
             return -457;
 
diff --git a/cyassl/ctaocrypt/asn_public.h b/cyassl/ctaocrypt/asn_public.h
index 6fdc0117d..17fafc3fa 100644
--- a/cyassl/ctaocrypt/asn_public.h
+++ b/cyassl/ctaocrypt/asn_public.h
@@ -127,8 +127,8 @@ typedef struct Cert {
 CYASSL_API void InitCert(Cert*);
 CYASSL_API int  MakeCert(Cert*, byte* derBuffer, word32 derSz, RsaKey*,
                          ecc_key*, RNG*);
-CYASSL_API int  SignCert(Cert*, byte* derBuffer, word32 derSz, RsaKey*,
-                         ecc_key*, RNG*);
+CYASSL_API int  SignCert(int requestSz, int sigType, byte* derBuffer,
+                         word32 derSz, RsaKey*, ecc_key*, RNG*);
 CYASSL_API int  MakeSelfCert(Cert*, byte* derBuffer, word32 derSz, RsaKey*,
                              RNG*);
 CYASSL_API int  SetIssuer(Cert*, const char*);