~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pub/keycheck-mp.c (keycheck_prime): Use `pgen_primep' to do the legwork.
[catacomb]
/
symm
/
salsa20.c
diff --git
a/symm/salsa20.c
b/symm/salsa20.c
index
0303d8b
..
f0fe3d7
100644
(file)
--- a/
symm/salsa20.c
+++ b/
symm/salsa20.c
@@
-97,7
+97,8
@@
static core__functype *pick_core(void)
cpu_feature_p(CPUFEAT_ARM_NEON));
#endif
#if CPUFAM_ARM64
cpu_feature_p(CPUFEAT_ARM_NEON));
#endif
#if CPUFAM_ARM64
- DISPATCH_PICK_COND(salsa20_core, salsa20_core_arm64, 1);
+ DISPATCH_PICK_COND(salsa20_core, salsa20_core_arm64,
+ cpu_feature_p(CPUFEAT_ARM_NEON));
#endif
DISPATCH_PICK_FALLBACK(salsa20_core, simple_core);
}
#endif
DISPATCH_PICK_FALLBACK(salsa20_core, simple_core);
}
@@
-870,9
+871,14
@@
SALSA20_VARS(DEFXGRAND)
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
+#include <mLib/macros.h>
#include <mLib/quis.h>
#include <mLib/testrig.h>
#include <mLib/quis.h>
#include <mLib/testrig.h>
+#ifdef ENABLE_ASM_DEBUG
+# include "regdump.h"
+#endif
+
static const int perm[] = {
0, 13, 10, 7,
4, 1, 14, 11,
static const int perm[] = {
0, 13, 10, 7,
4, 1, 14, 11,
@@
-899,7
+905,7
@@
static const int perm[] = {
} \
for (i = 0; i < SALSA20_OUTSZ/4; i++) STORE32_L(d.buf + 4*i, b[i]); \
\
} \
for (i = 0; i < SALSA20_OUTSZ/4; i++) STORE32_L(d.buf + 4*i, b[i]); \
\
- if (d.len != v[2].len ||
memcmp(d.buf, v[2].buf, v[2].len) != 0) {
\
+ if (d.len != v[2].len ||
MEMCMP(d.buf, !=, v[2].buf, v[2].len)) {
\
ok = 0; \
printf("\nfail core:" \
"\n\titerations = %d" \
ok = 0; \
printf("\nfail core:" \
"\n\titerations = %d" \
@@
-969,7
+975,7
@@
SALSA20_VARS(DEFVCORE)
} \
if (sz) BASE##_ENCRYPT(r, &ctx, p, q, sz); \
\
} \
if (sz) BASE##_ENCRYPT(r, &ctx, p, q, sz); \
\
- if (d.len != v[5].len ||
memcmp(d.buf, v[5].buf, v[5].len) != 0) {
\
+ if (d.len != v[5].len ||
MEMCMP(d.buf, !=, v[5].buf, v[5].len)) {
\
ok = 0; \
printf("\nfail encrypt:" \
"\n\tstep = %lu" \
ok = 0; \
printf("\nfail encrypt:" \
"\n\tstep = %lu" \
@@
-1015,6
+1021,9
@@
SALSA20_VARS(DEFXTAB)
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
+#ifdef ENABLE_ASM_DEBUG
+ regdump_init();
+#endif
test_run(argc, argv, defs, SRCDIR"/t/salsa20");
return (0);
}
test_run(argc, argv, defs, SRCDIR"/t/salsa20");
return (0);
}