~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/: Rename `bulkcrypto' structure to `bulkops'.
[tripe]
/
server
/
keymgmt.c
diff --git
a/server/keymgmt.c
b/server/keymgmt.c
index
8f0d1a2
..
837bc6e
100644
(file)
--- a/
server/keymgmt.c
+++ b/
server/keymgmt.c
@@
-178,7
+178,7
@@
static const kgops *kgtab[] = {
static int algs_get(algswitch *a, dstr *e, key_file *kf, key *k)
{
const char *p;
static int algs_get(algswitch *a, dstr *e, key_file *kf, key *k)
{
const char *p;
- const bulk
crypto
*bulk;
+ const bulk
ops
*bulk;
char *q, *qq;
dstr d = DSTR_INIT, dd = DSTR_INIT;
int rc = -1;
char *q, *qq;
dstr d = DSTR_INIT, dd = DSTR_INIT;
int rc = -1;
@@
-598,7
+598,7
@@
foundko:
kd = CREATE(kdata);
if (kh->load(*ko, *d, kd, &t, &e)) {
a_warn("KEYMGMT", "%s-keyring", kh->kind,
kd = CREATE(kdata);
if (kh->load(*ko, *d, kd, &t, &e)) {
a_warn("KEYMGMT", "%s-keyring", kh->kind,
- "%s", kh->kr, "key" "%s", t.buf,
+ "%s", kh->kr, "key"
,
"%s", t.buf,
"*%s", e.buf, A_END);
goto fail_1;
}
"*%s", e.buf, A_END);
goto fail_1;
}