demos: trim trailing spaces

This commit is contained in:
Steffen Jaeckel 2013-03-20 18:34:00 +02:00
parent 5d0eadcd42
commit f107e6e465
2 changed files with 49 additions and 49 deletions

View File

@ -11,7 +11,7 @@
int errno; int errno;
int usage(char *name) int usage(char *name)
{ {
int x; int x;
@ -25,7 +25,7 @@ int usage(char *name)
void register_algs(void) void register_algs(void)
{ {
int x; int x;
#ifdef LTC_RIJNDAEL #ifdef LTC_RIJNDAEL
register_cipher (&aes_desc); register_cipher (&aes_desc);
#endif #endif
@ -79,7 +79,7 @@ void register_algs(void)
if (register_hash(&sha256_desc) == -1) { if (register_hash(&sha256_desc) == -1) {
printf("Error registering LTC_SHA256\n"); printf("Error registering LTC_SHA256\n");
exit(-1); exit(-1);
} }
if (register_prng(&yarrow_desc) == -1) { if (register_prng(&yarrow_desc) == -1) {
printf("Error registering yarrow PRNG\n"); printf("Error registering yarrow PRNG\n");
@ -92,7 +92,7 @@ void register_algs(void)
} }
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
unsigned char plaintext[512],ciphertext[512]; unsigned char plaintext[512],ciphertext[512];
unsigned char tmpkey[512], key[MAXBLOCKSIZE], IV[MAXBLOCKSIZE]; unsigned char tmpkey[512], key[MAXBLOCKSIZE], IV[MAXBLOCKSIZE];
@ -121,7 +121,7 @@ int main(int argc, char *argv[])
cipher = argv[1]; cipher = argv[1];
infile = argv[2]; infile = argv[2];
outfile = argv[3]; outfile = argv[3];
} }
/* file handles setup */ /* file handles setup */
fdin = fopen(infile,"rb"); fdin = fopen(infile,"rb");
@ -131,11 +131,11 @@ int main(int argc, char *argv[])
} }
fdout = fopen(outfile,"wb"); fdout = fopen(outfile,"wb");
if (fdout == NULL) { if (fdout == NULL) {
perror("Can't open output for writing"); perror("Can't open output for writing");
exit(-1); exit(-1);
} }
cipher_idx = find_cipher(cipher); cipher_idx = find_cipher(cipher);
if (cipher_idx == -1) { if (cipher_idx == -1) {
printf("Invalid cipher entered on command line.\n"); printf("Invalid cipher entered on command line.\n");
@ -150,7 +150,7 @@ int main(int argc, char *argv[])
ivsize = cipher_descriptor[cipher_idx].block_length; ivsize = cipher_descriptor[cipher_idx].block_length;
ks = hash_descriptor[hash_idx].hashsize; ks = hash_descriptor[hash_idx].hashsize;
if (cipher_descriptor[cipher_idx].keysize(&ks) != CRYPT_OK) { if (cipher_descriptor[cipher_idx].keysize(&ks) != CRYPT_OK) {
printf("Invalid keysize???\n"); printf("Invalid keysize???\n");
exit(-1); exit(-1);
} }
@ -162,14 +162,14 @@ int main(int argc, char *argv[])
printf("Error hashing key: %s\n", error_to_string(errno)); printf("Error hashing key: %s\n", error_to_string(errno));
exit(-1); exit(-1);
} }
if (decrypt) { if (decrypt) {
/* Need to read in IV */ /* Need to read in IV */
if (fread(IV,1,ivsize,fdin) != ivsize) { if (fread(IV,1,ivsize,fdin) != ivsize) {
printf("Error reading IV from input.\n"); printf("Error reading IV from input.\n");
exit(-1); exit(-1);
} }
if ((errno = ctr_start(cipher_idx,IV,key,ks,0,CTR_COUNTER_LITTLE_ENDIAN,&ctr)) != CRYPT_OK) { if ((errno = ctr_start(cipher_idx,IV,key,ks,0,CTR_COUNTER_LITTLE_ENDIAN,&ctr)) != CRYPT_OK) {
printf("ctr_start error: %s\n",error_to_string(errno)); printf("ctr_start error: %s\n",error_to_string(errno));
exit(-1); exit(-1);
@ -194,10 +194,10 @@ int main(int argc, char *argv[])
} else { /* encrypt */ } else { /* encrypt */
/* Setup yarrow for random bytes for IV */ /* Setup yarrow for random bytes for IV */
if ((errno = rng_make_prng(128, find_prng("yarrow"), &prng, NULL)) != CRYPT_OK) { if ((errno = rng_make_prng(128, find_prng("yarrow"), &prng, NULL)) != CRYPT_OK) {
printf("Error setting up PRNG, %s\n", error_to_string(errno)); printf("Error setting up PRNG, %s\n", error_to_string(errno));
} }
/* You can use rng_get_bytes on platforms that support it */ /* You can use rng_get_bytes on platforms that support it */
/* x = rng_get_bytes(IV,ivsize,NULL);*/ /* x = rng_get_bytes(IV,ivsize,NULL);*/
@ -206,7 +206,7 @@ int main(int argc, char *argv[])
printf("Error reading PRNG for IV required.\n"); printf("Error reading PRNG for IV required.\n");
exit(-1); exit(-1);
} }
if (fwrite(IV,1,ivsize,fdout) != ivsize) { if (fwrite(IV,1,ivsize,fdout) != ivsize) {
printf("Error writing IV to output.\n"); printf("Error writing IV to output.\n");
exit(-1); exit(-1);
@ -229,7 +229,7 @@ int main(int argc, char *argv[])
printf("Error writing to output.\n"); printf("Error writing to output.\n");
exit(-1); exit(-1);
} }
} while (y == sizeof(inbuf)); } while (y == sizeof(inbuf));
fclose(fdout); fclose(fdout);
fclose(fdin); fclose(fdin);
} }

