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

diff --git a/authobj.h b/authobj.h
index cc5baed..158c52c 100644
--- a/authobj.h
+++ b/authobj.h
@@ -1,17 +1,52 @@
+/*
+Copyright (c) 2013 Eugene Crosser
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must
+    not claim that you wrote the original software. If you use this
+    software in a product, an acknowledgment in the product documentation
+    would be appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source
+    distribution.
+*/
+
 #ifndef _AUTHOBJ_H
 #define _AUTHOBJ_H
 
-enum aobj_err {aoe_serial, aoe_size, aoe_crypt, aoe_data};
+#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;
+	int datasize;
+	unsigned char *payload;
+	int paylsize;
+};
 
-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,
+/* 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