X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=authobj.c;h=b402094df224cd13651227c15e47bb9184976343;hp=f8d577d8d66eb43efbcf89409c620791ceca0ca9;hb=b4ed664ffb6e3f3764fa2b2f4b05437df43d7f19;hpb=dc8959a3cb5615448ea9307a3277e608ffd8a6dd

diff --git a/authobj.c b/authobj.c
index f8d577d..b402094 100644
--- a/authobj.c
+++ b/authobj.c
@@ -1,13 +1,36 @@
+/*
+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.
+*/
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include <alloca.h>
 #include "serial.h"
 #include "crypto.h"
 #include "authobj.h"
-#include "pcsc_cr.h"
 
 static struct _auth_chunk
 make_challenge(const char *uid, const char *pass, const char *nonce)
@@ -88,7 +111,7 @@ make_key(const char *userid, const char *password, const char *nonce,
 }
 
 static struct _auth_obj
-make_authobj(char *userid, char *password, char *nonce,
+make_authobj(const char *userid, const char *password, const char *nonce,
 		const unsigned char *secret, const int secsize,
 		const unsigned char *payload, const int paylsize)
 {
@@ -146,7 +169,7 @@ make_authobj(char *userid, char *password, char *nonce,
 }
 
 static struct _auth_obj
-parse_authobj(char *userid, char *password, char *nonce,
+parse_authobj(const char *userid, const char *password, const char *nonce,
 		const unsigned char *secret, const int secsize,
 		const unsigned char *ablob, const int blobsize,
 		struct _auth_chunk (*fetch_key)(const unsigned char *chal,
@@ -201,11 +224,11 @@ struct _auth_obj authobj(const char *userid, const char *password,
 		struct _auth_chunk (*fetch_key)(const unsigned char *chal,
 						const int csize))
 {
-	unsigned char *wsecret;
+	const unsigned char *wsecret;
 	int wsecsize;
-	unsigned char *wpayload;
+	const unsigned char *wpayload;
 	int wpaylsize;
-	struct _auth_obj old_ao;
+	struct _auth_obj old_ao = {0};
 	struct _auth_obj new_ao = {0};
 
 	if (!secret || !secsize || !payload) {