add lots of debug logging

no logic changes
bgpsecurity · May 12, 2016 · 80ba5eb · 80ba5eb
1 parent 05cfeba
commit 80ba5eb
Show file tree

Hide file tree

Showing 4 changed files with 456 additions and 92 deletions.
diff --git a/lib/rpki/cms/roa_validate.c b/lib/rpki/cms/roa_validate.c
@@ -891,59 +891,85 @@ manifestValidate(
     struct CMS *cmsp,
     int *stalep)
 {
+    LOG(LOG_DEBUG, "manifestValidate(cmsp=%p, stalep=%p)", cmsp, stalep);
+
     err_code iRes;
 
     // Check that content type is id-ct-rpkiManifest
     if (diff_objid(&cmsp->content.signedData.encapContentInfo.eContentType,
                    id_roa_pki_manifest))
-        return ERR_SCM_BADCT;
+    {
+        LOG(LOG_ERR, "manifest has invalid content type");
+        iRes = ERR_SCM_BADCT;
+        goto done;
+    }
 
     // Check version
     struct Manifest *manp =
         &cmsp->content.signedData.encapContentInfo.eContent.manifest;
     if (size_casn(&manp->self) <= 0)
-        return ERR_SCM_BADCT;
+    {
+        LOG(LOG_ERR, "manifest content too small");
+        iRes = ERR_SCM_BADCT;
+        goto done;
+    }
     if ((iRes = check_mft_version(&manp->version.self)) < 0)
-        return iRes;
+    {
+        goto done;
+    }
 
     // Check manifest number
     if ((iRes = check_mft_number(&manp->manifestNumber)) < 0)
-        return iRes;
+    {
+        goto done;
+    }
 
     // Check the hash algorithm
     if (diff_objid(&manp->fileHashAlg, id_sha256))
     {
         LOG(LOG_ERR, "Incorrect hash algorithm");
-        return ERR_SCM_BADHASHALG;
+        iRes = ERR_SCM_BADHASHALG;
+        goto done;
     }
 
     // Check the list of files and hashes
     if ((iRes = check_mft_filenames(&manp->fileList)) < 0)
-        return iRes;
+    {
+        goto done;
+    }
     iRes = check_mft_duplicate_filenames(manp);
     if (iRes < 0)
-        return iRes;
+    {
+        goto done;
+    }
 
     // Check general CMS structure
     iRes = cmsValidate(cmsp);
     if (iRes < 0)
-        return iRes;
+    {
+        goto done;
+    }
 
     struct Certificate *certp =
         &cmsp->content.signedData.certificates.certificate;
 
     // Check dates
     if ((iRes = check_mft_dates(manp, certp, stalep)) < 0)
-        return iRes;
+    {
+        goto done;
+    }
 
     if (has_non_inherit_resources(certp))
     {
         LOG(LOG_ERR, "Manifest's EE certificate has RFC3779 resources "
             "that are not marked inherit");
-        return ERR_SCM_NOTINHERIT;
+        iRes = ERR_SCM_NOTINHERIT;
+        goto done;
     }
-
-    return 0;
+done:
+    LOG(LOG_DEBUG, "manifestValidate() returning %s: %s",
+        err2name(iRes), err2string(iRes));
+    return iRes;
 }
 
 struct certrange {

diff --git a/lib/rpki/myssl.c b/lib/rpki/myssl.c
@@ -41,6 +41,9 @@ char *ASNTimeToDBTime(
     err_code *stap,
     int only_gentime)
 {
+    LOG(LOG_DEBUG, "ASNTimeToDBTime(bef=\"%s\", stap=%p, only_gentime=%d)",
+        bef, stap, only_gentime);
+
     int year;
     int mon;
     int day;
@@ -54,15 +57,17 @@ char *ASNTimeToDBTime(
     int fmt = 0;
     char tz = 0;
     char *ptr;
-    char *out;
+    char *out = NULL;
 
     if (stap == NULL)
-        return (NULL);
+    {
+        goto done;
+    }
     *stap = 0;
     if (bef == NULL || bef[0] == 0)
     {
         *stap = ERR_SCM_INVALARG;
-        return (NULL);
+        goto done;
     }
     // first find and parse the suffix if any
     ptr = strpbrk(bef, "+-");
@@ -73,7 +78,7 @@ char *ASNTimeToDBTime(
             suf_min < 0 || suf_min > 60)
         {
             *stap = ERR_SCM_INVALDT;
-            return (NULL);
+            goto done;
         }
         if (*ptr == '-')
         {
@@ -86,7 +91,7 @@ char *ASNTimeToDBTime(
     if (ptr == NULL)
     {
         *stap = ERR_SCM_INVALDT;
-        return (NULL);
+        goto done;
     }
     fmt = (int)(ptr - bef);
     switch (fmt)
@@ -98,7 +103,7 @@ char *ASNTimeToDBTime(
         if (cnt != 6)
         {
             *stap = ERR_SCM_INVALDT;
-            return (NULL);
+            goto done;
         }
         if (year > 49)
             year += 1900;
@@ -111,7 +116,7 @@ char *ASNTimeToDBTime(
         if (cnt != 7)
         {
             *stap = ERR_SCM_INVALDT;
-            return (NULL);
+            goto done;
         }
         if (year > 49)
             year += 1900;
@@ -124,7 +129,7 @@ char *ASNTimeToDBTime(
         if (cnt != 7)
         {
             *stap = ERR_SCM_INVALDT;
-            return (NULL);
+            goto done;
         }
         break;
     case GEN16:
@@ -133,12 +138,12 @@ char *ASNTimeToDBTime(
         if (cnt != 8)
         {
             *stap = ERR_SCM_INVALDT;
-            return (NULL);
+            goto done;
         }
         break;
     default:
         *stap = ERR_SCM_INVALDT;
-        return (NULL);
+        goto done;
     }
     // validate the time with the suffix
     if (tz != 'Z' || mon < 1 || mon > 12 || day < 1 || day > 31 || hour < 0 ||
@@ -148,7 +153,7 @@ char *ASNTimeToDBTime(
          */
     {
         *stap = ERR_SCM_INVALDT;
-        return (NULL);
+        goto done;
     }
     // we should adjust the time if there is a suffix, but currently we don't
     // next check that the format matches the year. If the year is < 2050
@@ -158,30 +163,34 @@ char *ASNTimeToDBTime(
         if (fmt != GEN14 && fmt != GEN16)
         {
             *stap = ERR_SCM_INVALDT;
-            return (NULL);
+            goto done;
         }
     }
     else
     {
         if (year < 2050 && (fmt == GEN14 || fmt == GEN16))
         {
             *stap = ERR_SCM_INVALDT;
-            return (NULL);
+            goto done;
         }
         if (year >= 2050 && (fmt == UTC10 || fmt == UTC12))
         {
             *stap = ERR_SCM_INVALDT;
-            return (NULL);
+            goto done;
         }
     }
     out = (char *)calloc(48, sizeof(char));
     if (out == NULL)
     {
         *stap = ERR_SCM_NOMEM;
-        return (NULL);
+        goto done;
     }
     xsnprintf(out, 48, "%4d-%02d-%02d %02d:%02d:%02d",
               year, mon, day, hour, min, sec);
+done:
+    LOG(LOG_DEBUG, "ASNTimeToDBTime() returning \"%s\" with error code %s: %s",
+        out, stap ? err2name(*stap) : "NULL",
+        stap ? err2string(*stap) : "NULL");
     return (out);
 }