X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=authobj.h;h=158c52c7d3d145e03845b2742d10e9cbce577be6;hp=b0756542671a0f68ff759e4d8b582b9c58283757;hb=f6b4fd086473f179295386fb47fd422f47015d16;hpb=67023db2952f4c3ec55a247dec401366f6b92e99

diff --git a/authobj.h b/authobj.h
index b075654..158c52c 100644
--- a/authobj.h
+++ b/authobj.h
@@ -1,30 +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
 
+#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 *authobj;
-	int authsize;
+	unsigned char *data;
+	int datasize;
 	unsigned char *payload;
 	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