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

clean up/trim trailing spaces

Browse Source
This commit is contained in:
Steffen Jaeckel 2014-07-15 13:58:48 +02:00
parent a6b6884982
commit e628fb9203
5 changed files with 83 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
demos/demo_crypt_constants.c
View File

@ -12,43 +12,43 @@
/** /**
@file demo_crypt_constants.c @file demo_crypt_constants.c
Demo how to get various constants to dynamic languages Demo how to get various constants to dynamic languages
like Python like Python
Larry Bugbee, February 2013 Larry Bugbee, February 2013
*/ */
int main(void) { int main(void) {
int rc;
printf("\n");
// given a specific constant name, get and print its value // given a specific constant name, get and print its value
char name[] = "CTR_COUNTER_BIG_ENDIAN"; char name[] = "CTR_COUNTER_BIG_ENDIAN";
int value; int value;
rc = crypt_get_constant(name, &value); if (crypt_get_constant(name, &value) != 0)
printf(" %s is %d \n", name, value); exit(EXIT_FAILURE);
printf("\n"); printf("\n %s is %d \n\n", name, value);
// get and print the length of the names (and values) list // get and print the length of the names (and values) list
char *names_list; char *names_list;
unsigned long names_list_len; unsigned long names_list_len;
rc = crypt_list_all_constants(NULL, &names_list_len); if (crypt_list_all_constants(NULL, &names_list_len) != 0)
printf(" need to allocate %lu bytes \n", names_list_len); exit(EXIT_FAILURE);
printf("\n"); printf(" need to allocate %lu bytes \n\n", names_list_len);
// get and print the names (and values) list // get and print the names (and values) list
names_list = malloc(names_list_len); if ((names_list = malloc(names_list_len)) == NULL)
rc = crypt_list_all_constants(names_list, &names_list_len); exit(EXIT_FAILURE);
printf(" supported constants: \n%s \n", names_list); if (crypt_list_all_constants(names_list, &names_list_len) != 0)
printf("\n"); exit(EXIT_FAILURE);
printf(" supported constants:\n\n%s\n\n", names_list);
free(names_list);
return 0;
} }
/* $Source: $ */ /* $Source$ */
/* $Revision: $ */ /* $Revision$ */
/* $Date: $ */ /* $Date$ */

20
demos/demo_crypt_sizes.c
View File

@ -12,35 +12,31 @@
/** /**
@file demo_crypt_sizes.c @file demo_crypt_sizes.c
Demo how to get various sizes to dynamic languages Demo how to get various sizes to dynamic languages
like Python - Larry Bugbee, February 2013 like Python - Larry Bugbee, February 2013
*/ */
int main(void) { int main(void) {
int rc; int rc;
printf("\n");
// given a specific size name, get and print its size // given a specific size name, get and print its size
char name[] = "ecc_key_struct_size"; char name[] = "ecc_key_struct_size";
int size; int size;
rc = crypt_get_size(name, &size); rc = crypt_get_size(name, &size);
printf(" %s is %d \n", name, size); printf("\n size of '%s' is %d \n\n", name, size);
printf("\n");
// get and print the length of the names (and sizes) list // get and print the length of the names (and sizes) list
char *sizes_list; char *sizes_list;
unsigned long sizes_list_len; unsigned long sizes_list_len;
rc = crypt_list_all_sizes(NULL, &sizes_list_len); rc = crypt_list_all_sizes(NULL, &sizes_list_len);
printf(" need to allocate %lu bytes \n", sizes_list_len); printf(" need to allocate %lu bytes \n\n", sizes_list_len);
printf("\n");
// get and print the names (and sizes) list // get and print the names (and sizes) list
sizes_list = malloc(sizes_list_len); sizes_list = malloc(sizes_list_len);
rc = crypt_list_all_sizes(sizes_list, &sizes_list_len); rc = crypt_list_all_sizes(sizes_list, &sizes_list_len);
printf(" supported sizes: %s \n", sizes_list); printf(" supported sizes:\n\n%s\n\n", sizes_list);
printf("\n");
} }

6
src/headers/tomcrypt_misc.h
View File

@ -51,12 +51,10 @@ int crypt_fsa(void *mp, ...);
/* ---- Dynamic language support ---- */ /* ---- Dynamic language support ---- */
int crypt_get_constant(const char* namein, int *valueout); int crypt_get_constant(const char* namein, int *valueout);
int crypt_list_all_constants(char *names_list, int crypt_list_all_constants(char *names_list, unsigned long *names_list_size);
unsigned long *names_list_size);
int crypt_get_size(const char* namein, int *sizeout); int crypt_get_size(const char* namein, int *sizeout);
int crypt_list_all_sizes(char *names_list, int crypt_list_all_sizes(char *names_list, unsigned long *names_list_size);
unsigned long *names_list_size);
void init_LTM(void); void init_LTM(void);
void init_TFM(void); void init_TFM(void);

58
src/misc/crypt/crypt_constants.c
View File

