From fe64e3c36398fa08a8fc08cda4dafbd652c213ad Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Sat, 26 Nov 2005 15:48:58 +0000 Subject: [PATCH] bool -> SilcBool --- lib/silccrypt/rsa.c | 10 +-- lib/silccrypt/rsa_internal.h | 8 +-- lib/silccrypt/silccipher.c | 18 +++--- lib/silccrypt/silccipher.h | 52 ++++++++-------- lib/silccrypt/silcdh.h | 20 +++--- lib/silccrypt/silchash.c | 12 ++-- lib/silccrypt/silchash.h | 24 +++---- lib/silccrypt/silchmac.c | 12 ++-- lib/silccrypt/silchmac.h | 24 +++---- lib/silccrypt/silcpkcs.c | 54 ++++++++-------- lib/silccrypt/silcpkcs.h | 90 +++++++++++++-------------- lib/silccrypt/silcpkcs1.c | 4 +- lib/silccrypt/silcpkcs1.h | 8 +-- lib/silccrypt/silcrng.c | 4 +- lib/silccrypt/silcrng.h | 8 +-- lib/silccrypt/tests/test_aes.c | 2 +- lib/silccrypt/tests/test_hmacmd5.c | 2 +- lib/silccrypt/tests/test_hmacsha1.c | 2 +- lib/silccrypt/tests/test_hmacsha256.c | 2 +- lib/silccrypt/tests/test_md5.c | 2 +- lib/silccrypt/tests/test_sha1.c | 2 +- lib/silccrypt/tests/test_sha256.c | 2 +- lib/silccrypt/tests/test_silcpkcs.c | 2 +- 23 files changed, 182 insertions(+), 182 deletions(-) diff --git a/lib/silccrypt/rsa.c b/lib/silccrypt/rsa.c index b905a794..e557901f 100644 --- a/lib/silccrypt/rsa.c +++ b/lib/silccrypt/rsa.c @@ -89,7 +89,7 @@ SILC_PKCS_API_INIT(rsa) { SilcUInt32 prime_bits = keylen / 2; SilcMPInt p, q; - bool found = FALSE; + SilcBool found = FALSE; if (keylen < 768 || keylen > 16384) return FALSE; @@ -767,7 +767,7 @@ SILC_PKCS_API_VERIFY(pkcs1) to compute the modulus n has to be generated before calling this. They are then sent as argument for the function. */ -bool rsa_generate_keys(RsaKey *key, SilcUInt32 bits, +SilcBool rsa_generate_keys(RsaKey *key, SilcUInt32 bits, SilcMPInt *p, SilcMPInt *q) { SilcMPInt phi, hlp; @@ -843,7 +843,7 @@ bool rsa_generate_keys(RsaKey *key, SilcUInt32 bits, /* Clears whole key structure. */ -bool rsa_clear_keys(RsaKey *key) +SilcBool rsa_clear_keys(RsaKey *key) { key->bits = 0; if (key->pub_set) { @@ -865,7 +865,7 @@ bool rsa_clear_keys(RsaKey *key) /* RSA public key operation */ -bool rsa_public_operation(RsaKey *key, SilcMPInt *src, SilcMPInt *dst) +SilcBool rsa_public_operation(RsaKey *key, SilcMPInt *src, SilcMPInt *dst) { /* dst = src ^ e mod n */ silc_mp_pow_mod(dst, src, &key->e, &key->n); @@ -874,7 +874,7 @@ bool rsa_public_operation(RsaKey *key, SilcMPInt *src, SilcMPInt *dst) /* RSA private key operation */ -bool rsa_private_operation(RsaKey *key, SilcMPInt *src, SilcMPInt *dst) +SilcBool rsa_private_operation(RsaKey *key, SilcMPInt *src, SilcMPInt *dst) { if (!key->crt) { /* dst = src ^ d mod n */ diff --git a/lib/silccrypt/rsa_internal.h b/lib/silccrypt/rsa_internal.h index d82c579d..f3daa126 100644 --- a/lib/silccrypt/rsa_internal.h +++ b/lib/silccrypt/rsa_internal.h @@ -37,10 +37,10 @@ typedef struct { unsigned int crt : 1; /* TRUE if CRT is used */ } RsaKey; -bool rsa_generate_keys(RsaKey *key, SilcUInt32 bits, +SilcBool rsa_generate_keys(RsaKey *key, SilcUInt32 bits, SilcMPInt *p, SilcMPInt *q); -bool rsa_clear_keys(RsaKey *key); -bool rsa_public_operation(RsaKey *key, SilcMPInt *src, SilcMPInt *dst); -bool rsa_private_operation(RsaKey *key, SilcMPInt *src, SilcMPInt *dst); +SilcBool rsa_clear_keys(RsaKey *key); +SilcBool rsa_public_operation(RsaKey *key, SilcMPInt *src, SilcMPInt *dst); +SilcBool rsa_private_operation(RsaKey *key, SilcMPInt *src, SilcMPInt *dst); #endif diff --git a/lib/silccrypt/silccipher.c b/lib/silccrypt/silccipher.c index 40b4bf2f..29ea8d79 100644 --- a/lib/silccrypt/silccipher.c +++ b/lib/silccrypt/silccipher.c @@ -80,7 +80,7 @@ const SilcCipherObject silc_default_ciphers[] = registered. Therefore, if memory has been allocated for the object sent as argument it has to be free'd after this function returns succesfully. */ -bool silc_cipher_register(const SilcCipherObject *cipher) +SilcBool silc_cipher_register(const SilcCipherObject *cipher) { #ifndef SILC_EPOC SilcCipherObject *new; @@ -118,7 +118,7 @@ bool silc_cipher_register(const SilcCipherObject *cipher) /* Unregister a cipher from the SILC. */ -bool silc_cipher_unregister(SilcCipherObject *cipher) +SilcBool silc_cipher_unregister(SilcCipherObject *cipher) { #ifndef SILC_EPOC SilcCipherObject *entry; @@ -152,7 +152,7 @@ bool silc_cipher_unregister(SilcCipherObject *cipher) The application may use this to register the default ciphers if specific ciphers in any specific order is not wanted. */ -bool silc_cipher_register_default(void) +SilcBool silc_cipher_register_default(void) { #ifndef SILC_EPOC int i; @@ -164,7 +164,7 @@ bool silc_cipher_register_default(void) return TRUE; } -bool silc_cipher_unregister_all(void) +SilcBool silc_cipher_unregister_all(void) { #ifndef SILC_EPOC SilcCipherObject *entry; @@ -187,7 +187,7 @@ bool silc_cipher_unregister_all(void) caller must set the key to the cipher after this function has returned by calling the ciphers set_key function. */ -bool silc_cipher_alloc(const unsigned char *name, SilcCipher *new_cipher) +SilcBool silc_cipher_alloc(const unsigned char *name, SilcCipher *new_cipher) { SilcCipherObject *entry = NULL; @@ -236,7 +236,7 @@ void silc_cipher_free(SilcCipher cipher) /* Returns TRUE if cipher `name' is supported. */ -bool silc_cipher_is_supported(const unsigned char *name) +SilcBool silc_cipher_is_supported(const unsigned char *name) { #ifndef SILC_EPOC SilcCipherObject *entry; @@ -303,7 +303,7 @@ char *silc_cipher_get_supported(void) /* Encrypts */ -bool silc_cipher_encrypt(SilcCipher cipher, const unsigned char *src, +SilcBool silc_cipher_encrypt(SilcCipher cipher, const unsigned char *src, unsigned char *dst, SilcUInt32 len, unsigned char *iv) { @@ -318,7 +318,7 @@ bool silc_cipher_encrypt(SilcCipher cipher, const unsigned char *src, /* Decrypts */ -bool silc_cipher_decrypt(SilcCipher cipher, const unsigned char *src, +SilcBool silc_cipher_decrypt(SilcCipher cipher, const unsigned char *src, unsigned char *dst, SilcUInt32 len, unsigned char *iv) { @@ -333,7 +333,7 @@ bool silc_cipher_decrypt(SilcCipher cipher, const unsigned char *src, /* Sets the key for the cipher */ -bool silc_cipher_set_key(SilcCipher cipher, const unsigned char *key, +SilcBool silc_cipher_set_key(SilcCipher cipher, const unsigned char *key, SilcUInt32 keylen) { return cipher->cipher->set_key(cipher->context, key, keylen); diff --git a/lib/silccrypt/silccipher.h b/lib/silccrypt/silccipher.h index 59475334..04e7f2a1 100644 --- a/lib/silccrypt/silccipher.h +++ b/lib/silccrypt/silccipher.h @@ -52,11 +52,11 @@ typedef struct { SilcUInt32 block_len; SilcUInt32 key_len; - bool (*set_key)(void *, const unsigned char *, SilcUInt32); - bool (*set_key_with_string)(void *, const unsigned char *, SilcUInt32); - bool (*encrypt)(void *, const unsigned char *, unsigned char *, + SilcBool (*set_key)(void *, const unsigned char *, SilcUInt32); + SilcBool (*set_key_with_string)(void *, const unsigned char *, SilcUInt32); + SilcBool (*encrypt)(void *, const unsigned char *, unsigned char *, SilcUInt32, unsigned char *); - bool (*decrypt)(void *, const unsigned char *, unsigned char *, + SilcBool (*decrypt)(void *, const unsigned char *, unsigned char *, SilcUInt32, unsigned char *); SilcUInt32 (*context_len)(); } SilcCipherObject; @@ -89,21 +89,21 @@ extern DLLAPI const SilcCipherObject silc_default_ciphers[]; /* These macros can be used to implement the SILC Crypto API and to avoid errors in the API these macros should be used always. */ #define SILC_CIPHER_API_SET_KEY(cipher) \ -bool silc_##cipher##_set_key(void *context, \ +SilcBool silc_##cipher##_set_key(void *context, \ const unsigned char *key, \ SilcUInt32 keylen) #define SILC_CIPHER_API_SET_KEY_WITH_STRING(cipher) \ -bool silc_##cipher##_set_key_with_string(void *context, \ +SilcBool silc_##cipher##_set_key_with_string(void *context, \ const unsigned char *string, \ SilcUInt32 stringlen) #define SILC_CIPHER_API_ENCRYPT_CBC(cipher) \ -bool silc_##cipher##_encrypt_cbc(void *context, \ +SilcBool silc_##cipher##_encrypt_cbc(void *context, \ const unsigned char *src, \ unsigned char *dst, \ SilcUInt32 len, \ unsigned char *iv) #define SILC_CIPHER_API_DECRYPT_CBC(cipher) \ -bool silc_##cipher##_decrypt_cbc(void *context, \ +SilcBool silc_##cipher##_decrypt_cbc(void *context, \ const unsigned char *src, \ unsigned char *dst, \ SilcUInt32 len, \ @@ -120,7 +120,7 @@ SilcUInt32 silc_##cipher##_context_len() * * SYNOPSIS * - * bool silc_cipher_register(const SilcCipherObject *cipher); + * SilcBool silc_cipher_register(const SilcCipherObject *cipher); * * DESCRIPTION * @@ -130,26 +130,26 @@ SilcUInt32 silc_##cipher##_context_len() * as argument it has to be free'd after this function returns succesfully. * ***/ -bool silc_cipher_register(const SilcCipherObject *cipher); +SilcBool silc_cipher_register(const SilcCipherObject *cipher); /****f* silccrypt/SilcCipherAPI/silc_cipher_unregister * * SYNOPSIS * - * bool silc_cipher_unregister(SilcCipherObject *cipher); + * SilcBool silc_cipher_unregister(SilcCipherObject *cipher); * * DESCRIPTION * * Unregister a cipher from the SILC. * ***/ -bool silc_cipher_unregister(SilcCipherObject *cipher); +SilcBool silc_cipher_unregister(SilcCipherObject *cipher); /****f* silccrypt/SilcCipherAPI/silc_cipher_register_default * * SYNOPSIS * - * bool silc_cipher_register_default(void); + * SilcBool silc_cipher_register_default(void); * * DESCRIPTION * @@ -158,26 +158,26 @@ bool silc_cipher_unregister(SilcCipherObject *cipher); * ciphers in any specific order is not wanted. * ***/ -bool silc_cipher_register_default(void); +SilcBool silc_cipher_register_default(void); /****f* silccrypt/SilcCipherAPI/silc_cipher_unregister_all * * SYNOPSIS * - * bool silc_cipher_unregister_all(void); + * SilcBool silc_cipher_unregister_all(void); * * DESCRIPTION * * Unregisters all ciphers. * ***/ -bool silc_cipher_unregister_all(void); +SilcBool silc_cipher_unregister_all(void); /****f* silccrypt/SilcCipherAPI/silc_cipher_alloc * * SYNOPSIS * - * bool silc_cipher_alloc(const unsigned char *name, + * SilcBool silc_cipher_alloc(const unsigned char *name, * SilcCipher *new_cipher); * * DESCRIPTION @@ -188,7 +188,7 @@ bool silc_cipher_unregister_all(void); * by calling the ciphers set_key function. * ***/ -bool silc_cipher_alloc(const unsigned char *name, SilcCipher *new_cipher); +SilcBool silc_cipher_alloc(const unsigned char *name, SilcCipher *new_cipher); /****f* silccrypt/SilcCipherAPI/silc_cipher_free * @@ -207,14 +207,14 @@ void silc_cipher_free(SilcCipher cipher); * * SYNOPSIS * - * bool silc_cipher_is_supported(const unsigned char *name); + * SilcBool silc_cipher_is_supported(const unsigned char *name); * * DESCRIPTION * * Returns TRUE if cipher `name' is supported. * ***/ -bool silc_cipher_is_supported(const unsigned char *name); +SilcBool silc_cipher_is_supported(const unsigned char *name); /****f* silccrypt/SilcCipherAPI/silc_cipher_get_supported * @@ -233,7 +233,7 @@ char *silc_cipher_get_supported(void); * * SYNOPSIS * - * bool silc_cipher_encrypt(SilcCipher cipher, const unsigned char *src, + * SilcBool silc_cipher_encrypt(SilcCipher cipher, const unsigned char *src, * unsigned char *dst, SilcUInt32 len, * unsigned char *iv); * @@ -244,7 +244,7 @@ char *silc_cipher_get_supported(void); * IV is used. The `src' and `dst' maybe same buffer. * ***/ -bool silc_cipher_encrypt(SilcCipher cipher, const unsigned char *src, +SilcBool silc_cipher_encrypt(SilcCipher cipher, const unsigned char *src, unsigned char *dst, SilcUInt32 len, unsigned char *iv); @@ -252,7 +252,7 @@ bool silc_cipher_encrypt(SilcCipher cipher, const unsigned char *src, * * SYNOPSIS * - * bool silc_cipher_decrypt(SilcCipher cipher, const unsigned char *src, + * SilcBool silc_cipher_decrypt(SilcCipher cipher, const unsigned char *src, * unsigned char *dst, SilcUInt32 len, * unsigned char *iv); * @@ -263,7 +263,7 @@ bool silc_cipher_encrypt(SilcCipher cipher, const unsigned char *src, * IV is used. The `src' and `dst' maybe same buffer. * ***/ -bool silc_cipher_decrypt(SilcCipher cipher, const unsigned char *src, +SilcBool silc_cipher_decrypt(SilcCipher cipher, const unsigned char *src, unsigned char *dst, SilcUInt32 len, unsigned char *iv); @@ -271,7 +271,7 @@ bool silc_cipher_decrypt(SilcCipher cipher, const unsigned char *src, * * SYNOPSIS * - * bool silc_cipher_set_key(SilcCipher cipher, const unsigned char *key, + * SilcBool silc_cipher_set_key(SilcCipher cipher, const unsigned char *key, * SilcUInt32 keylen); * * DESCRIPTION @@ -280,7 +280,7 @@ bool silc_cipher_decrypt(SilcCipher cipher, const unsigned char *src, * bits. * ***/ -bool silc_cipher_set_key(SilcCipher cipher, const unsigned char *key, +SilcBool silc_cipher_set_key(SilcCipher cipher, const unsigned char *key, SilcUInt32 keylen); /****f* silccrypt/SilcCipherAPI/silc_cipher_set_iv diff --git a/lib/silccrypt/silcdh.h b/lib/silccrypt/silcdh.h index 6b04b3bf..e66faa8a 100644 --- a/lib/silccrypt/silcdh.h +++ b/lib/silccrypt/silcdh.h @@ -95,7 +95,7 @@ void silc_dh_free(SilcDH dh); * * SYNOPSIS * - * bool silc_dh_generate_private(SilcDH dh, const SilcMPInt **x); + * SilcBool silc_dh_generate_private(SilcDH dh, const SilcMPInt **x); * * DESCRIPTION * @@ -105,13 +105,13 @@ void silc_dh_free(SilcDH dh); * the `x' is NULL. The returned `x' must not be freed by the caller. * ***/ -bool silc_dh_generate_private(SilcDH dh, const SilcMPInt **x); +SilcBool silc_dh_generate_private(SilcDH dh, const SilcMPInt **x); /****f* silccrypt/SilcDH/silc_dh_compute_public * * SYNOPSIS * - * bool silc_dh_compute_public(SilcDH dh, const SilcMPInt **y); + * SilcBool silc_dh_compute_public(SilcDH dh, const SilcMPInt **y); * * DESCRIPTION * @@ -121,13 +121,13 @@ bool silc_dh_generate_private(SilcDH dh, const SilcMPInt **x); * freed by the caller. * ***/ -bool silc_dh_compute_public(SilcDH dh, const SilcMPInt **y); +SilcBool silc_dh_compute_public(SilcDH dh, const SilcMPInt **y); /****f* silccrypt/SilcDH/silc_dh_remote_public * * SYNOPSIS * - * bool silc_dh_compute_public(SilcDH dh, SilcMPInt *y); + * SilcBool silc_dh_compute_public(SilcDH dh, SilcMPInt *y); * * DESCRIPTION * @@ -136,13 +136,13 @@ bool silc_dh_compute_public(SilcDH dh, const SilcMPInt **y); * on error. * ***/ -bool silc_dh_set_remote_public(SilcDH dh, SilcMPInt *y); +SilcBool silc_dh_set_remote_public(SilcDH dh, SilcMPInt *y); /****f* silccrypt/SilcDH/silc_dh_compute_key * * SYNOPSIS * - * bool silc_dh_compute_key(SilcDH dh, const SilcMPInt **z); + * SilcBool silc_dh_compute_key(SilcDH dh, const SilcMPInt **z); * * DESCRIPTION * @@ -152,13 +152,13 @@ bool silc_dh_set_remote_public(SilcDH dh, SilcMPInt *y); * freed by the caller. * ***/ -bool silc_dh_compute_key(SilcDH dh, const SilcMPInt **z); +SilcBool silc_dh_compute_key(SilcDH dh, const SilcMPInt **z); /****f* silccrypt/SilcDH/silc_dh_remote_public * * SYNOPSIS * - * bool silc_dh_compute_key_data(SilcDH dh, unsigned char **z, + * SilcBool silc_dh_compute_key_data(SilcDH dh, unsigned char **z, * SilcUInt32 *z_len); * * DESCRIPTION @@ -167,7 +167,7 @@ bool silc_dh_compute_key(SilcDH dh, const SilcMPInt **z); * string. The caller must free the returned binary string. * ***/ -bool silc_dh_compute_key_data(SilcDH dh, unsigned char **z, +SilcBool silc_dh_compute_key_data(SilcDH dh, unsigned char **z, SilcUInt32 *z_len); #endif diff --git a/lib/silccrypt/silchash.c b/lib/silccrypt/silchash.c index d315b506..f486c26d 100644 --- a/lib/silccrypt/silchash.c +++ b/lib/silccrypt/silchash.c @@ -51,7 +51,7 @@ const SilcHashObject silc_default_hash[] = /* Registers a new hash function into the SILC. This function is used at the initialization of the SILC. */ -bool silc_hash_register(const SilcHashObject *hash) +SilcBool silc_hash_register(const SilcHashObject *hash) { #ifndef SILC_EPOC SilcHashObject *new; @@ -89,7 +89,7 @@ bool silc_hash_register(const SilcHashObject *hash) /* Unregister a hash function from the SILC. */ -bool silc_hash_unregister(SilcHashObject *hash) +SilcBool silc_hash_unregister(SilcHashObject *hash) { #ifndef SILC_EPOC SilcHashObject *entry; @@ -123,7 +123,7 @@ bool silc_hash_unregister(SilcHashObject *hash) The application may use this to register the default hash funcs if specific hash funcs in any specific order is not wanted. */ -bool silc_hash_register_default(void) +SilcBool silc_hash_register_default(void) { #ifndef SILC_EPOC int i; @@ -135,7 +135,7 @@ bool silc_hash_register_default(void) return TRUE; } -bool silc_hash_unregister_all(void) +SilcBool silc_hash_unregister_all(void) { #ifndef SILC_EPOC SilcHashObject *entry; @@ -156,7 +156,7 @@ bool silc_hash_unregister_all(void) /* Allocates a new SilcHash object. New object is returned into new_hash argument. */ -bool silc_hash_alloc(const unsigned char *name, SilcHash *new_hash) +SilcBool silc_hash_alloc(const unsigned char *name, SilcHash *new_hash) { SilcHashObject *entry = NULL; @@ -226,7 +226,7 @@ const char *silc_hash_get_name(SilcHash hash) /* Returns TRUE if hash algorithm `name' is supported. */ -bool silc_hash_is_supported(const unsigned char *name) +SilcBool silc_hash_is_supported(const unsigned char *name) { #ifndef SILC_EPOC SilcHashObject *entry; diff --git a/lib/silccrypt/silchash.h b/lib/silccrypt/silchash.h index b8698281..d7317f0c 100644 --- a/lib/silccrypt/silchash.h +++ b/lib/silccrypt/silchash.h @@ -120,7 +120,7 @@ SilcUInt32 silc_##hash##_context_len() * * SYNOPSIS * - * bool silc_hash_register(const SilcHashObject *hash); + * SilcBool silc_hash_register(const SilcHashObject *hash); * * DESCRIPTION * @@ -133,13 +133,13 @@ SilcUInt32 silc_##hash##_context_len() * that are builtin the sources. Returns FALSE on error. * ***/ -bool silc_hash_register(const SilcHashObject *hash); +SilcBool silc_hash_register(const SilcHashObject *hash); /****f* silccrypt/SilcHashAPI/silc_hash_unregister * * SYNOPSIS * - * bool silc_hash_unregister(SilcHashObject *hash); + * SilcBool silc_hash_unregister(SilcHashObject *hash); * * DESCRIPTION * @@ -148,13 +148,13 @@ bool silc_hash_register(const SilcHashObject *hash); * FALSE on error. * ***/ -bool silc_hash_unregister(SilcHashObject *hash); +SilcBool silc_hash_unregister(SilcHashObject *hash); /****f* silccrypt/SilcHashAPI/silc_hash_register_default * * SYNOPSIS * - * bool silc_hash_register_default(void); + * SilcBool silc_hash_register_default(void); * * DESCRIPTION * @@ -167,26 +167,26 @@ bool silc_hash_unregister(SilcHashObject *hash); * which case this function should not be used). * ***/ -bool silc_hash_register_default(void); +SilcBool silc_hash_register_default(void); /****f* silccrypt/SilcHashAPI/silc_hash_unregister_all * * SYNOPSIS * - * bool silc_hash_unregister_all(void); + * SilcBool silc_hash_unregister_all(void); * * DESCRIPTION * * Unregisters all registered hash functions. * ***/ -bool silc_hash_unregister_all(void); +SilcBool silc_hash_unregister_all(void); /****f* silccrypt/SilcHashAPI/silc_hash_alloc * * SYNOPSIS * - * bool silc_hash_alloc(const unsigned char *name, SilcHash *new_hash); + * SilcBool silc_hash_alloc(const unsigned char *name, SilcHash *new_hash); * * DESCRIPTION * @@ -195,7 +195,7 @@ bool silc_hash_unregister_all(void); * returns FALSE if such hash function does not exist. * ***/ -bool silc_hash_alloc(const unsigned char *name, SilcHash *new_hash); +SilcBool silc_hash_alloc(const unsigned char *name, SilcHash *new_hash); /****f* silccrypt/SilcHashAPI/silc_hash_free * @@ -214,14 +214,14 @@ void silc_hash_free(SilcHash hash); * * SYNOPSIS * - * bool silc_hash_is_supported(const unsigned char *name); + * SilcBool silc_hash_is_supported(const unsigned char *name); * * DESCRIPTION * * Returns TRUE if the hash function indicated by the `name' exists. * ***/ -bool silc_hash_is_supported(const unsigned char *name); +SilcBool silc_hash_is_supported(const unsigned char *name); /****f* silccrypt/SilcHashAPI/silc_hash_get_supported * diff --git a/lib/silccrypt/silchmac.c b/lib/silccrypt/silchmac.c index fe4af46c..56e3bc80 100644 --- a/lib/silccrypt/silchmac.c +++ b/lib/silccrypt/silchmac.c @@ -84,7 +84,7 @@ static void silc_hmac_init_internal(SilcHmac hmac, unsigned char *key, /* Registers a new HMAC into the SILC. This function is used at the initialization of the SILC. */ -bool silc_hmac_register(const SilcHmacObject *hmac) +SilcBool silc_hmac_register(const SilcHmacObject *hmac) { #ifndef SILC_EPOC SilcHmacObject *new; @@ -116,7 +116,7 @@ bool silc_hmac_register(const SilcHmacObject *hmac) /* Unregister a HMAC from the SILC. */ -bool silc_hmac_unregister(SilcHmacObject *hmac) +SilcBool silc_hmac_unregister(SilcHmacObject *hmac) { #ifndef SILC_EPOC SilcHmacObject *entry; @@ -150,7 +150,7 @@ bool silc_hmac_unregister(SilcHmacObject *hmac) The application may use this to register the default hmacs if specific hmacs in any specific order is not wanted. */ -bool silc_hmac_register_default(void) +SilcBool silc_hmac_register_default(void) { #ifndef SILC_EPOC int i; @@ -162,7 +162,7 @@ bool silc_hmac_register_default(void) return TRUE; } -bool silc_hmac_unregister_all(void) +SilcBool silc_hmac_unregister_all(void) { #ifndef SILC_EPOC SilcHmacObject *entry; @@ -185,7 +185,7 @@ bool silc_hmac_unregister_all(void) of the HMAC. If it is NULL then the hash function is allocated and the name of the hash algorithm is derived from the `name'. */ -bool silc_hmac_alloc(const char *name, SilcHash hash, SilcHmac *new_hmac) +SilcBool silc_hmac_alloc(const char *name, SilcHash hash, SilcHmac *new_hmac) { SILC_LOG_DEBUG(("Allocating new HMAC")); @@ -283,7 +283,7 @@ const char *silc_hmac_get_name(SilcHmac hmac) /* Returns TRUE if HMAC `name' is supported. */ -bool silc_hmac_is_supported(const char *name) +SilcBool silc_hmac_is_supported(const char *name) { #ifndef SILC_EPOC SilcHmacObject *entry; diff --git a/lib/silccrypt/silchmac.h b/lib/silccrypt/silchmac.h index 7b853d91..a3bebd7d 100644 --- a/lib/silccrypt/silchmac.h +++ b/lib/silccrypt/silchmac.h @@ -84,7 +84,7 @@ extern DLLAPI const SilcHmacObject silc_default_hmacs[]; * * SYNOPSIS * - * bool silc_hmac_register(const SilcHmacObject *hmac); + * SilcBool silc_hmac_register(const SilcHmacObject *hmac); * * DESCRIPTION * @@ -97,13 +97,13 @@ extern DLLAPI const SilcHmacObject silc_default_hmacs[]; * that are builtin the sources. Returns FALSE on error. * ***/ -bool silc_hmac_register(const SilcHmacObject *hmac); +SilcBool silc_hmac_register(const SilcHmacObject *hmac); /****f* silccrypt/SilcHMACAPI/silc_hmac_unregister * * SYNOPSIS * - * bool silc_hmac_unregister(SilcHmacObject *hmac); + * SilcBool silc_hmac_unregister(SilcHmacObject *hmac); * * DESCRIPTION * @@ -112,13 +112,13 @@ bool silc_hmac_register(const SilcHmacObject *hmac); * error. * ***/ -bool silc_hmac_unregister(SilcHmacObject *hmac); +SilcBool silc_hmac_unregister(SilcHmacObject *hmac); /****f* silccrypt/SilcHMACAPI/silc_hmac_register_default * * SYNOPSIS * - * bool silc_hmac_register_default(void); + * SilcBool silc_hmac_register_default(void); * * DESCRIPTION * @@ -131,26 +131,26 @@ bool silc_hmac_unregister(SilcHmacObject *hmac); * used). * ***/ -bool silc_hmac_register_default(void); +SilcBool silc_hmac_register_default(void); /****f* silccrypt/SilcHMACAPI/silc_hmac_unregister_all * * SYNOPSIS * - * bool silc_hmac_unregister_all(void); + * SilcBool silc_hmac_unregister_all(void); * * DESCRIPTION * * Unregisters all registered HMACs. * ***/ -bool silc_hmac_unregister_all(void); +SilcBool silc_hmac_unregister_all(void); /****f* silccrypt/SilcHMACAPI/silc_hmac_alloc * * SYNOPSIS * - * bool silc_hmac_alloc(const char *name, SilcHash hash, + * SilcBool silc_hmac_alloc(const char *name, SilcHash hash, * SilcHmac *new_hmac); * * DESCRIPTION @@ -162,7 +162,7 @@ bool silc_hmac_unregister_all(void); * FALSE if such HMAC does not exist. * ***/ -bool silc_hmac_alloc(const char *name, SilcHash hash, SilcHmac *new_hmac); +SilcBool silc_hmac_alloc(const char *name, SilcHash hash, SilcHmac *new_hmac); /****f* silccrypt/SilcHMACAPI/silc_hmac_free * @@ -182,14 +182,14 @@ void silc_hmac_free(SilcHmac hmac); * * SYNOPSIS * - * bool silc_hmac_is_supported(const char *name); + * SilcBool silc_hmac_is_supported(const char *name); * * DESCRIPTION * * Returns TRUE if the HMAC indicated by the `name' exists. * ***/ -bool silc_hmac_is_supported(const char *name); +SilcBool silc_hmac_is_supported(const char *name); /****f* silccrypt/SilcHMACAPI/silc_hmac_get_supported * diff --git a/lib/silccrypt/silcpkcs.c b/lib/silccrypt/silcpkcs.c index d74072c0..9ffbbcf1 100644 --- a/lib/silccrypt/silcpkcs.c +++ b/lib/silccrypt/silcpkcs.c @@ -63,7 +63,7 @@ const SilcPKCSObject silc_default_pkcs[] = /* Register a new PKCS into SILC. This is used at the initialization of the SILC. */ -bool silc_pkcs_register(const SilcPKCSObject *pkcs) +SilcBool silc_pkcs_register(const SilcPKCSObject *pkcs) { #ifndef SILC_EPOC SilcPKCSObject *new; @@ -105,7 +105,7 @@ bool silc_pkcs_register(const SilcPKCSObject *pkcs) /* Unregister a PKCS from the SILC. */ -bool silc_pkcs_unregister(SilcPKCSObject *pkcs) +SilcBool silc_pkcs_unregister(SilcPKCSObject *pkcs) { #ifndef SILC_EPOC SilcPKCSObject *entry; @@ -139,7 +139,7 @@ bool silc_pkcs_unregister(SilcPKCSObject *pkcs) The application may use this to register the default PKCS if specific PKCS in any specific order is not wanted. */ -bool silc_pkcs_register_default(void) +SilcBool silc_pkcs_register_default(void) { #ifndef SILC_EPOC int i; @@ -151,7 +151,7 @@ bool silc_pkcs_register_default(void) return TRUE; } -bool silc_pkcs_unregister_all(void) +SilcBool silc_pkcs_unregister_all(void) { #ifndef SILC_EPOC SilcPKCSObject *entry; @@ -172,7 +172,7 @@ bool silc_pkcs_unregister_all(void) /* Allocates a new SilcPKCS object. The new allocated object is returned to the 'new_pkcs' argument. */ -bool silc_pkcs_alloc(const unsigned char *name, SilcPKCS *new_pkcs) +SilcBool silc_pkcs_alloc(const unsigned char *name, SilcPKCS *new_pkcs) { SilcPKCSObject *entry = NULL; @@ -222,7 +222,7 @@ void silc_pkcs_free(SilcPKCS pkcs) /* Return TRUE if PKCS algorithm `name' is supported. */ -bool silc_pkcs_is_supported(const unsigned char *name) +SilcBool silc_pkcs_is_supported(const unsigned char *name) { #ifndef SILC_EPOC SilcPKCSObject *entry; @@ -289,10 +289,10 @@ char *silc_pkcs_get_supported(void) /* Generate new key pair into the `pkcs' context. */ -bool silc_pkcs_generate_key(SilcPKCS pkcs, SilcUInt32 bits_key_len, +SilcBool silc_pkcs_generate_key(SilcPKCS pkcs, SilcUInt32 bits_key_len, SilcRng rng) { - bool ret = pkcs->pkcs->init(pkcs->context, bits_key_len, rng); + SilcBool ret = pkcs->pkcs->init(pkcs->context, bits_key_len, rng); if (ret) pkcs->key_len = bits_key_len; return ret; @@ -368,7 +368,7 @@ SilcUInt32 silc_pkcs_private_key_data_set(SilcPKCS pkcs, unsigned char *prv, /* Encrypts */ -bool silc_pkcs_encrypt(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, +SilcBool silc_pkcs_encrypt(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, unsigned char *dst, SilcUInt32 *dst_len) { return pkcs->pkcs->encrypt(pkcs->context, src, src_len, dst, dst_len); @@ -376,7 +376,7 @@ bool silc_pkcs_encrypt(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, /* Decrypts */ -bool silc_pkcs_decrypt(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, +SilcBool silc_pkcs_decrypt(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, unsigned char *dst, SilcUInt32 *dst_len) { return pkcs->pkcs->decrypt(pkcs->context, src, src_len, dst, dst_len); @@ -384,7 +384,7 @@ bool silc_pkcs_decrypt(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, /* Generates signature */ -bool silc_pkcs_sign(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, +SilcBool silc_pkcs_sign(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, unsigned char *dst, SilcUInt32 *dst_len) { return pkcs->pkcs->sign(pkcs->context, src, src_len, dst, dst_len); @@ -392,7 +392,7 @@ bool silc_pkcs_sign(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, /* Verifies signature */ -bool silc_pkcs_verify(SilcPKCS pkcs, unsigned char *signature, +SilcBool silc_pkcs_verify(SilcPKCS pkcs, unsigned char *signature, SilcUInt32 signature_len, unsigned char *data, SilcUInt32 data_len) { @@ -402,7 +402,7 @@ bool silc_pkcs_verify(SilcPKCS pkcs, unsigned char *signature, /* Generates signature with hash. The hash is signed. */ -bool silc_pkcs_sign_with_hash(SilcPKCS pkcs, SilcHash hash, +SilcBool silc_pkcs_sign_with_hash(SilcPKCS pkcs, SilcHash hash, unsigned char *src, SilcUInt32 src_len, unsigned char *dst, SilcUInt32 *dst_len) { @@ -424,7 +424,7 @@ bool silc_pkcs_sign_with_hash(SilcPKCS pkcs, SilcHash hash, /* Verifies signature with hash. The `data' is hashed and verified against the `signature'. */ -bool silc_pkcs_verify_with_hash(SilcPKCS pkcs, SilcHash hash, +SilcBool silc_pkcs_verify_with_hash(SilcPKCS pkcs, SilcHash hash, unsigned char *signature, SilcUInt32 signature_len, unsigned char *data, @@ -743,7 +743,7 @@ silc_pkcs_public_key_data_encode(unsigned char *pk, SilcUInt32 pk_len, /* Decodes SILC style public key. Returns TRUE if the decoding was successful. Allocates new public key as well. */ -bool silc_pkcs_public_key_decode(unsigned char *data, SilcUInt32 data_len, +SilcBool silc_pkcs_public_key_decode(unsigned char *data, SilcUInt32 data_len, SilcPublicKey *public_key) { SilcBufferStruct buf; @@ -870,7 +870,7 @@ SilcBuffer silc_pkcs_public_key_payload_encode(SilcPublicKey public_key) /* Decode Public Key Payload and decodes the public key inside it to to `payload'. */ -bool silc_pkcs_public_key_payload_decode(unsigned char *data, +SilcBool silc_pkcs_public_key_payload_decode(unsigned char *data, SilcUInt32 data_len, SilcPublicKey *public_key) { @@ -912,7 +912,7 @@ bool silc_pkcs_public_key_payload_decode(unsigned char *data, /* Compares two public keys and returns TRUE if they are same key, and FALSE if they are not same. */ -bool silc_pkcs_public_key_compare(SilcPublicKey key1, SilcPublicKey key2) +SilcBool silc_pkcs_public_key_compare(SilcPublicKey key1, SilcPublicKey key2) { if (key1 == key2) return TRUE; @@ -987,7 +987,7 @@ silc_pkcs_private_key_data_encode(unsigned char *prv, SilcUInt32 prv_len, /* Decodes SILC style private key. Returns TRUE if the decoding was successful. Allocates new private key as well. */ -bool silc_pkcs_private_key_decode(unsigned char *data, SilcUInt32 data_len, +SilcBool silc_pkcs_private_key_decode(unsigned char *data, SilcUInt32 data_len, SilcPrivateKey *private_key) { SilcBufferStruct buf; @@ -1058,7 +1058,7 @@ bool silc_pkcs_private_key_decode(unsigned char *data, SilcUInt32 data_len, /* Internal routine to save public key */ -static bool silc_pkcs_save_public_key_internal(const char *filename, +static SilcBool silc_pkcs_save_public_key_internal(const char *filename, unsigned char *data, SilcUInt32 data_len, SilcUInt32 encoding) @@ -1104,12 +1104,12 @@ static bool silc_pkcs_save_public_key_internal(const char *filename, /* Saves public key into file */ -bool silc_pkcs_save_public_key(const char *filename, SilcPublicKey public_key, +SilcBool silc_pkcs_save_public_key(const char *filename, SilcPublicKey public_key, SilcUInt32 encoding) { unsigned char *data; SilcUInt32 data_len; - bool ret; + SilcBool ret; data = silc_pkcs_public_key_encode(public_key, &data_len); ret = silc_pkcs_save_public_key_internal(filename, data, data_len, @@ -1120,7 +1120,7 @@ bool silc_pkcs_save_public_key(const char *filename, SilcPublicKey public_key, /* Saves public key into file */ -bool silc_pkcs_save_public_key_data(const char *filename, unsigned char *data, +SilcBool silc_pkcs_save_public_key_data(const char *filename, unsigned char *data, SilcUInt32 data_len, SilcUInt32 encoding) { return silc_pkcs_save_public_key_internal(filename, data, data_len, @@ -1131,7 +1131,7 @@ bool silc_pkcs_save_public_key_data(const char *filename, unsigned char *data, /* Internal routine to save private key. */ -static bool silc_pkcs_save_private_key_internal(const char *filename, +static SilcBool silc_pkcs_save_private_key_internal(const char *filename, unsigned char *data, SilcUInt32 data_len, unsigned char *key, @@ -1280,7 +1280,7 @@ static bool silc_pkcs_save_private_key_internal(const char *filename, /* Saves private key into file. */ -bool silc_pkcs_save_private_key(const char *filename, +SilcBool silc_pkcs_save_private_key(const char *filename, SilcPrivateKey private_key, unsigned char *passphrase, SilcUInt32 passphrase_len, @@ -1288,7 +1288,7 @@ bool silc_pkcs_save_private_key(const char *filename, { unsigned char *data; SilcUInt32 data_len; - bool ret; + SilcBool ret; data = silc_pkcs_private_key_encode(private_key, &data_len); ret = silc_pkcs_save_private_key_internal(filename, data, data_len, @@ -1302,7 +1302,7 @@ bool silc_pkcs_save_private_key(const char *filename, /* Loads public key from file and allocates new public key. Returns TRUE if loading was successful. */ -bool silc_pkcs_load_public_key(const char *filename, SilcPublicKey *public_key, +SilcBool silc_pkcs_load_public_key(const char *filename, SilcPublicKey *public_key, SilcUInt32 encoding) { unsigned char *cp, *old, *data, byte; @@ -1362,7 +1362,7 @@ bool silc_pkcs_load_public_key(const char *filename, SilcPublicKey *public_key, /* Load private key from file and allocates new private key. Returns TRUE if loading was successful. */ -bool silc_pkcs_load_private_key(const char *filename, +SilcBool silc_pkcs_load_private_key(const char *filename, SilcPrivateKey *private_key, unsigned char *passphrase, SilcUInt32 passphrase_len, diff --git a/lib/silccrypt/silcpkcs.h b/lib/silccrypt/silcpkcs.h index 32463d11..e1ed9fc7 100644 --- a/lib/silccrypt/silcpkcs.h +++ b/lib/silccrypt/silcpkcs.h @@ -243,7 +243,7 @@ int silc_##pkcs##_verify(void *context, \ * * SYNOPSIS * - * bool silc_pkcs_register(const SilcPKCSObject *pkcs); + * SilcBool silc_pkcs_register(const SilcPKCSObject *pkcs); * * DESCRIPTION * @@ -256,26 +256,26 @@ int silc_##pkcs##_verify(void *context, \ * builtin the sources. Returns FALSE on error. * ***/ -bool silc_pkcs_register(const SilcPKCSObject *pkcs); +SilcBool silc_pkcs_register(const SilcPKCSObject *pkcs); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_unregister * * SYNOPSIS * - * bool silc_pkcs_unregister(SilcPKCSObject *pkcs); + * SilcBool silc_pkcs_unregister(SilcPKCSObject *pkcs); * * DESCRIPTION * * Unregister a PKCS from the SILC. Returns FALSE on error. * ***/ -bool silc_pkcs_unregister(SilcPKCSObject *pkcs); +SilcBool silc_pkcs_unregister(SilcPKCSObject *pkcs); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_register_default * * SYNOPSIS * - * bool silc_pkcs_register_default(void); + * SilcBool silc_pkcs_register_default(void); * * DESCRIPTION * @@ -284,26 +284,26 @@ bool silc_pkcs_unregister(SilcPKCSObject *pkcs); * order is not wanted. Returns FALSE on error. * ***/ -bool silc_pkcs_register_default(void); +SilcBool silc_pkcs_register_default(void); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_unregister_all * * SYNOPSIS * - * bool silc_pkcs_unregister_all(void); + * SilcBool silc_pkcs_unregister_all(void); * * DESCRIPTION * * Returns FALSE on error. * ***/ -bool silc_pkcs_unregister_all(void); +SilcBool silc_pkcs_unregister_all(void); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_alloc * * SYNOPSIS * - * bool silc_pkcs_alloc(const unsigned char *name, SilcPKCS *new_pkcs); + * SilcBool silc_pkcs_alloc(const unsigned char *name, SilcPKCS *new_pkcs); * * DESCRIPTION * @@ -311,7 +311,7 @@ bool silc_pkcs_unregister_all(void); * to the 'new_pkcs' argument. Returns FALSE on error. * ***/ -bool silc_pkcs_alloc(const unsigned char *name, SilcPKCS *new_pkcs); +SilcBool silc_pkcs_alloc(const unsigned char *name, SilcPKCS *new_pkcs); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_free * @@ -330,14 +330,14 @@ void silc_pkcs_free(SilcPKCS pkcs); * * SYNOPSIS * - * bool silc_pkcs_is_supported(const unsigned char *name); + * SilcBool silc_pkcs_is_supported(const unsigned char *name); * * DESCRIPTION * * Returns TRUE if PKCS algorithm `name' is supported. * ***/ -bool silc_pkcs_is_supported(const unsigned char *name); +SilcBool silc_pkcs_is_supported(const unsigned char *name); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_get_supported * @@ -356,7 +356,7 @@ char *silc_pkcs_get_supported(void); * * SYNOPSIS * - * bool silc_pkcs_generate_key(SilcPKCS pkcs, SilcUInt32 bits_key_len, + * SilcBool silc_pkcs_generate_key(SilcPKCS pkcs, SilcUInt32 bits_key_len, * SilcRng rng); * * DESCRIPTION @@ -365,7 +365,7 @@ char *silc_pkcs_get_supported(void); * If the `rng' is NULL global SILC RNG will be used. * ***/ -bool silc_pkcs_generate_key(SilcPKCS pkcs, SilcUInt32 bits_key_len, +SilcBool silc_pkcs_generate_key(SilcPKCS pkcs, SilcUInt32 bits_key_len, SilcRng rng); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_get_key_len @@ -492,7 +492,7 @@ SilcUInt32 silc_pkcs_private_key_data_set(SilcPKCS pkcs, unsigned char *prv, * * SYNOPSIS * - * bool silc_pkcs_encrypt(SilcPKCS pkcs, unsigned char *src, + * SilcBool silc_pkcs_encrypt(SilcPKCS pkcs, unsigned char *src, * SilcUInt32 src_len, unsigned char *dst, * SilcUInt32 *dst_len); * @@ -501,14 +501,14 @@ SilcUInt32 silc_pkcs_private_key_data_set(SilcPKCS pkcs, unsigned char *prv, * Encrypts. Returns FALSE on error. * ***/ -bool silc_pkcs_encrypt(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, +SilcBool silc_pkcs_encrypt(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, unsigned char *dst, SilcUInt32 *dst_len); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_decrypt * * SYNOPSIS * - * bool silc_pkcs_decrypt(SilcPKCS pkcs, unsigned char *src, + * SilcBool silc_pkcs_decrypt(SilcPKCS pkcs, unsigned char *src, * SilcUInt32 src_len, unsigned char *dst, * SilcUInt32 *dst_len); * @@ -517,14 +517,14 @@ bool silc_pkcs_encrypt(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, * Decrypts. Returns FALSE on error. * ***/ -bool silc_pkcs_decrypt(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, +SilcBool silc_pkcs_decrypt(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, unsigned char *dst, SilcUInt32 *dst_len); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_sign * * SYNOPSIS * - * bool silc_pkcs_sign(SilcPKCS pkcs, unsigned char *src, + * SilcBool silc_pkcs_sign(SilcPKCS pkcs, unsigned char *src, * SilcUInt32 src_len, unsigned char *dst, * SilcUInt32 *dst_len); * @@ -533,14 +533,14 @@ bool silc_pkcs_decrypt(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, * Generates signature. Returns FALSE on error. * ***/ -bool silc_pkcs_sign(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, +SilcBool silc_pkcs_sign(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, unsigned char *dst, SilcUInt32 *dst_len); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_verify * * SYNOPSIS * - * bool silc_pkcs_verify(SilcPKCS pkcs, unsigned char *signature, + * SilcBool silc_pkcs_verify(SilcPKCS pkcs, unsigned char *signature, * SilcUInt32 signature_len, unsigned char *data, * SilcUInt32 data_len); * @@ -550,7 +550,7 @@ bool silc_pkcs_sign(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len, * verified against the 'data'. * ***/ -bool silc_pkcs_verify(SilcPKCS pkcs, unsigned char *signature, +SilcBool silc_pkcs_verify(SilcPKCS pkcs, unsigned char *signature, SilcUInt32 signature_len, unsigned char *data, SilcUInt32 data_len); @@ -558,7 +558,7 @@ bool silc_pkcs_verify(SilcPKCS pkcs, unsigned char *signature, * * SYNOPSIS * - * bool silc_pkcs_sign_with_hash(SilcPKCS pkcs, SilcHash hash, + * SilcBool silc_pkcs_sign_with_hash(SilcPKCS pkcs, SilcHash hash, * unsigned char *src, SilcUInt32 src_len, * unsigned char *dst, SilcUInt32 *dst_len); * @@ -568,7 +568,7 @@ bool silc_pkcs_verify(SilcPKCS pkcs, unsigned char *signature, * error. * ***/ -bool silc_pkcs_sign_with_hash(SilcPKCS pkcs, SilcHash hash, +SilcBool silc_pkcs_sign_with_hash(SilcPKCS pkcs, SilcHash hash, unsigned char *src, SilcUInt32 src_len, unsigned char *dst, SilcUInt32 *dst_len); @@ -576,7 +576,7 @@ bool silc_pkcs_sign_with_hash(SilcPKCS pkcs, SilcHash hash, * * SYNOPSIS * - * bool silc_pkcs_verify_with_hash(SilcPKCS pkcs, SilcHash hash, + * SilcBool silc_pkcs_verify_with_hash(SilcPKCS pkcs, SilcHash hash, * unsigned char *signature, * SilcUInt32 signature_len, * unsigned char *data, @@ -588,7 +588,7 @@ bool silc_pkcs_sign_with_hash(SilcPKCS pkcs, SilcHash hash, * the `signature'. Returns FALSE on error. * ***/ -bool silc_pkcs_verify_with_hash(SilcPKCS pkcs, SilcHash hash, +SilcBool silc_pkcs_verify_with_hash(SilcPKCS pkcs, SilcHash hash, unsigned char *signature, SilcUInt32 signature_len, unsigned char *data, @@ -748,7 +748,7 @@ silc_pkcs_public_key_data_encode(unsigned char *pk, SilcUInt32 pk_len, * * SYNOPSIS * - * bool silc_pkcs_public_key_decode(unsigned char *data, + * SilcBool silc_pkcs_public_key_decode(unsigned char *data, * SilcUInt32 data_len, * SilcPublicKey *public_key); * @@ -758,14 +758,14 @@ silc_pkcs_public_key_data_encode(unsigned char *pk, SilcUInt32 pk_len, * successful. Allocates new public key as well. * ***/ -bool silc_pkcs_public_key_decode(unsigned char *data, SilcUInt32 data_len, +SilcBool silc_pkcs_public_key_decode(unsigned char *data, SilcUInt32 data_len, SilcPublicKey *public_key); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_public_key_payload_encode * * SYNOPSIS * - * bool silc_pkcs_public_key_payload_encode(SilcPublicKey public_key); + * SilcBool silc_pkcs_public_key_payload_encode(SilcPublicKey public_key); * * DESCRIPTION * @@ -780,7 +780,7 @@ SilcBuffer silc_pkcs_public_key_payload_encode(SilcPublicKey public_key); * * SYNOPSIS * - * bool silc_pkcs_public_key_payload_decode(unsigned char *data, + * SilcBool silc_pkcs_public_key_payload_decode(unsigned char *data, * SilcUInt32 data_len, * SilcPublicKey *public_key); * @@ -791,7 +791,7 @@ SilcBuffer silc_pkcs_public_key_payload_encode(SilcPublicKey public_key); * cannot be decoded. * ***/ -bool silc_pkcs_public_key_payload_decode(unsigned char *data, +SilcBool silc_pkcs_public_key_payload_decode(unsigned char *data, SilcUInt32 data_len, SilcPublicKey *public_key); @@ -799,7 +799,7 @@ bool silc_pkcs_public_key_payload_decode(unsigned char *data, * * SYNOPSIS * - * bool silc_pkcs_public_key_compare(SilcPublicKey key1, + * SilcBool silc_pkcs_public_key_compare(SilcPublicKey key1, * SilcPublicKey key2); * * DESCRIPTION @@ -808,7 +808,7 @@ bool silc_pkcs_public_key_payload_decode(unsigned char *data, * FALSE if they are not same. * ***/ -bool silc_pkcs_public_key_compare(SilcPublicKey key1, SilcPublicKey key2); +SilcBool silc_pkcs_public_key_compare(SilcPublicKey key1, SilcPublicKey key2); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_public_key_copy * @@ -861,7 +861,7 @@ silc_pkcs_private_key_data_encode(unsigned char *prv, SilcUInt32 prv_len, * * SYNOPSIS * - * bool silc_pkcs_private_key_decode(unsigned char *data, + * SilcBool silc_pkcs_private_key_decode(unsigned char *data, * SilcUInt32 data_len, * SilcPrivateKey *private_key); * @@ -871,14 +871,14 @@ silc_pkcs_private_key_data_encode(unsigned char *prv, SilcUInt32 prv_len, * successful. Allocates new private key as well. * ***/ -bool silc_pkcs_private_key_decode(unsigned char *data, SilcUInt32 data_len, +SilcBool silc_pkcs_private_key_decode(unsigned char *data, SilcUInt32 data_len, SilcPrivateKey *private_key); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_save_public_key * * SYNOPSIS * - * bool silc_pkcs_save_public_key(const char *filename, + * SilcBool silc_pkcs_save_public_key(const char *filename, * SilcPublicKey public_key, * SilcUInt32 encoding); * @@ -887,14 +887,14 @@ bool silc_pkcs_private_key_decode(unsigned char *data, SilcUInt32 data_len, * Saves public key into file. Returns FALSE on error. * ***/ -bool silc_pkcs_save_public_key(const char *filename, SilcPublicKey public_key, +SilcBool silc_pkcs_save_public_key(const char *filename, SilcPublicKey public_key, SilcUInt32 encoding); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_save_public_key_data * * SYNOPSIS * - * bool silc_pkcs_save_public_key_data(const char *filename, + * SilcBool silc_pkcs_save_public_key_data(const char *filename, * unsigned char *data, * SilcUInt32 data_len, * SilcUInt32 encoding); @@ -905,14 +905,14 @@ bool silc_pkcs_save_public_key(const char *filename, SilcPublicKey public_key, * data when calling this function. Returns FALSE on error. * ***/ -bool silc_pkcs_save_public_key_data(const char *filename, unsigned char *data, +SilcBool silc_pkcs_save_public_key_data(const char *filename, unsigned char *data, SilcUInt32 data_len, SilcUInt32 encoding); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_save_private_key * * SYNOPSIS * - * bool silc_pkcs_save_private_key(const char *filename, + * SilcBool silc_pkcs_save_private_key(const char *filename, * SilcPrivateKey private_key, * unsigned char *passphrase, * SilcUInt32 passphrase_len, @@ -925,7 +925,7 @@ bool silc_pkcs_save_public_key_data(const char *filename, unsigned char *data, * is AES with 256 bit key in CBC mode. Returns FALSE on error. * ***/ -bool silc_pkcs_save_private_key(const char *filename, +SilcBool silc_pkcs_save_private_key(const char *filename, SilcPrivateKey private_key, unsigned char *passphrase, SilcUInt32 passphrase_len, @@ -935,7 +935,7 @@ bool silc_pkcs_save_private_key(const char *filename, * * SYNOPSIS * - * bool silc_pkcs_load_public_key(const char *filename, + * SilcBool silc_pkcs_load_public_key(const char *filename, * SilcPublicKey *public_key, * SilcUInt32 encoding); * @@ -945,14 +945,14 @@ bool silc_pkcs_save_private_key(const char *filename, * if loading was successful. * ***/ -bool silc_pkcs_load_public_key(const char *filename, SilcPublicKey *public_key, +SilcBool silc_pkcs_load_public_key(const char *filename, SilcPublicKey *public_key, SilcUInt32 encoding); /****f* silccrypt/SilcPKCSAPI/silc_pkcs_load_private_key * * SYNOPSIS * - * bool silc_pkcs_load_private_key(const char *filename, + * SilcBool silc_pkcs_load_private_key(const char *filename, * SilcPrivateKey *private_key, * unsigned char *passphrase, * SilcUInt32 passphrase_len, @@ -965,7 +965,7 @@ bool silc_pkcs_load_public_key(const char *filename, SilcPublicKey *public_key, * key of the private key file. * ***/ -bool silc_pkcs_load_private_key(const char *filename, +SilcBool silc_pkcs_load_private_key(const char *filename, SilcPrivateKey *private_key, unsigned char *passphrase, SilcUInt32 passphrase_len, diff --git a/lib/silccrypt/silcpkcs1.c b/lib/silccrypt/silcpkcs1.c index c6263fb2..ed0bd9fc 100644 --- a/lib/silccrypt/silcpkcs1.c +++ b/lib/silccrypt/silcpkcs1.c @@ -33,7 +33,7 @@ set when `bt' is SILC_PKCS1_BT_PUB. This function returns TRUE on success. */ -bool silc_pkcs1_encode(SilcPkcs1BlockType bt, +SilcBool silc_pkcs1_encode(SilcPkcs1BlockType bt, const unsigned char *data, SilcUInt32 data_len, unsigned char *dest_data, @@ -96,7 +96,7 @@ bool silc_pkcs1_encode(SilcPkcs1BlockType bt, the deocded block does not fit to `dest_data' this returns FALSE. Returns TRUE on success. */ -bool silc_pkcs1_decode(SilcPkcs1BlockType bt, +SilcBool silc_pkcs1_decode(SilcPkcs1BlockType bt, const unsigned char *data, SilcUInt32 data_len, unsigned char *dest_data, diff --git a/lib/silccrypt/silcpkcs1.h b/lib/silccrypt/silcpkcs1.h index 573777c1..9b113297 100644 --- a/lib/silccrypt/silcpkcs1.h +++ b/lib/silccrypt/silcpkcs1.h @@ -56,7 +56,7 @@ typedef enum { * * SYNOPSIS * - * bool silc_pkcs1_encode(SilcPkcs1BlockType bt, + * SilcBool silc_pkcs1_encode(SilcPkcs1BlockType bt, * const unsigned char *data, * SilcUInt32 data_len, * unsigned char *dest_data, @@ -77,7 +77,7 @@ typedef enum { * function returns TRUE on success. * ***/ -bool silc_pkcs1_encode(SilcPkcs1BlockType bt, +SilcBool silc_pkcs1_encode(SilcPkcs1BlockType bt, const unsigned char *data, SilcUInt32 data_len, unsigned char *dest_data, @@ -88,7 +88,7 @@ bool silc_pkcs1_encode(SilcPkcs1BlockType bt, * * SYNOPSIS * - * bool silc_pkcs1_decode(SilcPkcs1BlockType bt, + * SilcBool silc_pkcs1_decode(SilcPkcs1BlockType bt, * const unsigned char *data, * SilcUInt32 data_len, * unsigned char *dest_data, @@ -105,7 +105,7 @@ bool silc_pkcs1_encode(SilcPkcs1BlockType bt, * Returns the decoded length into `dest_len'. * ***/ -bool silc_pkcs1_decode(SilcPkcs1BlockType bt, +SilcBool silc_pkcs1_decode(SilcPkcs1BlockType bt, const unsigned char *data, SilcUInt32 data_len, unsigned char *dest_data, diff --git a/lib/silccrypt/silcrng.c b/lib/silccrypt/silcrng.c index e62e58b7..2e9d935e 100644 --- a/lib/silccrypt/silcrng.c +++ b/lib/silccrypt/silcrng.c @@ -638,7 +638,7 @@ SilcRng global_rng = NULL; /* Initialize global RNG. If `rng' is provided it is set as the global RNG object (it can be allocated by the application for example). */ -bool silc_rng_global_init(SilcRng rng) +SilcBool silc_rng_global_init(SilcRng rng) { if (rng) { global_rng = rng; @@ -653,7 +653,7 @@ bool silc_rng_global_init(SilcRng rng) /* Uninitialize global RNG */ -bool silc_rng_global_uninit(void) +SilcBool silc_rng_global_uninit(void) { if (global_rng) { silc_rng_free(global_rng); diff --git a/lib/silccrypt/silcrng.h b/lib/silccrypt/silcrng.h index 4ae6b7d8..b4deeb8d 100644 --- a/lib/silccrypt/silcrng.h +++ b/lib/silccrypt/silcrng.h @@ -214,7 +214,7 @@ void silc_rng_add_noise(SilcRng rng, unsigned char *buffer, SilcUInt32 len); * * SYNOPSIS * - * bool silc_rng_global_init(SilcRng rng); + * SilcBool silc_rng_global_init(SilcRng rng); * * DESCRIPTION * @@ -234,13 +234,13 @@ void silc_rng_add_noise(SilcRng rng, unsigned char *buffer, SilcUInt32 len); * the RNG as argument. * ***/ -bool silc_rng_global_init(SilcRng rng); +SilcBool silc_rng_global_init(SilcRng rng); /****f* silccrypt/SilcRNGAPI/silc_rng_global_uninit * * SYNOPSIS * - * bool silc_rng_global_uninit(void); + * SilcBool silc_rng_global_uninit(void); * * DESCRIPTION * @@ -248,7 +248,7 @@ bool silc_rng_global_init(SilcRng rng); * be called if silc_rng_global_init was called with non-NULL RNG. * ***/ -bool silc_rng_global_uninit(void); +SilcBool silc_rng_global_uninit(void); /****f* silccrypt/SilcRNGAPI/silc_rng_global_get_byte * diff --git a/lib/silccrypt/tests/test_aes.c b/lib/silccrypt/tests/test_aes.c index 6a802ece..a60f923e 100644 --- a/lib/silccrypt/tests/test_aes.c +++ b/lib/silccrypt/tests/test_aes.c @@ -22,7 +22,7 @@ const unsigned char c2[] = "\xd2\x96\xcd\x94\xc2\xcc\xcf\x8a\x3a\x86\x30\x28\xb5 int main(int argc, char **argv) { - bool success = FALSE; + SilcBool success = FALSE; SilcCipher cipher; unsigned char dst[256], pdst[256]; int i; diff --git a/lib/silccrypt/tests/test_hmacmd5.c b/lib/silccrypt/tests/test_hmacmd5.c index b35bec6f..3a1759f2 100644 --- a/lib/silccrypt/tests/test_hmacmd5.c +++ b/lib/silccrypt/tests/test_hmacmd5.c @@ -28,7 +28,7 @@ const unsigned char data4_digest[] = "\x6f\x63\x0f\xad\x67\xcd\xa0\xee\x1f\xb1\x int main(int argc, char **argv) { - bool success = FALSE; + SilcBool success = FALSE; unsigned char digest[16]; SilcUInt32 len; SilcHmac hmac; diff --git a/lib/silccrypt/tests/test_hmacsha1.c b/lib/silccrypt/tests/test_hmacsha1.c index b1950cd7..14e98b49 100644 --- a/lib/silccrypt/tests/test_hmacsha1.c +++ b/lib/silccrypt/tests/test_hmacsha1.c @@ -28,7 +28,7 @@ const unsigned char data4_digest[] = "\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\x int main(int argc, char **argv) { - bool success = FALSE; + SilcBool success = FALSE; unsigned char digest[20]; SilcUInt32 len; SilcHmac hmac; diff --git a/lib/silccrypt/tests/test_hmacsha256.c b/lib/silccrypt/tests/test_hmacsha256.c index 1b5cfbb3..1ff5db1d 100644 --- a/lib/silccrypt/tests/test_hmacsha256.c +++ b/lib/silccrypt/tests/test_hmacsha256.c @@ -28,7 +28,7 @@ const unsigned char data4_digest[] = "\x63\x55\xac\x22\xe8\x90\xd0\xa3\xc8\x48\x int main(int argc, char **argv) { - bool success = FALSE; + SilcBool success = FALSE; unsigned char digest[20]; SilcUInt32 len; SilcHmac hmac; diff --git a/lib/silccrypt/tests/test_md5.c b/lib/silccrypt/tests/test_md5.c index cb6db76c..67822b97 100644 --- a/lib/silccrypt/tests/test_md5.c +++ b/lib/silccrypt/tests/test_md5.c @@ -16,7 +16,7 @@ const unsigned char data3_digest[] = "\xd1\x74\xab\x98\xd2\x77\xd9\xf5\xa5\x61\x int main(int argc, char **argv) { - bool success = FALSE; + SilcBool success = FALSE; unsigned char digest[16]; SilcHash md5; diff --git a/lib/silccrypt/tests/test_sha1.c b/lib/silccrypt/tests/test_sha1.c index b0bcf058..c6569c8d 100644 --- a/lib/silccrypt/tests/test_sha1.c +++ b/lib/silccrypt/tests/test_sha1.c @@ -13,7 +13,7 @@ const unsigned char data2_digest[] = "\x34\xaa\x97\x3c\xd4\xc4\xda\xa4\xf6\x1e\x int main(int argc, char **argv) { - bool success = FALSE; + SilcBool success = FALSE; unsigned char digest[20]; SilcHash sha1; diff --git a/lib/silccrypt/tests/test_sha256.c b/lib/silccrypt/tests/test_sha256.c index e89ce57f..d84c73bf 100644 --- a/lib/silccrypt/tests/test_sha256.c +++ b/lib/silccrypt/tests/test_sha256.c @@ -12,7 +12,7 @@ const unsigned char data2_digest[] = "\xba\x78\x16\xbf\x8f\x01\xcf\xea\x41\x41\x int main(int argc, char **argv) { - bool success = FALSE; + SilcBool success = FALSE; unsigned char digest[20]; SilcHash sha256; diff --git a/lib/silccrypt/tests/test_silcpkcs.c b/lib/silccrypt/tests/test_silcpkcs.c index 0afbdd8e..41ba8d40 100644 --- a/lib/silccrypt/tests/test_silcpkcs.c +++ b/lib/silccrypt/tests/test_silcpkcs.c @@ -7,7 +7,7 @@ int p_len = 32; int test() { - bool success = FALSE; + SilcBool success = FALSE; SilcPKCS pkcs; unsigned char *pk, *prv; char *identifier; -- 2.24.0