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

Fix null deref in arc_message() / Add signature margin wrapping / Add arc_get_cv() #166

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix null deref in arc_message() / Add signature margin wrapping / Add arc_get_cv() #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6450f69
Fixed null dereference on malloc() failure in arc_message()
Oct 22, 2023
d1791c4
Populate keytype and keybits for AMS header generation
Oct 22, 2023
31bc5f2
Add signature margin wrapping for AMS and AS
Oct 22, 2023
62e9cb3
Strip leading whitespace when AR begins with whitespace in AAR genera…
Oct 22, 2023
f6e81da
Added arc_get_cv()
Oct 22, 2023
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
100 changes: 81 additions & 19 deletions libopenarc/arc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2011,6 +2011,7 @@ arc_validate_msg(ARC_MESSAGE *msg, u_int setnum)
arc_error(msg, "EVP_PKEY_get1_RSA() failed");
return ARC_STAT_INTERNAL;
}
msg->arc_keytype = ARC_KEYTYPE_RSA;

keysize = RSA_size(rsa);
if (keysize * 8 < msg->arc_library->arcl_minkeysize)
Expand All @@ -2022,6 +2023,7 @@ arc_validate_msg(ARC_MESSAGE *msg, u_int setnum)
BIO_free(keydata);
return ARC_STAT_CANTVRFY;
}
msg->arc_keybits = keysize * 8;

alg = arc_param_get(kvset, "a");
nid = NID_sha1;
Expand Down Expand Up @@ -2211,21 +2213,21 @@ arc_message(ARC_LIB *lib, arc_canon_t canonhdr, arc_canon_t canonbody,
return NULL;
}

msg = (ARC_MESSAGE *) malloc(sizeof *msg);
msg = malloc(sizeof *msg);
if (msg == NULL)
{
*err = strerror(errno);
if (err != NULL)
*err = strerror(errno);
return NULL;
}
else
{
memset(msg, '\0', sizeof *msg);

msg->arc_library = lib;
if (lib->arcl_fixedtime != 0)
msg->arc_timestamp = lib->arcl_fixedtime;
else
(void) time(&msg->arc_timestamp);
}
memset(msg, '\0', sizeof *msg);

msg->arc_library = lib;
if (lib->arcl_fixedtime != 0)
msg->arc_timestamp = lib->arcl_fixedtime;
else
(void) time(&msg->arc_timestamp);

msg->arc_canonhdr = canonhdr;
msg->arc_canonbody = canonbody;
Expand Down Expand Up @@ -2968,6 +2970,24 @@ arc_set_cv(ARC_MESSAGE *msg, ARC_CHAIN cv)
msg->arc_cstate = cv;
}

/*
** ARC_GET_CV -- get the chain state
**
** Parameters:
** msg -- ARC_MESSAGE object
**
** Return value:
** An ARC_CHAIN_* constant.
*/

ARC_CHAIN
arc_get_cv(ARC_MESSAGE *msg)
{
assert(msg != NULL);

return msg->arc_cstate;
}

/*
** ARC_GETSEAL -- get the "seal" to apply to this message
**
Expand Down Expand Up @@ -3009,6 +3029,9 @@ arc_getseal(ARC_MESSAGE *msg, ARC_HDRFIELD **seal, char *authservid,
BIO *keydata;
EVP_PKEY *pkey;
RSA *rsa;
int n;
char *x;
char *y;

assert(msg != NULL);
assert(seal != NULL);
Expand Down Expand Up @@ -3060,6 +3083,7 @@ arc_getseal(ARC_MESSAGE *msg, ARC_HDRFIELD **seal, char *authservid,
BIO_free(keydata);
return ARC_STAT_NORESOURCE;
}
msg->arc_keytype = ARC_KEYTYPE_RSA;

keysize = RSA_size(rsa);
if (keysize * 8 < msg->arc_library->arcl_minkeysize)
Expand All @@ -3071,6 +3095,7 @@ arc_getseal(ARC_MESSAGE *msg, ARC_HDRFIELD **seal, char *authservid,
BIO_free(keydata);
return ARC_STAT_CANTVRFY;
}
msg->arc_keybits = keysize * 8;

sigout = malloc(keysize);
if (sigout == NULL)
Expand Down Expand Up @@ -3111,9 +3136,10 @@ arc_getseal(ARC_MESSAGE *msg, ARC_HDRFIELD **seal, char *authservid,
** Part 1: Construct a new AAR
*/

