From dc8959a3cb5615448ea9307a3277e608ffd8a6dd Mon Sep 17 00:00:00 2001 From: Eugene Crosser Date: Mon, 2 Dec 2013 13:40:48 +0400 Subject: [PATCH] wip single-function authobj --- authobj.c | 118 +++++++++++++++++++++++++----------------------------- 1 file changed, 54 insertions(+), 64 deletions(-) diff --git a/authobj.c b/authobj.c index d6f4f09..f8d577d 100644 --- a/authobj.c +++ b/authobj.c @@ -42,7 +42,7 @@ make_challenge(const char *uid, const char *pass, const char *nonce) } static struct _auth_chunk -make_key(const unsigned char *challenge, const int challengesize, +new_key(const unsigned char *challenge, const int challengesize, const unsigned char *secret, const int secsize) { struct _auth_chunk ho = {0}; @@ -58,6 +58,35 @@ make_key(const unsigned char *challenge, const int challengesize, return ho; } +static struct _auth_chunk +make_key(const char *userid, const char *password, const char *nonce, + const unsigned char *secret, const int secsize, + struct _auth_chunk (*fetch_key)(const unsigned char *chal, + const int csize)) +{ + struct _auth_chunk ho_chal, ho_key = {0}; + + if (!userid || !password || !nonce) { + ho_key.err = "make_key: missing uid, pass or nonce"; + return ho_key; + } + ho_chal = make_challenge(userid, password, nonce); + if (ho_chal.err) { + ho_key.err = ho_chal.err; + return ho_key; + } + if (secret && secsize) { + ho_key = new_key(ho_chal.data, sizeof(ho_chal.data), + secret, secsize); + } else if (fetch_key) { + ho_key = (*fetch_key)(ho_chal.data, sizeof(ho_chal.data)); + } else { + ho_key.err = "make_key: neither secret nor fetch_key present"; + } + memset(&ho_chal, 0, sizeof(ho_chal)); + return ho_key; +} + static struct _auth_obj make_authobj(char *userid, char *password, char *nonce, const unsigned char *secret, const int secsize, @@ -71,17 +100,13 @@ make_authobj(char *userid, char *password, char *nonce, int datahashsize = HASHSIZE; serializer_t srl; - if (keysize < CBLKSIZE) { - ao.err = "make authobj: key too short"; - return ao; - } - datasize = ((secsize + paysize + HASHSIZE + 4 * sizeof(short) - 1) / + datasize = ((secsize + paylsize + HASHSIZE + 4 * sizeof(short) - 1) / CBLKSIZE + 1) * CBLKSIZE; data = alloca(datasize); serial_init(&srl, data, datasize); if (serial_put(&srl, secret, secsize) != secsize) { ao.err = "authobj: serialization of secret failed"; - } else if (serial_put(&srl, payload, paysize) != paysize) { + } else if (serial_put(&srl, payload, paylsize) != paylsize) { ao.err = "authobj: serialization of payload failed"; } else if ((rc = hash(data, serial_size(&srl), datahash, &datahashsize))) { @@ -90,29 +115,32 @@ make_authobj(char *userid, char *password, char *nonce, ao.err = "authobj: serialization of hash failed"; } else if (serial_put(&srl, NULL, 0) != 0) { ao.err = "authobj: serialization of terminator failed"; - } - - if (!ao.err) { + } else { unsigned long lrc; int osize = ((serial_size(&srl) -1) / CBLKSIZE + 1) * CBLKSIZE; + struct _auth_chunk ho_key; - if ((ao.buffer = malloc(osize + paysize)) == NULL) { + ho_key = make_key(userid, password, nonce, + secret, secsize, NULL); + if (ho_key.err) { + ao.err = ho_key.err; + } else if ((ao.buffer = malloc(osize + paylsize)) == NULL) { ao.err = "make authobj: malloc failed"; - } else if ((lrc = encrypt(key, CBLKSIZE, data, + } else if ((lrc = encrypt(ho_key.data, CBLKSIZE, data, ao.buffer, osize))) { ao.err = crypto_errstr(lrc); } else { ao.data = ao.buffer; ao.datasize = osize; - if (payload && paysize) { + if (payload && paylsize) { /* payload passthrough */ ao.payload = ao.data + osize; - memcpy(ao.payload, payload, paysize); - ao.paylsize = paysize; + memcpy(ao.payload, payload, paylsize); + ao.paylsize = paylsize; } } + memset(&ho_key, 0, sizeof(ho_key)); } - memset(data, 0, datasize); return ao; } @@ -126,12 +154,15 @@ parse_authobj(char *userid, char *password, char *nonce, { unsigned long rc; struct _auth_obj ao = {0}; + struct _auth_chunk ho_key; - if (keysize < CBLKSIZE) { - ao.err = "parse authobj: key too short"; - } else if ((ao.buffer = malloc(bufsize)) == NULL) { + ho_key = make_key(userid, password, nonce, secret, secsize, fetch_key); + if (ho_key.err) { + ao.err = ho_key.err; + } else if ((ao.buffer = malloc(blobsize)) == NULL) { ao.err = "parse authobj: malloc failed"; - } else if ((rc = decrypt(key, CBLKSIZE, buffer, ao.buffer, bufsize))) { + } else if ((rc = decrypt(ho_key.data, CBLKSIZE, + ablob, ao.buffer, blobsize))) { ao.err = crypto_errstr(rc); } else { serializer_t srl; @@ -141,7 +172,7 @@ parse_authobj(char *userid, char *password, char *nonce, int theirhsize; unsigned long rc; - serial_init(&srl, ao.buffer, bufsize); + serial_init(&srl, ao.buffer, blobsize); if (serial_get(&srl, (void**)&ao.data, &ao.datasize)) { ao.err = "mismatch: impossible secret"; } else if (serial_get(&srl, (void**)&ao.payload, &ao.paylsize)) { @@ -158,6 +189,7 @@ parse_authobj(char *userid, char *password, char *nonce, ao.err = "mismatch: different hash"; } } + memset(&ho_key, 0, sizeof(ho_key)); return ao; } @@ -209,52 +241,10 @@ struct _auth_obj authobj(const char *userid, const char *password, new_ao = make_authobj(userid, password, newnonce, - wsecret, wsecsize, wpayload, wpaysize); + wsecret, wsecsize, wpayload, wpaylsize); if (old_ao.data) memset(old_ao.data, 0, old_ao.datasize); if (old_ao.payload) memset(old_ao.payload, 0, old_ao.paylsize); if (old_ao.buffer) free(old_ao.buffer); return new_ao; } - -void dummy() { - struct _auth_chunk ho_chal, ho_key; - - ho_chal = make_challenge(userid, password, oldnonce); - if (ho_chal.err) { - new_ao.err = ho_chal.err; - return new_ao; - } - ho_key = (*fetch_key)(ho_chal.hash, sizeof(ho_chal.hash)); - memset(&ho_chal, 0, sizeof(ho_chal)); - if (ho_key.err) { - new_ao.err = ho_key.err; - return new_ao; - } - old_ao = parse_authobj(ho_key.hash, sizeof(ho_key.hash), - authobj, authsize); - memset(&ho_key, 0, sizeof(ho_key)); - if (old_ao.err) { - new_ao.err = old_ao.err; - if (old_ao.buffer) free(old_ao.buffer); - return new_ao; - } - - ho_chal = make_challenge(userid, password, newnonce); - if (ho_chal.err) { - new_ao.err = ho_chal.err; - return new_ao; - } - ho_key = make_key(ho_chal.hash, sizeof(ho_chal.hash), - old_ao.data, old_ao.datasize); - memset(&ho_chal, 0, sizeof(ho_chal)); - if (ho_key.err) { - new_ao.err = ho_key.err; - return new_ao; - } - new_ao = make_authobj(ho_key.hash, sizeof(ho_key.hash), - old_ao.data, old_ao.datasize, - old_ao.payload, old_ao.paylsize); - memset(&ho_key, 0, sizeof(ho_key)); - -} -- 2.39.2