Skip to content

ed25519 tests, perf test fix, dkim_free() memory leak, dkim_sig_keybits() #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

ed25519 tests, perf test fix, dkim_free() memory leak, dkim_sig_keybits() #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions libopendkim/dkim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5131,7 +5131,8 @@ dkim_free(DKIM *dkim)

CLOBBER(dkim->dkim_siglist[c]->sig_key);
CLOBBER(dkim->dkim_siglist[c]->sig_sig);
if (dkim->dkim_siglist[c]->sig_keytype == DKIM_KEYTYPE_RSA)
if (dkim->dkim_siglist[c]->sig_keytype == DKIM_KEYTYPE_RSA ||
dkim->dkim_siglist[c]->sig_keytype == DKIM_KEYTYPE_ED25519)
{
struct dkim_crypto *crypto;

Expand Down Expand Up @@ -7910,11 +7911,17 @@ dkim_sig_getkeysize(DKIM_SIGINFO *sig, unsigned int *bits)
assert(sig != NULL);
assert(bits != NULL);

if (sig->sig_keybits == 0 &&
sig->sig_signalg != DKIM_SIGN_ED25519SHA256)
if (sig->sig_keybits == 0)
return DKIM_STAT_INVALID;

*bits = sig->sig_keybits;
if(sig->sig_signalg == DKIM_SIGN_ED25519SHA256)
{
*bits = 256;
}
else
{
*bits = sig->sig_keybits;
}

return DKIM_STAT_OK;
}
Expand Down
17 changes: 14 additions & 3 deletions libopendkim/tests/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,21 @@ check_PROGRAMS = t-setup t-test00 t-test01 t-test02 t-test03 t-test04 \
t-test145 t-test146 t-test147 t-test148 t-test149 t-test150 \
t-test151 t-test152 t-test153 t-test154 t-test155 t-test156 \
t-test157 t-test158 t-test159 \
t-test200 t-test201 t-test202 t-test203 \
t-signperf t-verifyperf
check_SCRIPTS = t-signperf-sha1 t-signperf-relaxed-relaxed \
t-signperf-simple-simple
t-signperf-simple-simple \
t-signperf-ed25519 t-verifyperf-ed25519
if ALL_SYMBOLS
check_PROGRAMS += t-test49 t-test113 t-test118
endif
check_PROGRAMS += t-cleanup
TESTS = $(check_PROGRAMS) $(check_SCRIPTS)

# t-cleanup can't be in check_PROGRAMS. It has to run last, after scripts.
# Put it in EXTRA_PROGRAMS so automake will still build it on demand.
EXTRA_PROGRAMS = t-cleanup
CLEANFILES = t-cleanup

TESTS = $(check_PROGRAMS) $(check_SCRIPTS) t-cleanup

EXTRA_DIST = $(check_SCRIPTS)

Expand Down Expand Up @@ -219,6 +226,10 @@ t_test156_SOURCES = t-test156.c t-testdata.h
t_test157_SOURCES = t-test157.c t-testdata.h
t_test158_SOURCES = t-test158.c t-testdata.h
t_test159_SOURCES = t-test159.c t-testdata.h
t_test200_SOURCES = t-test200.c t-testdata.h
t_test201_SOURCES = t-test201.c t-testdata.h
t_test202_SOURCES = t-test202.c t-testdata.h
t_test203_SOURCES = t-test203.c t-testdata.h

MOSTLYCLEANFILES=

Expand Down
8 changes: 8 additions & 0 deletions libopendkim/tests/t-setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,14 @@ main(int argc, char **argv)
}
fprintf(f, "\n");

fprintf(f, "%s.%s.%s ", SELECTORRFC8463, DKIM_DNSKEYNAME, DOMAIN);
for (p = RFC8463_ED25519PUBLICKEY; *p != '\0'; p++)
{
if (*p != '\n')
putc(*p, f);
}
fprintf(f, "\n");

fprintf(f, "dkim=all; t=s; r=%s\n", REPLYADDRESS);

fprintf(f, "%s exists\n", DOMAIN2);
Expand Down
6 changes: 6 additions & 0 deletions libopendkim/tests/t-signperf-ed25519
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh
#
#
# Speed signing test using ed25519 algorithm

./t-signperf -s ed25519-sha256
51 changes: 38 additions & 13 deletions libopendkim/tests/t-signperf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

