Commit 0b90915d authored by Niels Möller's avatar Niels Möller
Browse files

* src/lsh-decode-key.c (do_decode_key): Use publickey-related

functions and methods.
* src/lsh.c (do_lsh_lookup): Likewise.
* src/server_authorization.c (do_key_lookup): Likewise.

Rev: src/server_authorization.c:1.14
parent 10b66dd5
...@@ -58,7 +58,7 @@ do_key_lookup(struct lookup_verifier *c, ...@@ -58,7 +58,7 @@ do_key_lookup(struct lookup_verifier *c,
CAST(authorization_db, closure, c); CAST(authorization_db, closure, c);
struct lsh_string *filename; struct lsh_string *filename;
struct dsa_verifier *v; struct verifier *v;
assert(keyholder); assert(keyholder);
...@@ -78,12 +78,12 @@ do_key_lookup(struct lookup_verifier *c, ...@@ -78,12 +78,12 @@ do_key_lookup(struct lookup_verifier *c,
filename = ssh_cformat(".lsh/%lS/%lxfS", filename = ssh_cformat(".lsh/%lS/%lxfS",
closure->index_name, closure->index_name,
hash_string(closure->hashalgo, hash_string(closure->hashalgo,
sexp_format(dsa_to_spki_public_key(&v->public), sexp_format(spki_make_public_key(v),
SEXP_CANONICAL, 0), SEXP_CANONICAL, 0),
1)); 1));
if (USER_FILE_EXISTS(keyholder, filename, 1)) if (USER_FILE_EXISTS(keyholder, filename, 1))
return &v->super; return v;
return NULL; return NULL;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment