diff options
author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-06-24 13:03:20 (GMT) |
---|---|---|
committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-06-24 13:03:20 (GMT) |
commit | 758bda908ded461c9d34d274a18454ffba4b7450 (patch) | |
tree | fb7f1ba28eab9f20b4ca16ed4dbc36d07dfce06e /src/uscxml/util | |
parent | febde41c4c69d8f38967d5c195328d468834d037 (diff) | |
download | uscxml-758bda908ded461c9d34d274a18454ffba4b7450.zip uscxml-758bda908ded461c9d34d274a18454ffba4b7450.tar.gz uscxml-758bda908ded461c9d34d274a18454ffba4b7450.tar.bz2 |
- Prolog DM compiles with recent SWI release again
- Bugfixes for stress test
- Beautified code
Diffstat (limited to 'src/uscxml/util')
-rw-r--r-- | src/uscxml/util/Base64.h | 47 | ||||
-rw-r--r-- | src/uscxml/util/MD5.h | 58 | ||||
-rw-r--r-- | src/uscxml/util/SHA1.h | 42 |
3 files changed, 73 insertions, 74 deletions
diff --git a/src/uscxml/util/Base64.h b/src/uscxml/util/Base64.h index a07d24e..3a6f95d 100644 --- a/src/uscxml/util/Base64.h +++ b/src/uscxml/util/Base64.h @@ -24,37 +24,36 @@ extern "C" { /// DECODE - typedef enum - { - step_a, step_b, step_c, step_d - } - base64_decodestep; +typedef enum { + step_a, step_b, step_c, step_d +} +base64_decodestep; - typedef struct { - base64_decodestep step; - char plainchar; - } base64_decodestate; +typedef struct { + base64_decodestep step; + char plainchar; +} base64_decodestate; - USCXML_API void base64_init_decodestate(base64_decodestate* state_in); - USCXML_API int base64_decode_value(char value_in); - USCXML_API int base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in); +USCXML_API void base64_init_decodestate(base64_decodestate* state_in); +USCXML_API int base64_decode_value(char value_in); +USCXML_API int base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in); /// ENDCODE - typedef enum { - step_A, step_B, step_C - } base64_encodestep; +typedef enum { + step_A, step_B, step_C +} base64_encodestep; - typedef struct { - base64_encodestep step; - char result; - int stepcount; - } base64_encodestate; +typedef struct { + base64_encodestep step; + char result; + int stepcount; +} base64_encodestate; - USCXML_API void base64_init_encodestate(base64_encodestate* state_in); - USCXML_API char base64_encode_value(char value_in); - USCXML_API int base64_encode_block(const char* plaintext_in, int length_in, char* code_out, base64_encodestate* state_in); - USCXML_API int base64_encode_blockend(char* code_out, base64_encodestate* state_in); +USCXML_API void base64_init_encodestate(base64_encodestate* state_in); +USCXML_API char base64_encode_value(char value_in); +USCXML_API int base64_encode_block(const char* plaintext_in, int length_in, char* code_out, base64_encodestate* state_in); +USCXML_API int base64_encode_blockend(char* code_out, base64_encodestate* state_in); #ifdef __cplusplus } diff --git a/src/uscxml/util/MD5.h b/src/uscxml/util/MD5.h index 840c704..5c4d263 100644 --- a/src/uscxml/util/MD5.h +++ b/src/uscxml/util/MD5.h @@ -64,35 +64,35 @@ extern "C" { #endif - /* - * This package supports both compile-time and run-time determination of CPU - * byte order. If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be - * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is - * defined as non-zero, the code will be compiled to run only on big-endian - * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to - * run on either big- or little-endian CPUs, but will run slightly less - * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined. - */ - - typedef unsigned char md5_byte_t; /* 8-bit byte */ - typedef unsigned int md5_word_t; /* 32-bit word */ - - /* Define the state of the MD5 Algorithm. */ - typedef struct md5_state_s { - md5_word_t count[2]; /* message length in bits, lsw first */ - md5_word_t abcd[4]; /* digest buffer */ - md5_byte_t buf[64]; /* accumulate block */ - } md5_state_t; - - - /* Initialize the algorithm. */ - USCXML_API void md5_init(md5_state_t *pms); - - /* Append a string to the message. */ - USCXML_API void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes); - - /* Finish the message and return the digest. */ - USCXML_API void md5_finish(md5_state_t *pms, md5_byte_t digest[16]); +/* + * This package supports both compile-time and run-time determination of CPU + * byte order. If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be + * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is + * defined as non-zero, the code will be compiled to run only on big-endian + * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to + * run on either big- or little-endian CPUs, but will run slightly less + * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined. + */ + +typedef unsigned char md5_byte_t; /* 8-bit byte */ +typedef unsigned int md5_word_t; /* 32-bit word */ + +/* Define the state of the MD5 Algorithm. */ +typedef struct md5_state_s { + md5_word_t count[2]; /* message length in bits, lsw first */ + md5_word_t abcd[4]; /* digest buffer */ + md5_byte_t buf[64]; /* accumulate block */ +} md5_state_t; + + +/* Initialize the algorithm. */ +USCXML_API void md5_init(md5_state_t *pms); + +/* Append a string to the message. */ +USCXML_API void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes); + +/* Finish the message and return the digest. */ +USCXML_API void md5_finish(md5_state_t *pms, md5_byte_t digest[16]); #ifdef __cplusplus } /* end extern "C" */ diff --git a/src/uscxml/util/SHA1.h b/src/uscxml/util/SHA1.h index f9baa5b..1bbfaf5 100644 --- a/src/uscxml/util/SHA1.h +++ b/src/uscxml/util/SHA1.h @@ -55,31 +55,31 @@ extern "C" { #endif - /* - * This structure will hold context information for the hashing - * operation - */ - typedef struct SHA1Context { - unsigned Message_Digest[5]; /* Message Digest (output) */ +/* + * This structure will hold context information for the hashing + * operation + */ +typedef struct SHA1Context { + unsigned Message_Digest[5]; /* Message Digest (output) */ - unsigned Length_Low; /* Message length in bits */ - unsigned Length_High; /* Message length in bits */ + unsigned Length_Low; /* Message length in bits */ + unsigned Length_High; /* Message length in bits */ - unsigned char Message_Block[64]; /* 512-bit message blocks */ - int Message_Block_Index; /* Index into message block array */ + unsigned char Message_Block[64]; /* 512-bit message blocks */ + int Message_Block_Index; /* Index into message block array */ - int Computed; /* Is the digest computed? */ - int Corrupted; /* Is the message digest corruped? */ - } SHA1Context; + int Computed; /* Is the digest computed? */ + int Corrupted; /* Is the message digest corruped? */ +} SHA1Context; - /* - * Function Prototypes - */ - USCXML_API void SHA1Reset(SHA1Context *); - USCXML_API int SHA1Result(SHA1Context *); - USCXML_API void SHA1Input(SHA1Context *, - const unsigned char *, - unsigned); +/* + * Function Prototypes + */ +USCXML_API void SHA1Reset(SHA1Context *); +USCXML_API int SHA1Result(SHA1Context *); +USCXML_API void SHA1Input(SHA1Context *, + const unsigned char *, + unsigned); #ifdef __cplusplus } |