Merge pull request #601 from libtom/fix-600

sjaeckel · web-flow · commit e6be20bfc7e9 · 2022-09-13T12:29:16.000+02:00
remove camellia tests if `LTC_TEST` is not defined
diff --git a/src/ciphers/camellia.c b/src/ciphers/camellia.c
@@ -621,6 +621,9 @@ int camellia_ecb_decrypt(const unsigned char *ct, unsigned char *pt, const symme
 
 int camellia_test(void)
 {
+#ifndef LTC_TEST
+   return CRYPT_NOP;
+#else
    static const struct {
       int keylen;
       unsigned char key[32], pt[16], ct[16];
@@ -697,6 +700,7 @@ int camellia_test(void)
       }
    }
    return CRYPT_OK;
+#endif
 }
 
 void camellia_done(symmetric_key *skey)

Original file line number	Diff line number	Diff line change
`@@ -621,6 +621,9 @@ int camellia_ecb_decrypt(const unsigned char ct, unsigned char pt, const symme`
`621`	`621`
`622`	`622`	`int camellia_test(void)`
`623`	`623`	`{`
	`624`	`+#ifndef LTC_TEST`
	`625`	`+ return CRYPT_NOP;`
	`626`	`+#else`
`624`	`627`	`static const struct {`
`625`	`628`	`int keylen;`
`626`	`629`	`unsigned char key[32], pt[16], ct[16];`
`@@ -697,6 +700,7 @@ int camellia_test(void)`
`697`	`700`	`}`
`698`	`701`	`}`
`699`	`702`	`return CRYPT_OK;`
	`703`	`+#endif`
`700`	`704`	`}`
`701`	`705`
`702`	`706`	`void camellia_done(symmetric_key *skey)`