introcude authfile module

[pam_pcsc_cr.git] / authobj.c

diff --git a/authobj.c b/authobj.c
index f06de57f4542191ad040178570fa2903be90cfd2..2b774abccae724298d35666d94d9fd83ebbf1f7b 100644 (file)
--- 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,33 +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;
-#if 0
-       int i;
-       for (i = 0; i < keysize; i++) printf(", 0x%02x", key[i]);
-       printf("\n");
-#endif
+               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, CBLKSIZE, data, buffer, datasize)) return -1;
 
        return 0;
 }
@@ -86,18 +85,20 @@ int parse_authobj(const unsigned char *key, const int keysize,
        int theirhashsize = HASHSIZE;
 
        if (decrypt(key, CBLKSIZE, buffer, data, datasize))
-               return -1;
-       if (serial_init(&srl, data, datasize)) return -1;
+               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;
 }