TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename time_cipher[2-4]? appropriately

Browse Source
This commit is contained in:
Steffen Jaeckel 2017-05-24 21:36:15 +02:00
parent 9d4094b8e9
commit 8ef805817c
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
demos/timing.c
View File

@ -18,10 +18,10 @@ register_algs();
#endif #endif
time_keysched(); time_keysched();
time_cipher(); time_cipher_ecb();
time_cipher2(); time_cipher_cbc();
time_cipher3(); time_cipher_ctr();
time_cipher4(); time_cipher_lrw();
time_hash(); time_hash();
time_macs(); time_macs();
time_encmacs(); time_encmacs();

18
testprof/timing_test.c
View File

@ -154,7 +154,7 @@ int time_keysched(void)
} }
#ifdef LTC_ECB_MODE #ifdef LTC_ECB_MODE
int time_cipher(void) int time_cipher_ecb(void)
{ {
unsigned long x, y1; unsigned long x, y1;
ulong64 t1, t2, c1, c2, a1, a2; ulong64 t1, t2, c1, c2, a1, a2;
@ -225,11 +225,11 @@ int time_cipher(void)
return 0; return 0;
} }
#else #else
int time_cipher(void) { fprintf(stderr, "NO ECB\n"); return 0; } int time_cipher_ecb(void) { fprintf(stderr, "NO ECB\n"); return 0; }
#endif #endif
#ifdef LTC_CBC_MODE #ifdef LTC_CBC_MODE
int time_cipher2(void) int time_cipher_cbc(void)
{ {
unsigned long x, y1; unsigned long x, y1;
ulong64 t1, t2, c1, c2, a1, a2; ulong64 t1, t2, c1, c2, a1, a2;
@ -300,11 +300,11 @@ int time_cipher2(void)
return 0; return 0;
} }
#else #else
int time_cipher2(void) { fprintf(stderr, "NO CBC\n"); return 0; } int time_cipher_cbc(void) { fprintf(stderr, "NO CBC\n"); return 0; }
#endif #endif
#ifdef LTC_CTR_MODE #ifdef LTC_CTR_MODE
int time_cipher3(void) int time_cipher_ctr(void)
{ {
unsigned long x, y1; unsigned long x, y1;
ulong64 t1, t2, c1, c2, a1, a2; ulong64 t1, t2, c1, c2, a1, a2;
@ -375,11 +375,11 @@ int time_cipher3(void)
return 0; return 0;
} }
#else #else
int time_cipher3(void) { fprintf(stderr, "NO CTR\n"); return 0; } int time_cipher_ctr(void) { fprintf(stderr, "NO CTR\n"); return 0; }
#endif #endif
#ifdef LTC_LRW_MODE #ifdef LTC_LRW_MODE
int time_cipher4(void) int time_cipher_lrw(void)
{ {
unsigned long x, y1; unsigned long x, y1;
ulong64 t1, t2, c1, c2, a1, a2; ulong64 t1, t2, c1, c2, a1, a2;
@ -452,7 +452,7 @@ int time_cipher4(void)
return 0; return 0;
} }
#else #else
int time_cipher4(void) { fprintf(stderr, "NO LRW\n"); return 0; } int time_cipher_lrw(void) { fprintf(stderr, "NO LRW\n"); return 0; }
#endif #endif
@ -1155,7 +1155,7 @@ void time_macs(void)
time_macs_(32); time_macs_(32);
} }
void time_encmacs_(unsigned long MAC_SIZE) static void time_encmacs_(unsigned long MAC_SIZE)
{ {
#if defined(LTC_EAX_MODE) || defined(LTC_OCB_MODE) || defined(LTC_OCB3_MODE) || defined(LTC_CCM_MODE) || defined(LTC_GCM_MODE) #if defined(LTC_EAX_MODE) || defined(LTC_OCB_MODE) || defined(LTC_OCB3_MODE) || defined(LTC_CCM_MODE) || defined(LTC_GCM_MODE)
unsigned char *buf, IV[16], key[16], tag[16]; unsigned char *buf, IV[16], key[16], tag[16];

8
testprof/tomcrypt_test.h
View File

@ -77,10 +77,10 @@ void init_timer(void);
/* register default algs */ /* register default algs */
int time_keysched(void); int time_keysched(void);
int time_cipher(void); int time_cipher_ecb(void);
int time_cipher2(void); int time_cipher_cbc(void);
int time_cipher3(void); int time_cipher_ctr(void);
int time_cipher4(void); int time_cipher_lrw(void);
int time_hash(void); int time_hash(void);
void time_mult(void); void time_mult(void);
void time_sqr(void); void time_sqr(void);