/* system includes */
#include <sys/types.h>
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down Expand Up @@ -105,6 +106,8 @@ alg_code(char *name)
return (dkim_alg_t) DKIM_SIGN_RSASHA1;
else if (strcasecmp(name, "rsa-sha256") == 0)
return (dkim_alg_t) DKIM_SIGN_RSASHA256;
else if (strcasecmp(name, "ed25519-sha256") == 0)
return (dkim_alg_t) DKIM_SIGN_ED25519SHA256;
else
return (dkim_alg_t) DKIM_SIGN_UNKNOWN;
}
Expand Down Expand Up @@ -133,6 +136,9 @@ alg_name(dkim_alg_t code)
case DKIM_SIGN_RSASHA256:
return "rsa-sha256";

case DKIM_SIGN_ED25519SHA256:
return "ed25519-sha256";

case DKIM_SIGN_UNKNOWN:
default:
return "unknown";
Expand Down Expand Up @@ -188,6 +194,9 @@ main(int argc, char **argv)
DKIM *dkim;
DKIM_LIB *lib;
dkim_sigkey_t key;
int keybits;
const char *selector;
unsigned int seed;
unsigned char hdr[MAXHEADER + 1];
unsigned char body[BODYBUFRSZ];
time_t start = DEFTESTINT;
Expand Down Expand Up @@ -274,23 +283,38 @@ main(int argc, char **argv)
else
signalg = DKIM_SIGN_RSASHA1;
}
else if (signalg == DKIM_SIGN_RSASHA256 &&
!dkim_libfeature(lib, DKIM_FEATURE_SHA256))
else if ((signalg == DKIM_SIGN_RSASHA256 &&
!dkim_libfeature(lib, DKIM_FEATURE_SHA256)) ||
(signalg == DKIM_SIGN_ED25519SHA256 &&
(!dkim_libfeature(lib, DKIM_FEATURE_ED25519) ||
!dkim_libfeature(lib, DKIM_FEATURE_SHA256))))
{
fprintf(stdout,
"### requested signing algorithm not available\n");
"### algorithm %s not available SKIPPED\n", alg_name(signalg));
dkim_close(lib);
return 1;
return 0;
}

fprintf(stdout,
"*** SIGNING SPEED TEST: %s/%s with %s, size %u for %lds\n",
canon_name(hcanon), canon_name(bcanon), alg_name(signalg),
(unsigned int) msgsize, (long) testint);
if (signalg == DKIM_SIGN_ED25519SHA256)
{
key = RFC8463_ED25519KEY;
keybits = 256;
selector = SELECTORRFC8463;
}
else
{
key = KEY;
keybits = 1024;
selector = SELECTOR;
}

key = KEY;
seed = time(NULL);
srandom(seed);

srandom(time(NULL));
fprintf(stdout,
"*** SIGNING SPEED TEST: %d-bit %s/%s with %s, body size %u for %lds, random seed %u\n",
keybits, canon_name(hcanon), canon_name(bcanon), alg_name(signalg),
(unsigned int) msgsize, (long) testint, seed);

/* prepare a random body buffer */
for (c = 0, w = 0; c < sizeof body; c++)
Expand All @@ -310,8 +334,9 @@ main(int argc, char **argv)

while (time(NULL) < start + testint)
{
dkim = dkim_sign(lib, JOBID, NULL, key, SELECTOR, DOMAIN,
dkim = dkim_sign(lib, JOBID, NULL, key, selector, DOMAIN,
hcanon, bcanon, signalg, -1L, &status);
assert(status == DKIM_STAT_OK);

status = dkim_header(dkim, HEADER02, strlen(HEADER02));

Expand All @@ -329,7 +354,7 @@ main(int argc, char **argv)

status = dkim_header(dkim, HEADER09, strlen(HEADER09));

status = dkim_eoh(dkim);
assert(dkim_eoh(dkim) == DKIM_STAT_OK);

msgrem = msgsize;

Expand All @@ -344,7 +369,7 @@ main(int argc, char **argv)

(void) dkim_body(dkim, CRLF, 2);

status = dkim_eom(dkim, NULL);
assert(dkim_eom(dkim, NULL) == DKIM_STAT_OK);

memset(hdr, '\0', sizeof hdr);
status = dkim_getsighdr(dkim, hdr, sizeof hdr,
Expand Down
Loading