PAM module works

[pam_pcsc_cr.git] / pam_cr_setup.c

diff --git a/pam_cr_setup.c b/pam_cr_setup.c
index 11a8e2ab9bfef0c33f5bf403d73bb8b6758c9e6f..8a42a74e3886c5128b3a925e795933d75da93a6a 100644 (file)
--- a/pam_cr_setup.c
+++ b/pam_cr_setup.c
@@ -7,68 +7,89 @@
 #include <unistd.h>
 #include <errno.h>
 #include <stdarg.h>
+#include "authobj.h"
 #include "authfile.h"
 #include "pcsc_cr.h"
 
-int eprint(const char *format, ...)
+static struct _auth_chunk
+token_key(const unsigned char *challenge, const int challengesize)
 {
-       va_list ap;
+       struct _auth_chunk ho = {0};
+       long rc;
+       int keysize = sizeof(ho.data);
 
-       va_start(ap, format);
-       return vfprintf(stderr, format, ap);
-       va_end(ap);
+       if ((rc = pcsc_cr(challenge, challengesize, ho.data, &keysize))) {
+               ho.err = pcsc_errstr(rc);
+       }
+       return ho;
+}
+
+static char *mynonce = NULL;
+
+static void update_nonce(char *nonce, const int nonsize)
+{
+       if (mynonce) {
+               snprintf(nonce, nonsize, "%s", mynonce);
+       } else {
+               int n = 0;
+
+               sscanf(nonce, "%d", &n);
+               snprintf(nonce, nonsize, "%d", n+1);
+       }
 }
 
-static void usage(const char const *cmd)
+static void usage(const char * const cmd)
 {
-       eprint( "usage: %s [options] [username]\n"
+       fprintf(stderr,
+               "usage: %s [options] [username]\n"
                "    -h                - show this help and exit\n"
                "    -o backend-option - token option \"backend:key=val\"\n"
-               "    -f auth-file      - auth state file to read/write\n"
+               "    -f template       - template for auth state filepath\n"
                "    -a secret | -A file-with-secret | -A -\n"
                "                      - 40-character hexadecimal secret\n"
                "    -s token-serial   - public I.D. of the token\n"
                "    -n nonce          - initial nonce\n"
                "    -l payload        - keyring unlock password\n"
                "    -p password       - login password\n"
+               "    -v                - show returned data\n"
                , cmd);
 }
 
 int main(int argc, char *argv[])
 {
+       struct _auth_obj ao;
        int c;
-       char *fn = NULL;
+       int verbose = 0;
        char *hsecret = NULL;
        char *secfn = NULL;
        char secbuf[43];
        unsigned char bsecret[20];
        unsigned char *secret = NULL;
        int i;
-       char *nonce = "1";
-       char *tokenid = "";
-       char *id = getlogin();
-       char *payload = "";
+       char *tokenid = NULL;
+       char *userid = getlogin();
+       char *payload = NULL;
        char *password = "";
 
-       while ((c = getopt(argc, argv, "ho:f:a:A:s:n:l:p:")) != -1)
+       while ((c = getopt(argc, argv, "ho:f:a:A:s:n:l:p:v")) != -1)
            switch (c) {
        case 'h':
                usage(argv[0]);
                exit(EXIT_SUCCESS);
        case 'o':
                if (pcsc_option(optarg)) {
-                       eprint("Option \"%s\" bad\n", optarg);
+                       fprintf(stderr, "Option \"%s\" bad", optarg);
                        exit(EXIT_FAILURE);
                }
                break;
        case 'f':
-               fn = optarg;
+               authfile_template(optarg);
                break;
        case 'a':
                if (!secfn) {
                        hsecret = optarg;
                } else {
-                       eprint("-a and -A are mutually exclusive\n");
+                       fprintf(stderr, "-a and -A are mutually exclusive");
                        exit(EXIT_FAILURE);
                }
                break;
@@ -76,7 +97,7 @@ int main(int argc, char *argv[])
                if (!hsecret) {
                        secfn = optarg;
                } else {
-                       eprint("-A and -a are mutually exclusive\n");
+                       fprintf(stderr, "-A and -a are mutually exclusive");
                        exit(EXIT_FAILURE);
                }
                break;
@@ -84,7 +105,7 @@ int main(int argc, char *argv[])
                tokenid = optarg;
                break;
        case 'n':
-               nonce = optarg;
+               mynonce = optarg;
                break;
        case 'l':
                payload = optarg;
@@ -92,18 +113,25 @@ int main(int argc, char *argv[])
        case 'p':
                password = optarg;
                break;
+       case 'v':
+               verbose = 1;
+               break;
        default:
                usage(argv[0]);
                exit(EXIT_FAILURE);
        }
        if (optind == (argc - 1)) {
-               id = argv[optind];
+               userid = argv[optind];
                optind++;
        }
        if (optind != argc) {
                usage(argv[0]);
                exit(EXIT_FAILURE);
        }
+       if (!userid) {
+               fprintf(stderr, "cannot determine userid");
+               exit(EXIT_FAILURE);
+       }
        if (secfn) {
                FILE *sfp;
                char *p;
@@ -111,12 +139,12 @@ int main(int argc, char *argv[])
                if (!strcmp(secfn, "-")) sfp = stdin;
                else sfp = fopen(secfn, "r");
                if (!sfp) {
-                       eprint("cannot open \"%s\": %s\n",
+                       fprintf(stderr, "cannot open \"%s\": %s",
                                secfn, strerror(errno));
                        exit(EXIT_FAILURE);
                }
                if (!fgets(secbuf, sizeof(secbuf), sfp)) {
-                       eprint("cannot read \"%s\": %s\n",
+                       fprintf(stderr, "cannot read \"%s\": %s",
                                secfn, strerror(errno));
                        exit(EXIT_FAILURE);
                }
@@ -126,10 +154,6 @@ int main(int argc, char *argv[])
                fclose(sfp);
                hsecret = secbuf;
        }
-       if (!id) {
-               eprint("cannot determine userid\n");
-               exit(EXIT_FAILURE);
-       }
        if (hsecret) {
                if (strlen(hsecret) != 40) {
                        fprintf(stderr,
@@ -145,7 +169,18 @@ int main(int argc, char *argv[])
                        sscanf(hsecret + i * 2, "%2hhx", &bsecret[i]);
                secret = bsecret;
        }
-       return update_authfile(fn, tokenid, id, password, nonce,
-                               secret, sizeof(bsecret),
-                               (unsigned char *)payload, strlen(payload));
+       ao = authfile(tokenid, userid, password, update_nonce,
+                       secret, secret ? sizeof(bsecret) : 0,
+                       (unsigned char *)payload, payload ? strlen(payload) : 0,
+                       token_key);
+       memset(bsecret, 0, sizeof(bsecret));
+       if (ao.err) {
+               fprintf(stderr, "%s\n", ao.err);
+               exit(EXIT_FAILURE);
+       } else if (verbose) {
+               printf("userid : \"%.*s\"\n", ao.datasize, ao.data);
+               printf("payload: \"%.*s\"\n", ao.paylsize, ao.payload);
+       }
+       if (ao.buffer) free(ao.buffer);
+       return 0;
 }