-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 *key, const int keysize,
- const unsigned char *buffer, const int bufsize,
- unsigned char *secret, int *secsize,
- unsigned char *payload, int *paysize);
+#define AUTHCHUNKSIZE 20
+
+struct _auth_chunk {
+ const char *err;
+ unsigned char data[AUTHCHUNKSIZE];
+};
+
+struct _auth_obj {
+ unsigned char *buffer; /* to be free()'d if not NULL */
+ const char *err; /* non-NULL if failed */
+ unsigned char *data;
+ size_t datasize;
+ unsigned char *payload;
+ size_t paylsize;
+};
+
+/* Construct new or repack old authobj, return payload */
+struct _auth_obj authobj(const char *userid, const char *password,
+ const char *oldnonce, const char *newnonce,
+ const unsigned char *secret, const size_t secsize,
+ const unsigned char *payload, const size_t paysize,
+ const unsigned char *ablob, const size_t blobsize,
+ struct _auth_chunk (*fetch_key)(const unsigned char *chal,
+ const size_t csize));