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

diff --git a/authobj.h b/authobj.h
index be4f64b..4c93196 100644
--- a/authobj.h
+++ b/authobj.h
@@ -1,6 +1,13 @@
 #ifndef _AUTHOBJ_H
 #define _AUTHOBJ_H
 
+#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 */
@@ -10,21 +17,13 @@ struct _auth_obj {
 	int paylsize;
 };
 
-/* Construct new authobj from the given secret and other data */
-struct _auth_obj new_authobj(const char *userid, const char *password,
-				const char *nonce,
-			const unsigned char *secret, const int secsize,
-			const unsigned char *payload, const int paysize);
-
-/* Unwrap old authobj, extract payload, construct new one with newnonce */
-struct _auth_obj verify_authobj(const char *userid, const char *password,
-				const char *oldnonce, const char *newnonce,
-			const unsigned char *authobj, const int authsize);
-
-/* Unwrap old authobj, replace the payload, construct new one with newnonce */
-struct _auth_obj reload_authobj(const char *userid, const char *password,
-				const char *oldnonce, const char *newnonce,
-			const unsigned char *authobj, const int authsize,
-			const unsigned char *payload, const int paysize);
+/* 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,
+		const unsigned char *ablob, const int blobsize,
+		struct _auth_chunk (*fetch_key)(const unsigned char *chal,
+						const int csize));
 
 #endif