diff options
| author | Rob Austein <sra@hactrn.net> | 2010-12-31 17:09:48 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2010-12-31 17:09:48 +0000 |
| commit | 2bf7d1a353419e3481c99065f81df9f859293c6f (patch) | |
| tree | 7fbb29567b5a3792c4d09bb2abd3173046ecd2d4 /rcynic/rcynic.c | |
| parent | 399c7f77cadb2993b178ba2edf5791528248e08f (diff) | |
"Indirect Trust Anchor" -> "Trust Anchor Locator"
svn path=/rcynic/README; revision=3594
Diffstat (limited to 'rcynic/rcynic.c')
| -rw-r--r-- | rcynic/rcynic.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/rcynic/rcynic.c b/rcynic/rcynic.c index b78e2410..ee038b09 100644 --- a/rcynic/rcynic.c +++ b/rcynic/rcynic.c @@ -3119,7 +3119,8 @@ int main(int argc, char *argv[]) } if (!name_cmp(val->name, "trust-anchor-uri-with-key") || - !name_cmp(val->name, "indirect-trust-anchor")) { + !name_cmp(val->name, "indirect-trust-anchor") || + !name_cmp(val->name, "trust-anchor-locator")) { /* * Newfangled URI + public key method. Two different versions * of essentially the same mechanism. @@ -3128,7 +3129,8 @@ int main(int argc, char *argv[]) * other xyz_cmp() function in the entire OpenSSL library. * Go figure. */ - int unified = !name_cmp(val->name, "indirect-trust-anchor"); + int unified = (!name_cmp(val->name, "indirect-trust-anchor") || + !name_cmp(val->name, "trust-anchor-locator")); EVP_PKEY *pkey = NULL, *xpkey = NULL; char *fn; if (unified) { @@ -3173,12 +3175,12 @@ int main(int argc, char *argv[]) if ((x = read_cert(path1, NULL, 0)) == NULL) logmsg(&rc, log_data_err, "Couldn't read trust anchor %s", path1); if (x && (xpkey = X509_get_pubkey(x)) == NULL) - logmsg(&rc, log_data_err, "Rejected %s because couldn't read public key from indirect trust anchor", uri); + logmsg(&rc, log_data_err, "Rejected %s because couldn't read public key from trust anchor locator", uri); j = (xpkey && EVP_PKEY_cmp(pkey, xpkey) == 1); EVP_PKEY_free(pkey); EVP_PKEY_free(xpkey); if (!j) { - logmsg(&rc, log_data_err, "Rejected %s because known public key didn't match indirect trust anchor", uri); + logmsg(&rc, log_data_err, "Rejected %s because known public key didn't match trust anchor locator", uri); X509_free(x); continue; } |