X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=authobj.h;h=4c931969e182d08d23797368a7aaa2d8ba4121ad;hp=cc5baedde5b827e5f12bc774f8dc6991c3dc2c22;hb=dc8959a3cb5615448ea9307a3277e608ffd8a6dd;hpb=1fb61b04544488148032c06475042aec167d6097

diff --git a/authobj.h b/authobj.h
index cc5baed..4c93196 100644
--- a/authobj.h
+++ b/authobj.h
@@ -1,17 +1,29 @@
 #ifndef _AUTHOBJ_H
 #define _AUTHOBJ_H
 
-enum aobj_err {aoe_serial, aoe_size, aoe_crypt, aoe_data};
+#define AUTHCHUNKSIZE 20
 
-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,
+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;
+	int datasize;
+	unsigned char *payload;
+	int 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 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);
+		const unsigned char *ablob, const int blobsize,
+		struct _auth_chunk (*fetch_key)(const unsigned char *chal,
+						const int csize));
 
 #endif