#include "crypto.h"
#include "authobj.h"
+int make_challenge(const char *id, const char *pass, const char *nonce,
+ unsigned char *challenge, int *challengesize)
+{
+ serializer_t srl;
+
+ if (serial_init(&srl, challenge, *challengesize)) return -1;
+ if (serial_put(&srl, id, strlen(id)) != strlen(id)) return -1;
+ if (serial_put(&srl, pass, strlen(pass)) != strlen(pass)) return -1;
+ if (serial_put(&srl, nonce, strlen(nonce)) != strlen(nonce)) return -1;
+ if (serial_put(&srl, NULL, 0) != 0) return -1;
+ *challengesize = ((serial_size(&srl) -1) / CBLKSIZE + 1) * CBLKSIZE;
+ return 0;
+}
+
int make_authobj(const char *id, const char *pass, const char *nonce,
const unsigned char *secret, const int secsize,
const unsigned char *payload, const int paysize,
int datasize;
unsigned char datahash[HASHSIZE];
int datahashsize = HASHSIZE;
- unsigned char *hmacdata;
- int hmacdatasize;
+ unsigned char *challenge;
+ int challengesize;
unsigned char key[HASHSIZE];
int keysize = HASHSIZE;
serializer_t srl;
if (serial_put(&srl, NULL, 0) != 0) return -1;
datasize = ((serial_size(&srl) -1) / CBLKSIZE + 1) * CBLKSIZE;
- hmacdatasize = ((strlen(id) + strlen(pass) + strlen(nonce) +
+ challengesize = ((strlen(id) + strlen(pass) + strlen(nonce) +
4 * sizeof(short) - 1) / CBLKSIZE + 1) * CBLKSIZE;
- hmacdata = alloca(hmacdatasize);
- if (serial_init(&srl, hmacdata, hmacdatasize)) return -1;
- if (serial_put(&srl, id, strlen(id)) != strlen(id)) return -1;
- if (serial_put(&srl, pass, strlen(pass)) != strlen(pass)) return -1;
- if (serial_put(&srl, nonce, strlen(nonce)) != strlen(nonce)) return -1;
- if (serial_put(&srl, NULL, 0) != 0) return -1;
- hmacdatasize = ((serial_size(&srl) -1) / CBLKSIZE + 1) * CBLKSIZE;
+ challenge = alloca(challengesize);
+ if (make_challenge(id, pass, nonce, challenge, &challengesize))
+ return -1;
- if (hmac(secret, secsize, hmacdata, hmacdatasize,
+ if (hmac(secret, secsize, challenge, challengesize,
key, &keysize)) return -1;
if (*bufsize < datasize) return -1;
return 0;
}
-int parse_authobj(const unsigned char *hmacdata, const int hmacdatasize,
+int parse_authobj(const unsigned char *key, const int keysize,
const unsigned char *buffer, const int bufsize,
unsigned char *secret, int *secsize,
unsigned char *payload, int *paysize)
unsigned char theirhash[HASHSIZE];
int theirhashsize = HASHSIZE;
- if (decrypt(hmacdata, hmacdatasize, buffer, data, datasize))
+ if (decrypt(key, keysize, buffer, data, datasize))
return -1;
if (serial_init(&srl, data, datasize)) return -1;
tsize = *secsize;
#ifndef _AUTHOBJ_H
#define _AUTHOBJ_H
+int make_challenge(const char *id, const char *pass, const char *nonce,
+ unsigned char *challenge, int *challengesize);
int make_authobj(const char *id, const char *pass, const char *nonce,
const unsigned char *secret, const int secsize,
const unsigned char *payload, const int paysize,
unsigned char *buffer, int *bufsize);
-int parse_authobj(const unsigned char *hmacdata, const int hmacdatasize,
+int parse_authobj(const unsigned char *key, const int keysize,
const unsigned char *buffer, const int bufsize,
unsigned char *secret, int *secsize,
unsigned char *payload, int *paysize);