Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add debug logging #46

Closed
wants to merge 6 commits into from
Closed

Add debug logging #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de0cbc6
delete commented-out code
rhansen Mar 5, 2016
bed8364
don't use an SQLRETURN to hold an err_code
rhansen Mar 5, 2016
969c2f1
use ODBC types and eliminate casts
rhansen Mar 5, 2016
50453f5
reduce size of state array
rhansen Mar 5, 2016
05cfeba
swap argument order to match SQLGetDiagRec()
rhansen Mar 5, 2016
80ba5eb
add lots of debug logging
rhansen Dec 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 38 additions & 12 deletions lib/rpki/cms/roa_validate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
39 changes: 24 additions & 15 deletions lib/rpki/myssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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, "+-");
Expand All @@ -73,7 +78,7 @@ char *ASNTimeToDBTime(
suf_min < 0 || suf_min > 60)
{
*stap = ERR_SCM_INVALDT;
return (NULL);
goto done;
}
if (*ptr == '-')
{
Expand All @@ -86,7 +91,7 @@ char *ASNTimeToDBTime(
if (ptr == NULL)
{
*stap = ERR_SCM_INVALDT;
return (NULL);
goto done;
}
fmt = (int)(ptr - bef);
switch (fmt)
Expand All @@ -98,7 +103,7 @@ char *ASNTimeToDBTime(
if (cnt != 6)
{
*stap = ERR_SCM_INVALDT;
return (NULL);
goto done;
}
if (year > 49)
year += 1900;
Expand All @@ -111,7 +116,7 @@ char *ASNTimeToDBTime(
if (cnt != 7)
{
*stap = ERR_SCM_INVALDT;
return (NULL);
goto done;
}
if (year > 49)
year += 1900;
Expand All @@ -124,7 +129,7 @@ char *ASNTimeToDBTime(
if (cnt != 7)
{
*stap = ERR_SCM_INVALDT;
return (NULL);
goto done;
}
break;
case GEN16:
Expand All @@ -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 ||
Expand All @@ -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
Expand All @@ -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);
}

Expand Down
Loading