@ -12,10 +12,10 @@
/** /**
@file crypt_constants.c @file crypt_constants.c
Make various constants available to dynamic languages Make various constants available to dynamic languages
like Python - Larry Bugbee, February 2013 like Python - Larry Bugbee, February 2013
LB - Dec 2013 - revised to include compiler define options LB - Dec 2013 - revised to include compiler define options
LB - Mar 2014 - added endianness and word size LB - Mar 2014 - added endianness and word size
*/ */
@ -39,7 +39,7 @@ crypt_constant _crypt_constants[] = {
{"MIN_RSA_SIZE", MIN_RSA_SIZE}, {"MIN_RSA_SIZE", MIN_RSA_SIZE},
{"MAX_RSA_SIZE", MAX_RSA_SIZE}, {"MAX_RSA_SIZE", MAX_RSA_SIZE},
#endif #endif
#ifdef LTC_PKCS_1 #ifdef LTC_PKCS_1
{"LTC_PKCS_1_OAEP", LTC_PKCS_1_OAEP}, {"LTC_PKCS_1_OAEP", LTC_PKCS_1_OAEP},
{"LTC_PKCS_1_PSS", LTC_PKCS_1_PSS}, {"LTC_PKCS_1_PSS", LTC_PKCS_1_PSS},
@ -47,27 +47,27 @@ crypt_constant _crypt_constants[] = {
#endif #endif
#ifdef ENDIAN_LITTLE #ifdef ENDIAN_LITTLE
{"ENDIAN_LITTLE", 1}, // true {"ENDIAN_LITTLE", 1},
#else #else
{"ENDIAN_LITTLE", 0}, // false {"ENDIAN_LITTLE", 0},
#endif #endif
#ifdef ENDIAN_BIG #ifdef ENDIAN_BIG
{"ENDIAN_BIG", 1}, // true {"ENDIAN_BIG", 1},
#else #else
{"ENDIAN_BIG", 0}, // false {"ENDIAN_BIG", 0},
#endif #endif
#ifdef ENDIAN_32BITWORD #ifdef ENDIAN_32BITWORD
{"ENDIAN_32BITWORD", 1}, // true {"ENDIAN_32BITWORD", 1},
#else #else
{"ENDIAN_32BITWORD", 0}, // false {"ENDIAN_32BITWORD", 0},
#endif #endif
#ifdef ENDIAN_64BITWORD #ifdef ENDIAN_64BITWORD
{"ENDIAN_64BITWORD", 1}, // true {"ENDIAN_64BITWORD", 1},
#else #else
{"ENDIAN_64BITWORD", 0}, // false {"ENDIAN_64BITWORD", 0},
#endif #endif
}; };
@ -89,32 +89,31 @@ int crypt_get_constant(const char* namein, int *valueout) {
} }
/* crypt_list_all_constants() /* crypt_list_all_constants()
* if names_list is NULL, names_list_size will be the minimum * if names_list is NULL, names_list_size will be the minimum
* number of bytes needed to receive the complete names_list * number of bytes needed to receive the complete names_list
* if names_list is NOT NULL, names_list must be the addr of * if names_list is NOT NULL, names_list must be the addr of
* sufficient memory allocated into which the names_list * sufficient memory allocated into which the names_list
* is to be written. Also, the value in names_list_size * is to be written. Also, the value in names_list_size
* sets the upper bound of the number of characters to be * sets the upper bound of the number of characters to be
* written. * written.
* a -1 return value signifies insufficient space made available * a -1 return value signifies insufficient space made available
*/ */
int crypt_list_all_constants(char *names_list, int crypt_list_all_constants(char *names_list, unsigned long *names_list_size) {
unsigned long *names_list_size) {
int i; int i;
unsigned long total_len = 0; unsigned long total_len = 0;
char number[10]; char number[10];
int number_len; int number_len;
int count = sizeof(_crypt_constants) / sizeof(crypt_constant); int count = sizeof(_crypt_constants) / sizeof(_crypt_constants[0]);
/* calculate amount of memory required for the list */ /* calculate amount of memory required for the list */
for (i=0; i<count; i++) { for (i=0; i<count; i++) {
total_len += strlen(_crypt_constants[i].name) + 1; total_len += strlen(_crypt_constants[i].name) + 1;
// the above +1 is for the commas /* the above +1 is for the commas */
sprintf(number,"%lu",_crypt_constants[i].value); sprintf(number,"%lu",_crypt_constants[i].value);
total_len += strlen(number) + 1; total_len += strlen(number) + 1;
// this last +1 is for newlines (and ending NULL) /* this last +1 is for newlines (and ending NULL) */
} }
if (names_list == NULL) { if (names_list == NULL) {
*names_list_size = total_len; *names_list_size = total_len;
} else { } else {
@ -128,20 +127,21 @@ int crypt_list_all_constants(char *names_list,
ptr += strlen(_crypt_constants[i].name); ptr += strlen(_crypt_constants[i].name);
strcpy(ptr, ","); strcpy(ptr, ",");
ptr += 1; ptr += 1;
number_len = sprintf(number,"%lu",_crypt_constants[i].value); number_len = sprintf(number,"%lu",_crypt_constants[i].value);
strcpy(ptr, number); strcpy(ptr, number);
ptr += number_len; ptr += number_len;
strcpy(ptr, "\n"); strcpy(ptr, "\n");
ptr += 1; ptr += 1;
} }
ptr -= 1; // to remove the trailing comma /* to remove the trailing new-line */
ptr -= 1;
*ptr = 0; *ptr = 0;
} }
return 0; return 0;
} }
/* $Source: /cvs/libtom/libtomcrypt/src/misc/crypt/crypt_constants.c,v $ */ /* $Source$ */
/* $Revision: $ */ /* $Revision$ */
/* $Date: $ */ /* $Date$ */

