version 1.2, 2014/03/11 17:21:05 |
version 1.3, 2014/03/11 17:38:48 |
Line 1994 setup_data(pgpv_cursor_t *cursor, pgpv_t |
|
Line 1994 setup_data(pgpv_cursor_t *cursor, pgpv_t |
|
if (is_armored(buf, sizeof(buf))) { |
if (is_armored(buf, sizeof(buf))) { |
read_ascii_armor_file(cursor, p); |
read_ascii_armor_file(cursor, p); |
} else { |
} else { |
read_binary_file(pgp, "signature", "%s", p); |
read_binary_file(pgp, "signature", "%s", (const char *)p); |
} |
} |
fclose(fp); |
fclose(fp); |
} else { |
} else { |
Line 2672 pgpv_read_pubring(pgpv_t *pgp, const voi |
|
Line 2672 pgpv_read_pubring(pgpv_t *pgp, const voi |
|
if (keyring) { |
if (keyring) { |
return (size > 0) ? |
return (size > 0) ? |
read_binary_memory(pgp, "pubring", keyring, (size_t)size) : |
read_binary_memory(pgp, "pubring", keyring, (size_t)size) : |
read_binary_file(pgp, "pubring", "%s", keyring); |
read_binary_file(pgp, "pubring", "%s", (const char *)keyring); |
} |
} |
return read_binary_file(pgp, "pubring", "%s/%s", nonnull_getenv("HOME"), ".gnupg/pubring.gpg"); |
return read_binary_file(pgp, "pubring", "%s/%s", nonnull_getenv("HOME"), ".gnupg/pubring.gpg"); |
} |
} |
Line 2687 pgpv_read_ssh_pubkeys(pgpv_t *pgp, const |
|
Line 2687 pgpv_read_ssh_pubkeys(pgpv_t *pgp, const |
|
return 0; |
return 0; |
} |
} |
if (keyring) { |
if (keyring) { |
if (!read_ssh_file(pgp, &primary, "%s", keyring)) { |
if (!read_ssh_file(pgp, &primary, "%s", (const char *)keyring)) { |
return 0; |
return 0; |
} |
} |
} else if (!read_ssh_file(pgp, &primary, "%s/%s", nonnull_getenv("HOME"), ".ssh/id_rsa.pub")) { |
} else if (!read_ssh_file(pgp, &primary, "%s/%s", nonnull_getenv("HOME"), ".ssh/id_rsa.pub")) { |