arc_dstring_printf(dstr, "ARC-Authentication-Results: i=%u; %s; %s",
arc_dstring_printf(dstr, "ARC-Authentication-Results: i=%u; %s;%s%s",
msg->arc_nsets + 1,
msg->arc_authservid,
ar != NULL && isspace(ar[0]) ? "" : " ",
ar == NULL ? "none" : (char *) ar);
status = arc_parse_header_field(msg, arc_dstring_get(dstr),
arc_dstring_len(dstr), &h);
Expand Down Expand Up @@ -3247,10 +3273,28 @@ arc_getseal(ARC_MESSAGE *msg, ARC_HDRFIELD **seal, char *authservid,
return ARC_STAT_INTERNAL;
}

/* append it to the stub */
arc_dstring_cat(dstr, b64sig);
/* wrap and append it to the stub */

len = 10; // "\tb="

x = b64sig;
y = b64sig + b64siglen;

while (x < y)
{ /* break at margins */
if (msg->arc_margin - len == 0)
{
arc_dstring_catn(dstr, (u_char *) "\n\t ", 3);
len = 9; // "\t "
}

n = MIN(msg->arc_margin - len, y - x);

/* XXX -- wrapping needs to happen here */
arc_dstring_catn(dstr, (u_char *) x, n);

x += n;
len += n;
}

/* add it to the seal */
h = malloc(sizeof hdr);
Expand Down Expand Up @@ -3388,10 +3432,28 @@ arc_getseal(ARC_MESSAGE *msg, ARC_HDRFIELD **seal, char *authservid,
return ARC_STAT_INTERNAL;
}

/* append it to the stub */
arc_dstring_cat(dstr, b64sig);
/* wrap and append it to the stub */

/* XXX -- wrapping needs to happen here */
len = 10; // "\tb="

x = b64sig;
y = b64sig + b64siglen;

while (x < y)
{ /* break at margins */
if (msg->arc_margin - len == 0)
{
arc_dstring_catn(dstr, (u_char *) "\n\t ", 3);
len = 9; // "\t "
}

n = MIN(msg->arc_margin - len, y - x);

arc_dstring_catn(dstr, (u_char *) x, n);

x += n;
len += n;
}

/* add it to the seal */
h = malloc(sizeof hdr);
Expand Down Expand Up @@ -3420,7 +3482,7 @@ arc_getseal(ARC_MESSAGE *msg, ARC_HDRFIELD **seal, char *authservid,
}
h->hdr_colon = h->hdr_text + ARC_SEAL_HDRNAMELEN;
h->hdr_namelen = ARC_SEAL_HDRNAMELEN;
h->hdr_textlen = len;
h->hdr_textlen = arc_dstring_len(dstr);
h->hdr_flags = 0;
h->hdr_next = NULL;

Expand Down
12 changes: 12 additions & 0 deletions libopenarc/arc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,18 @@ extern ARC_STAT arc_eom __P((ARC_MESSAGE *));

extern void arc_set_cv(ARC_MESSAGE *, ARC_CHAIN);

/*
** ARC_GET_CV -- get the chain state
**
** Parameters:
** msg -- ARC_MESSAGE object
**
** Return value:
** An ARC_CHAIN_* constant.
*/

extern ARC_CHAIN arc_get_cv(ARC_MESSAGE *);

/*
** ARC_GETSEAL -- get the "seal" to apply to this message
**
Expand Down