40
src/misc/crypt/crypt_sizes.c
View File

@ -12,8 +12,8 @@
/** /**
@file crypt_sizes.c @file crypt_sizes.c
Make various struct sizes available to dynamic languages Make various struct sizes available to dynamic languages
like Python - Larry Bugbee, February 2013 like Python - Larry Bugbee, February 2013
LB - Dec 2013 - revised to include compiler define options LB - Dec 2013 - revised to include compiler define options
@ -68,7 +68,7 @@ crypt_size _crypt_sizes[] = {
#ifdef LTC_CHC_HASH #ifdef LTC_CHC_HASH
{"chc_state_struct_size", sizeof(struct chc_state)}, {"chc_state_struct_size", sizeof(struct chc_state)},
#endif #endif
// block cipher key sizes // block cipher key sizes
{"cipher_descriptor_struct_size", sizeof(struct ltc_cipher_descriptor)}, {"cipher_descriptor_struct_size", sizeof(struct ltc_cipher_descriptor)},
{"symmetric_key_union_size", sizeof(symmetric_key)}, {"symmetric_key_union_size", sizeof(symmetric_key)},
@ -247,32 +247,31 @@ int crypt_get_size(const char* namein, int *sizeout) {
} }
/* crypt_list_all_sizes() /* crypt_list_all_sizes()
* if names_list is NULL, names_list_size will be the minimum * if names_list is NULL, names_list_size will be the minimum
* size needed to receive the complete names_list * size needed to receive the complete names_list
* if names_list is NOT NULL, names_list must be the addr with * if names_list is NOT NULL, names_list must be the addr with
* sufficient memory allocated into which the names_list * sufficient memory allocated into which the names_list
* is to be written. Also, the value in names_list_size * is to be written. Also, the value in names_list_size
* sets the upper bound of the number of characters to be * sets the upper bound of the number of characters to be
* written. * written.
* a -1 return value signifies insufficient space made available * a -1 return value signifies insufficient space made available
*/ */
int crypt_list_all_sizes(char *names_list, int crypt_list_all_sizes(char *names_list, unsigned long *names_list_size) {
unsigned long *names_list_size) {
int i; int i;
unsigned long total_len = 0; unsigned long total_len = 0;
char number[10]; char number[10];
int number_len; int number_len;
int count = sizeof(_crypt_sizes) / sizeof(crypt_size); int count = sizeof(_crypt_sizes) / sizeof(_crypt_sizes[0]);
/* calculate amount of memory required for the list */ /* calculate amount of memory required for the list */
for (i=0; i<count; i++) { for (i=0; i<count; i++) {
total_len += strlen(_crypt_sizes[i].name) + 1; total_len += strlen(_crypt_sizes[i].name) + 1;
// the above +1 is for the commas /* the above +1 is for the commas */
sprintf(number,"%lu",_crypt_sizes[i].size); sprintf(number,"%lu",_crypt_sizes[i].size);
total_len += strlen(number) + 1; total_len += strlen(number) + 1;
// this last +1 is for newlines (and ending NULL) /* this last +1 is for newlines (and ending NULL) */
} }
if (names_list == NULL) { if (names_list == NULL) {
*names_list_size = total_len; *names_list_size = total_len;
} else { } else {
@ -286,20 +285,21 @@ int crypt_list_all_sizes(char *names_list,
ptr += strlen(_crypt_sizes[i].name); ptr += strlen(_crypt_sizes[i].name);
strcpy(ptr, ","); strcpy(ptr, ",");
ptr += 1; ptr += 1;
number_len = sprintf(number,"%lu",_crypt_sizes[i].size); number_len = sprintf(number,"%lu",_crypt_sizes[i].size);
strcpy(ptr, number); strcpy(ptr, number);
ptr += number_len; ptr += number_len;
strcpy(ptr, "\n"); strcpy(ptr, "\n");
ptr += 1; ptr += 1;
} }
ptr -= 1; // to remove the trailing comma /* to remove the trailing new-line */
ptr -= 1;
*ptr = 0; *ptr = 0;
} }
return 0; return 0;
} }
/* $Source: /cvs/libtom/libtomcrypt/src/misc/crypt/crypt_sizes.c,v $ */ /* $Source$ */
/* $Revision: $ */ /* $Revision$ */
/* $Date: $ */ /* $Date$ */