View File

@ -121,12 +121,12 @@ void hash_gen(void)
unsigned long outlen, x, y, z; unsigned long outlen, x, y, z;
FILE *out; FILE *out;
int err; int err;
out = fopen("hash_tv.txt", "w"); out = fopen("hash_tv.txt", "w");
if (out == NULL) { if (out == NULL) {
perror("can't open hash_tv"); perror("can't open hash_tv");
} }
fprintf(out, "Hash Test Vectors:\n\nThese are the hashes of nn bytes '00 01 02 03 .. (nn-1)'\n\n"); fprintf(out, "Hash Test Vectors:\n\nThese are the hashes of nn bytes '00 01 02 03 .. (nn-1)'\n\n");
for (x = 0; hash_descriptor[x].name != NULL; x++) { for (x = 0; hash_descriptor[x].name != NULL; x++) {
buf = XMALLOC(2 * hash_descriptor[x].blocksize + 1); buf = XMALLOC(2 * hash_descriptor[x].blocksize + 1);
@ -163,16 +163,16 @@ void cipher_gen(void)
int err, kl, lastkl; int err, kl, lastkl;
FILE *out; FILE *out;
symmetric_key skey; symmetric_key skey;
out = fopen("cipher_tv.txt", "w"); out = fopen("cipher_tv.txt", "w");
fprintf(out, fprintf(out,
"Cipher Test Vectors\n\nThese are test encryptions with key of nn bytes '00 01 02 03 .. (nn-1)' and original PT of the same style.\n" "Cipher Test Vectors\n\nThese are test encryptions with key of nn bytes '00 01 02 03 .. (nn-1)' and original PT of the same style.\n"
"The output of step N is used as the key and plaintext for step N+1 (key bytes repeated as required to fill the key)\n\n"); "The output of step N is used as the key and plaintext for step N+1 (key bytes repeated as required to fill the key)\n\n");
for (x = 0; cipher_descriptor[x].name != NULL; x++) { for (x = 0; cipher_descriptor[x].name != NULL; x++) {
fprintf(out, "Cipher: %s\n", cipher_descriptor[x].name); fprintf(out, "Cipher: %s\n", cipher_descriptor[x].name);
/* three modes, smallest, medium, large keys */ /* three modes, smallest, medium, large keys */
lastkl = 10000; lastkl = 10000;
for (y = 0; y < 3; y++) { for (y = 0; y < 3; y++) {
@ -202,7 +202,7 @@ void cipher_gen(void)
printf("setup error: %s\n", error_to_string(err)); printf("setup error: %s\n", error_to_string(err));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
for (z = 0; (int)z < cipher_descriptor[x].block_length; z++) { for (z = 0; (int)z < cipher_descriptor[x].block_length; z++) {
pt[z] = (unsigned char)z; pt[z] = (unsigned char)z;
} }
@ -229,7 +229,7 @@ void cipher_gen(void)
fprintf(out, "\n"); fprintf(out, "\n");
} }
fclose(out); fclose(out);
} }
void hmac_gen(void) void hmac_gen(void)
{ {
@ -237,17 +237,17 @@ void hmac_gen(void)
int x, y, z, err; int x, y, z, err;
FILE *out; FILE *out;
unsigned long len; unsigned long len;
out = fopen("hmac_tv.txt", "w"); out = fopen("hmac_tv.txt", "w");
fprintf(out, fprintf(out,
"HMAC Tests. In these tests messages of N bytes long (00,01,02,...,NN-1) are HMACed. The initial key is\n" "HMAC Tests. In these tests messages of N bytes long (00,01,02,...,NN-1) are HMACed. The initial key is\n"
"of the same format (the same length as the HASH output size). The HMAC key in step N+1 is the HMAC output of\n" "of the same format (the same length as the HASH output size). The HMAC key in step N+1 is the HMAC output of\n"
"step N.\n\n"); "step N.\n\n");
for (x = 0; hash_descriptor[x].name != NULL; x++) { for (x = 0; hash_descriptor[x].name != NULL; x++) {
fprintf(out, "HMAC-%s\n", hash_descriptor[x].name); fprintf(out, "HMAC-%s\n", hash_descriptor[x].name);
/* initial key */ /* initial key */
for (y = 0; y < (int)hash_descriptor[x].hashsize; y++) { for (y = 0; y < (int)hash_descriptor[x].hashsize; y++) {
key[y] = (y&255); key[y] = (y&255);
@ -258,7 +258,7 @@ void hmac_gen(void)
perror("Can't malloc memory"); perror("Can't malloc memory");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
for (y = 0; y <= (int)(hash_descriptor[x].blocksize * 2); y++) { for (y = 0; y <= (int)(hash_descriptor[x].blocksize * 2); y++) {
for (z = 0; z < y; z++) { for (z = 0; z < y; z++) {
input[z] = (unsigned char)(z & 255); input[z] = (unsigned char)(z & 255);
@ -282,17 +282,17 @@ void hmac_gen(void)
} }
fclose(out); fclose(out);
} }
void omac_gen(void) void omac_gen(void)
{ {
unsigned char key[MAXBLOCKSIZE], output[MAXBLOCKSIZE], input[MAXBLOCKSIZE*2+2]; unsigned char key[MAXBLOCKSIZE], output[MAXBLOCKSIZE], input[MAXBLOCKSIZE*2+2];
int err, x, y, z, kl; int err, x, y, z, kl;
FILE *out; FILE *out;
unsigned long len; unsigned long len;
out = fopen("omac_tv.txt", "w"); out = fopen("omac_tv.txt", "w");
fprintf(out, fprintf(out,
"OMAC Tests. In these tests messages of N bytes long (00,01,02,...,NN-1) are OMAC'ed. The initial key is\n" "OMAC Tests. In these tests messages of N bytes long (00,01,02,...,NN-1) are OMAC'ed. The initial key is\n"
"of the same format (length specified per cipher). The OMAC key in step N+1 is the OMAC output of\n" "of the same format (length specified per cipher). The OMAC key in step N+1 is the OMAC output of\n"
"step N (repeated as required to fill the array).\n\n"); "step N (repeated as required to fill the array).\n\n");
@ -307,12 +307,12 @@ void omac_gen(void)
kl = cipher_descriptor[x].max_key_length; kl = cipher_descriptor[x].max_key_length;
} }
fprintf(out, "OMAC-%s (%d byte key)\n", cipher_descriptor[x].name, kl); fprintf(out, "OMAC-%s (%d byte key)\n", cipher_descriptor[x].name, kl);
/* initial key/block */ /* initial key/block */
for (y = 0; y < kl; y++) { for (y = 0; y < kl; y++) {
key[y] = (y & 255); key[y] = (y & 255);
} }
for (y = 0; y <= (int)(cipher_descriptor[x].block_length*2); y++) { for (y = 0; y <= (int)(cipher_descriptor[x].block_length*2); y++) {
for (z = 0; z < y; z++) { for (z = 0; z < y; z++) {
input[z] = (unsigned char)(z & 255); input[z] = (unsigned char)(z & 255);
@ -344,10 +344,10 @@ void pmac_gen(void)
int err, x, y, z, kl; int err, x, y, z, kl;
FILE *out; FILE *out;
unsigned long len; unsigned long len;
out = fopen("pmac_tv.txt", "w"); out = fopen("pmac_tv.txt", "w");
fprintf(out, fprintf(out,
"PMAC Tests. In these tests messages of N bytes long (00,01,02,...,NN-1) are PMAC'ed. The initial key is\n" "PMAC Tests. In these tests messages of N bytes long (00,01,02,...,NN-1) are PMAC'ed. The initial key is\n"
"of the same format (length specified per cipher). The PMAC key in step N+1 is the PMAC output of\n" "of the same format (length specified per cipher). The PMAC key in step N+1 is the PMAC output of\n"
"step N (repeated as required to fill the array).\n\n"); "step N (repeated as required to fill the array).\n\n");
@ -362,12 +362,12 @@ void pmac_gen(void)
kl = cipher_descriptor[x].max_key_length; kl = cipher_descriptor[x].max_key_length;
} }
fprintf(out, "PMAC-%s (%d byte key)\n", cipher_descriptor[x].name, kl); fprintf(out, "PMAC-%s (%d byte key)\n", cipher_descriptor[x].name, kl);
/* initial key/block */ /* initial key/block */
for (y = 0; y < kl; y++) { for (y = 0; y < kl; y++) {
key[y] = (y & 255); key[y] = (y & 255);
} }
for (y = 0; y <= (int)(cipher_descriptor[x].block_length*2); y++) { for (y = 0; y <= (int)(cipher_descriptor[x].block_length*2); y++) {
for (z = 0; z < y; z++) { for (z = 0; z < y; z++) {
input[z] = (unsigned char)(z & 255); input[z] = (unsigned char)(z & 255);
@ -397,7 +397,7 @@ void eax_gen(void)
{ {
int err, kl, x, y1, z; int err, kl, x, y1, z;
FILE *out; FILE *out;
unsigned char key[MAXBLOCKSIZE], nonce[MAXBLOCKSIZE*2], header[MAXBLOCKSIZE*2], unsigned char key[MAXBLOCKSIZE], nonce[MAXBLOCKSIZE*2], header[MAXBLOCKSIZE*2],
plaintext[MAXBLOCKSIZE*2], tag[MAXBLOCKSIZE]; plaintext[MAXBLOCKSIZE*2], tag[MAXBLOCKSIZE];
unsigned long len; unsigned long len;
@ -421,7 +421,7 @@ void eax_gen(void)
for (z = 0; z < kl; z++) { for (z = 0; z < kl; z++) {
key[z] = (z & 255); key[z] = (z & 255);
} }
for (y1 = 0; y1 <= (int)(cipher_descriptor[x].block_length*2); y1++){ for (y1 = 0; y1 <= (int)(cipher_descriptor[x].block_length*2); y1++){
for (z = 0; z < y1; z++) { for (z = 0; z < y1; z++) {
plaintext[z] = (unsigned char)(z & 255); plaintext[z] = (unsigned char)(z & 255);
@ -457,7 +457,7 @@ void ocb_gen(void)
{ {
int err, kl, x, y1, z; int err, kl, x, y1, z;
FILE *out; FILE *out;
unsigned char key[MAXBLOCKSIZE], nonce[MAXBLOCKSIZE*2], unsigned char key[MAXBLOCKSIZE], nonce[MAXBLOCKSIZE*2],
plaintext[MAXBLOCKSIZE*2], tag[MAXBLOCKSIZE]; plaintext[MAXBLOCKSIZE*2], tag[MAXBLOCKSIZE];
unsigned long len; unsigned long len;
@ -486,7 +486,7 @@ void ocb_gen(void)
for (z = 0; z < cipher_descriptor[x].block_length; z++) { for (z = 0; z < cipher_descriptor[x].block_length; z++) {
nonce[z] = z; nonce[z] = z;
} }
for (y1 = 0; y1 <= (int)(cipher_descriptor[x].block_length*2); y1++){ for (y1 = 0; y1 <= (int)(cipher_descriptor[x].block_length*2); y1++){
for (z = 0; z < y1; z++) { for (z = 0; z < y1; z++) {
plaintext[z] = (unsigned char)(z & 255); plaintext[z] = (unsigned char)(z & 255);
@ -520,7 +520,7 @@ void ocb3_gen(void)
{ {
int err, kl, x, y1, z; int err, kl, x, y1, z;
FILE *out; FILE *out;
unsigned char key[MAXBLOCKSIZE], nonce[MAXBLOCKSIZE*2], unsigned char key[MAXBLOCKSIZE], nonce[MAXBLOCKSIZE*2],
plaintext[MAXBLOCKSIZE*2], tag[MAXBLOCKSIZE]; plaintext[MAXBLOCKSIZE*2], tag[MAXBLOCKSIZE];
unsigned long len; unsigned long len;
@ -549,7 +549,7 @@ void ocb3_gen(void)
for (z = 0; z < cipher_descriptor[x].block_length; z++) { for (z = 0; z < cipher_descriptor[x].block_length; z++) {
nonce[z] = z; nonce[z] = z;
} }
for (y1 = 0; y1 <= (int)(cipher_descriptor[x].block_length*2); y1++){ for (y1 = 0; y1 <= (int)(cipher_descriptor[x].block_length*2); y1++){
for (z = 0; z < y1; z++) { for (z = 0; z < y1; z++) {
plaintext[z] = (unsigned char)(z & 255); plaintext[z] = (unsigned char)(z & 255);
@ -583,7 +583,7 @@ void ccm_gen(void)
{ {
int err, kl, x, y1, z; int err, kl, x, y1, z;
FILE *out; FILE *out;
unsigned char key[MAXBLOCKSIZE], nonce[MAXBLOCKSIZE*2], unsigned char key[MAXBLOCKSIZE], nonce[MAXBLOCKSIZE*2],
plaintext[MAXBLOCKSIZE*2], tag[MAXBLOCKSIZE]; plaintext[MAXBLOCKSIZE*2], tag[MAXBLOCKSIZE];
unsigned long len; unsigned long len;
@ -612,7 +612,7 @@ void ccm_gen(void)
for (z = 0; z < cipher_descriptor[x].block_length; z++) { for (z = 0; z < cipher_descriptor[x].block_length; z++) {
nonce[z] = z; nonce[z] = z;
} }
for (y1 = 0; y1 <= (int)(cipher_descriptor[x].block_length*2); y1++){ for (y1 = 0; y1 <= (int)(cipher_descriptor[x].block_length*2); y1++){
for (z = 0; z < y1; z++) { for (z = 0; z < y1; z++) {
plaintext[z] = (unsigned char)(z & 255); plaintext[z] = (unsigned char)(z & 255);
@ -669,7 +669,7 @@ void gcm_gen(void)
for (z = 0; z < kl; z++) { for (z = 0; z < kl; z++) {
key[z] = (z & 255); key[z] = (z & 255);
} }
for (y1 = 0; y1 <= (int)(cipher_descriptor[x].block_length*2); y1++){ for (y1 = 0; y1 <= (int)(cipher_descriptor[x].block_length*2); y1++){
for (z = 0; z < y1; z++) { for (z = 0; z < y1; z++) {
plaintext[z] = (unsigned char)(z & 255); plaintext[z] = (unsigned char)(z & 255);
@ -704,7 +704,7 @@ void base64_gen(void)
FILE *out; FILE *out;
unsigned char dst[256], src[32]; unsigned char dst[256], src[32];
unsigned long x, y, len; unsigned long x, y, len;
out = fopen("base64_tv.txt", "w"); out = fopen("base64_tv.txt", "w");
fprintf(out, "Base64 vectors. These are the base64 encodings of the strings 00,01,02...NN-1\n\n"); fprintf(out, "Base64 vectors. These are the base64 encodings of the strings 00,01,02...NN-1\n\n");
for (x = 0; x <= 32; x++) { for (x = 0; x <= 32; x++) {
@ -746,7 +746,7 @@ void ecc_gen(void)
mp_read_radix(modulus, (char *)ltc_ecc_sets[x].prime, 16); mp_read_radix(modulus, (char *)ltc_ecc_sets[x].prime, 16);
mp_read_radix(G->x, (char *)ltc_ecc_sets[x].Gx, 16); mp_read_radix(G->x, (char *)ltc_ecc_sets[x].Gx, 16);
mp_read_radix(G->y, (char *)ltc_ecc_sets[x].Gy, 16); mp_read_radix(G->y, (char *)ltc_ecc_sets[x].Gy, 16);
mp_set(G->z, 1); mp_set(G->z, 1);
while (mp_cmp(k, order) == LTC_MP_LT) { while (mp_cmp(k, order) == LTC_MP_LT) {
ltc_mp.ecc_ptmul(k, G, R, modulus, 1); ltc_mp.ecc_ptmul(k, G, R, modulus, 1);
@ -768,7 +768,7 @@ void lrw_gen(void)
unsigned char tweak[16], key[16], iv[16], buf[1024]; unsigned char tweak[16], key[16], iv[16], buf[1024];
int x, y, err; int x, y, err;
symmetric_LRW lrw; symmetric_LRW lrw;
/* initialize default key and tweak */ /* initialize default key and tweak */
for (x = 0; x < 16; x++) { for (x = 0; x < 16; x++) {
tweak[x] = key[x] = iv[x] = x; tweak[x] = key[x] = iv[x] = x;
@ -825,7 +825,7 @@ void lrw_gen(void)
lrw_done(&lrw); lrw_done(&lrw);
} }
fclose(out); fclose(out);
} }
int main(void) int main(void)
{ {