X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=authfile.c;fp=authfile.c;h=8b077df0a0c74e2bb800b6f6883fba18acdaa7da;hp=1e0826d4d8396505f7da71a1f8e3c0a8dad99dd1;hb=3192bff3cc2b10a7b65d185ec1bc8bf31fd4f635;hpb=4a5da38dfd8b0236564ffe6b70eab1eeb399fff0 diff --git a/authfile.c b/authfile.c index 1e0826d..8b077df 100644 --- a/authfile.c +++ b/authfile.c @@ -42,7 +42,7 @@ int update_authfile(const char *fn, const char *tokenid, const char *id, oldnonce = strtok(NULL, ":\r\n"); hauthobj = strtok(NULL, ":\r\n"); } else { - eprint("error reading from %s: %s\n", + eprint("error reading from %s: %s", fn, strerror(errno)); } fclose(fp); @@ -52,10 +52,10 @@ int update_authfile(const char *fn, const char *tokenid, const char *id, hlen = strlen(hauthobj); if (hlen % 32 != 0) { - eprint("error: auth string has wrong length\n"); + eprint("error: auth string has wrong length"); } else if (hlen != strspn(hauthobj, "0123456789abcdefABCDEF")) { - eprint("error: auth string not hexadecimal\n"); + eprint("error: auth string not hexadecimal"); } else { oldauthsize = hlen/2; oldauthobj = alloca(oldauthsize); @@ -71,18 +71,18 @@ int update_authfile(const char *fn, const char *tokenid, const char *id, rc = make_challenge(id, password, nonce, chal, &csize); if (rc) { - eprint("cannot make challenge\n"); + eprint("cannot make challenge"); return -1; } rc = pcsc_cr(chal, csize, key, &keysize); if (rc) { - eprint("error querying token: %s\n", pcsc_errstr(rc)); + eprint("error querying token: %s", pcsc_errstr(rc)); return -1; } rc = parse_authobj(key, keysize, oldauthobj, oldauthsize, mysecret, &mysecsize, myload, &myloadsize); if (rc) { - eprint("cannot parse old authobj: %d\n", rc); + eprint("cannot parse old authobj: %d", rc); return -1; } } @@ -90,29 +90,29 @@ int update_authfile(const char *fn, const char *tokenid, const char *id, rc = make_authobj(id, password, nonce, mysecret, mysecsize, payload, paysize, authobj, &authsize); if (rc) { - eprint("make_authobj error %d\n", rc); + eprint("make_authobj error %d", rc); return -1; } fp = fopen(fn, "w"); if (!fp) { - eprint("cannot open \"%s\": %s\n", + eprint("cannot open \"%s\": %s", fn, strerror(errno)); return -1; } if (fprintf(fp, "%s:%s:%s:", tokenid, id, nonce) < 0) { - eprint("cannot write to \"%s\": %s\n", + eprint("cannot write to \"%s\": %s", fn, strerror(errno)); return -1; } for (i = 0; i < authsize; i++) if (fprintf(fp, "%02x", authobj[i]) < 0) { - eprint("cannot write to \"%s\": %s\n", + eprint("cannot write to \"%s\": %s", fn, strerror(errno)); return -1; } fprintf(fp, "\n"); if (fclose(fp) < 0) { - eprint("cannot close \"%s\": %s\n", + eprint("cannot close \"%s\": %s", fn, strerror(errno)); return -1; }