projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Have "tinc fsck" recognize Ed25519PublicKey statements.
[tinc]
/
src
/
fsck.c
diff --git
a/src/fsck.c
b/src/fsck.c
index
205a599
..
138b1cd
100644
(file)
--- a/
src/fsck.c
+++ b/
src/fsck.c
@@
-281,7
+281,7
@@
int fsck(const char *argv0) {
}
// Check for public keys.
}
// Check for public keys.
- // TODO: use RSAPublicKeyFile
and Ed25519PublicKeyFile variables
if present.
+ // TODO: use RSAPublicKeyFile
variable
if present.
snprintf(fname, sizeof fname, "%s/hosts/%s", confbase, name);
if(access(fname, R_OK))
snprintf(fname, sizeof fname, "%s/hosts/%s", confbase, name);
if(access(fname, R_OK))
@@
-342,13
+342,17
@@
int fsck(const char *argv0) {
fprintf(stderr, "WARNING: A public RSA key was found but no private key is known.\n");
}
#endif
fprintf(stderr, "WARNING: A public RSA key was found but no private key is known.\n");
}
#endif
- //
- // TODO: this should read the Ed25519PublicKey config variable instead.
+
ecdsa_t *ecdsa_pub = NULL;
f = fopen(fname, "r");
ecdsa_t *ecdsa_pub = NULL;
f = fopen(fname, "r");
- if(f)
- ecdsa_pub = ecdsa_read_pem_public_key(f);
+ if(f) {
+ ecdsa_pub = get_pubkey(f);
+ if(!f) {
+ rewind(f);
+ ecdsa_pub = ecdsa_read_pem_public_key(f);
+ }
+ }
fclose(f);
if(ecdsa_priv) {
fclose(f);
if(ecdsa_priv) {