X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=authobj.c;h=2b774abccae724298d35666d94d9fd83ebbf1f7b;hp=cb6f4f35321ce0abb3b12486b529df69449f4b8d;hb=4a5da38dfd8b0236564ffe6b70eab1eeb399fff0;hpb=2961e53fa16c04cbb2e90015d68a0b9454c2edd6

diff --git a/authobj.c b/authobj.c
index cb6f4f3..2b774ab 100644
--- a/authobj.c
+++ b/authobj.c
@@ -13,12 +13,16 @@ int make_challenge(const char *id, const char *pass, const char *nonce,
 {
 	serializer_t srl;
 
-	if (serial_init(&srl, challenge, *challengesize)) return -1;
-	if (serial_put(&srl, id, strlen(id)) != strlen(id)) return -1;
-	if (serial_put(&srl, pass, strlen(pass)) != strlen(pass)) return -1;
-	if (serial_put(&srl, nonce, strlen(nonce)) != strlen(nonce)) return -1;
-	if (serial_put(&srl, NULL, 0) != 0) return -1;
-	*challengesize = ((serial_size(&srl) -1) / CBLKSIZE + 1) * CBLKSIZE;
+	serial_init(&srl, challenge, *challengesize);
+	if (serial_put(&srl, id, strlen(id)) != strlen(id))
+		return aoe_serial;
+	if (serial_put(&srl, pass, strlen(pass)) != strlen(pass))
+		return aoe_serial;
+	if (serial_put(&srl, nonce, strlen(nonce)) != strlen(nonce))
+		return aoe_serial;
+	if (serial_put(&srl, NULL, 0) != 0)
+		return aoe_serial;
+	*challengesize = serial_size(&srl);
 	return 0;
 }
 
@@ -40,28 +44,28 @@ int make_authobj(const char *id, const char *pass, const char *nonce,
 	datasize = ((secsize + paysize + HASHSIZE * 4 * sizeof(short) - 1) /
 			CBLKSIZE + 1) * CBLKSIZE;
 	data = alloca(datasize);
-	if (serial_init(&srl, data, datasize)) return -1;
-	if (serial_put(&srl, secret, secsize) != secsize) return -1;
-	if (serial_put(&srl, payload, paysize) != paysize) return -1;
+	serial_init(&srl, data, datasize);
+	if (serial_put(&srl, secret, secsize) != secsize) return aoe_serial;
+	if (serial_put(&srl, payload, paysize) != paysize) return aoe_serial;
 	if (hash(data, serial_size(&srl), datahash, &datahashsize))
-		return -1;
+		return aoe_size;
 	if (serial_put(&srl, datahash, datahashsize) != datahashsize)
-		return -1;
-	if (serial_put(&srl, NULL, 0) != 0) return -1;
+		return aoe_serial;
+	if (serial_put(&srl, NULL, 0) != 0) return aoe_serial;
 	datasize = ((serial_size(&srl) -1) / CBLKSIZE + 1) * CBLKSIZE;
 
 	challengesize = ((strlen(id) + strlen(pass) + strlen(nonce) +
 			4 * sizeof(short) - 1) / CBLKSIZE + 1) * CBLKSIZE;
 	challenge = alloca(challengesize);
 	if (make_challenge(id, pass, nonce, challenge, &challengesize))
-		return -1;
+		return aoe_serial;
 
 	if (hmac(secret, secsize, challenge, challengesize,
-		key, &keysize)) return -1;
+		key, &keysize)) return aoe_crypt;
 
-	if (*bufsize < datasize) return -1;
+	if (*bufsize < datasize) return aoe_size;
+	if (encrypt(key, CBLKSIZE, data, buffer, datasize)) return aoe_crypt;
 	*bufsize = datasize;
-	if (encrypt(key, keysize, data, buffer, datasize)) return -1;
 
 	return 0;
 }
@@ -80,19 +84,21 @@ int parse_authobj(const unsigned char *key, const int keysize,
 	unsigned char theirhash[HASHSIZE];
 	int theirhashsize = HASHSIZE;
 
-	if (decrypt(key, keysize, buffer, data, datasize))
-		return -1;
-	if (serial_init(&srl, data, datasize)) return -1;
+	if (decrypt(key, CBLKSIZE, buffer, data, datasize))
+		return aoe_crypt;
+	serial_init(&srl, data, datasize);
 	tsize = *secsize;
-	if ((*secsize = serial_get(&srl, secret, tsize)) > tsize) return -1;
+	*secsize = serial_get(&srl, secret, tsize);
+	if (*secsize > tsize || *secsize <= 0) return aoe_serial;
 	tsize = *paysize;
-	if ((*paysize = serial_get(&srl, payload, tsize)) > tsize) return -1;
+	*paysize = serial_get(&srl, payload, tsize);
+	if (*paysize > tsize || *paysize <= 0) return aoe_serial;
 	if (hash(data, serial_size(&srl), myhash, &myhashsize))
-		return -1;
-	if ((theirhashsize = serial_get(&srl, theirhash, theirhashsize)) != HASHSIZE)
-		return -1;
+		return aoe_crypt;
+	theirhashsize = serial_get(&srl, theirhash, theirhashsize);
+	if (theirhashsize != HASHSIZE) return aoe_data;
 	if ((myhashsize != theirhashsize) ||
-				memcmp(myhash, theirhash, myhashsize))
-		return -1;
+	    memcmp(myhash, theirhash, myhashsize))
+		return aoe_data;
 	return 0;
 }