From c8934ef028cf15f9f550c421fe7570efd8096164 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Wed, 30 Nov 2011 17:29:40 -0500 Subject: [PATCH] crypto: Add const modifiers to input parameters. --- libfreerdp-core/crypto.c | 22 +++++++++++----------- libfreerdp-core/crypto.h | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/libfreerdp-core/crypto.c b/libfreerdp-core/crypto.c index 81560af2a..5dc69d785 100644 --- a/libfreerdp-core/crypto.c +++ b/libfreerdp-core/crypto.c @@ -26,7 +26,7 @@ CryptoSha1 crypto_sha1_init(void) return sha1; } -void crypto_sha1_update(CryptoSha1 sha1, uint8* data, uint32 length) +void crypto_sha1_update(CryptoSha1 sha1, const uint8* data, uint32 length) { SHA1_Update(&sha1->sha_ctx, data, length); } @@ -44,7 +44,7 @@ CryptoMd5 crypto_md5_init(void) return md5; } -void crypto_md5_update(CryptoMd5 md5, uint8* data, uint32 length) +void crypto_md5_update(CryptoMd5 md5, const uint8* data, uint32 length) { MD5_Update(&md5->md5_ctx, data, length); } @@ -55,14 +55,14 @@ void crypto_md5_final(CryptoMd5 md5, uint8* out_data) xfree(md5); } -CryptoRc4 crypto_rc4_init(uint8* key, uint32 length) +CryptoRc4 crypto_rc4_init(const uint8* key, uint32 length) { CryptoRc4 rc4 = xmalloc(sizeof(*rc4)); RC4_set_key(&rc4->rc4_key, length, key); return rc4; } -void crypto_rc4(CryptoRc4 rc4, uint32 length, uint8* in_data, uint8* out_data) +void crypto_rc4(CryptoRc4 rc4, uint32 length, const uint8* in_data, uint8* out_data) { RC4(&rc4->rc4_key, length, in_data, out_data); } @@ -72,7 +72,7 @@ void crypto_rc4_free(CryptoRc4 rc4) xfree(rc4); } -CryptoDes3 crypto_des3_encrypt_init(uint8* key, uint8* ivec) +CryptoDes3 crypto_des3_encrypt_init(const uint8* key, const uint8* ivec) { CryptoDes3 des3 = xmalloc(sizeof(*des3)); EVP_CIPHER_CTX_init(&des3->des3_ctx); @@ -81,7 +81,7 @@ CryptoDes3 crypto_des3_encrypt_init(uint8* key, uint8* ivec) return des3; } -CryptoDes3 crypto_des3_decrypt_init(uint8* key, uint8* ivec) +CryptoDes3 crypto_des3_decrypt_init(const uint8* key, const uint8* ivec) { CryptoDes3 des3 = xmalloc(sizeof(*des3)); EVP_CIPHER_CTX_init(&des3->des3_ctx); @@ -90,13 +90,13 @@ CryptoDes3 crypto_des3_decrypt_init(uint8* key, uint8* ivec) return des3; } -void crypto_des3_encrypt(CryptoDes3 des3, uint32 length, uint8* in_data, uint8* out_data) +void crypto_des3_encrypt(CryptoDes3 des3, uint32 length, const uint8* in_data, uint8* out_data) { int len; EVP_EncryptUpdate(&des3->des3_ctx, out_data, &len, in_data, length); } -void crypto_des3_decrypt(CryptoDes3 des3, uint32 length, uint8* in_data, uint8* out_data) +void crypto_des3_decrypt(CryptoDes3 des3, uint32 length, const uint8* in_data, uint8* out_data) { int len; EVP_DecryptUpdate(&des3->des3_ctx, out_data, &len, in_data, length); @@ -117,12 +117,12 @@ CryptoHmac crypto_hmac_new(void) return hmac; } -void crypto_hmac_sha1_init(CryptoHmac hmac, uint8* data, uint32 length) +void crypto_hmac_sha1_init(CryptoHmac hmac, const uint8* data, uint32 length) { HMAC_Init_ex(&hmac->hmac_ctx, data, length, EVP_sha1(), NULL); } -void crypto_hmac_update(CryptoHmac hmac, uint8* data, uint32 length) +void crypto_hmac_update(CryptoHmac hmac, const uint8* data, uint32 length) { HMAC_Update(&hmac->hmac_ctx, data, length); } @@ -193,7 +193,7 @@ exit: return status; } -void crypto_rsa_encrypt(uint8* input, int length, uint32 key_length, uint8* modulus, uint8* exponent, uint8* output) +void crypto_rsa_encrypt(const uint8* input, int length, uint32 key_length, const uint8* modulus, const uint8* exponent, uint8* output) { BN_CTX* ctx; int output_length; diff --git a/libfreerdp-core/crypto.h b/libfreerdp-core/crypto.h index 42e6da50a..929730373 100644 --- a/libfreerdp-core/crypto.h +++ b/libfreerdp-core/crypto.h @@ -80,30 +80,30 @@ struct crypto_cert_struct typedef struct crypto_sha1_struct* CryptoSha1; CryptoSha1 crypto_sha1_init(void); -void crypto_sha1_update(CryptoSha1 sha1, uint8* data, uint32 length); +void crypto_sha1_update(CryptoSha1 sha1, const uint8* data, uint32 length); void crypto_sha1_final(CryptoSha1 sha1, uint8* out_data); typedef struct crypto_md5_struct* CryptoMd5; CryptoMd5 crypto_md5_init(void); -void crypto_md5_update(CryptoMd5 md5, uint8* data, uint32 length); +void crypto_md5_update(CryptoMd5 md5, const uint8* data, uint32 length); void crypto_md5_final(CryptoMd5 md5, uint8* out_data); typedef struct crypto_rc4_struct* CryptoRc4; -CryptoRc4 crypto_rc4_init(uint8* key, uint32 length); -void crypto_rc4(CryptoRc4 rc4, uint32 length, uint8* in_data, uint8* out_data); +CryptoRc4 crypto_rc4_init(const uint8* key, uint32 length); +void crypto_rc4(CryptoRc4 rc4, uint32 length, const uint8* in_data, uint8* out_data); void crypto_rc4_free(CryptoRc4 rc4); typedef struct crypto_des3_struct* CryptoDes3; -CryptoDes3 crypto_des3_encrypt_init(uint8* key, uint8* ivec); -CryptoDes3 crypto_des3_decrypt_init(uint8* key, uint8* ivec); -void crypto_des3_encrypt(CryptoDes3 des3, uint32 length, uint8 *in_data, uint8 *out_data); -void crypto_des3_decrypt(CryptoDes3 des3, uint32 length, uint8 *in_data, uint8* out_data); +CryptoDes3 crypto_des3_encrypt_init(const uint8* key, const uint8* ivec); +CryptoDes3 crypto_des3_decrypt_init(const uint8* key, const uint8* ivec); +void crypto_des3_encrypt(CryptoDes3 des3, uint32 length, const uint8 *in_data, uint8 *out_data); +void crypto_des3_decrypt(CryptoDes3 des3, uint32 length, const uint8 *in_data, uint8* out_data); void crypto_des3_free(CryptoDes3 des3); typedef struct crypto_hmac_struct* CryptoHmac; CryptoHmac crypto_hmac_new(void); -void crypto_hmac_sha1_init(CryptoHmac hmac, uint8 *data, uint32 length); -void crypto_hmac_update(CryptoHmac hmac, uint8 *data, uint32 length); +void crypto_hmac_sha1_init(CryptoHmac hmac, const uint8 *data, uint32 length); +void crypto_hmac_update(CryptoHmac hmac, const uint8 *data, uint32 length); void crypto_hmac_final(CryptoHmac hmac, uint8 *out_data, uint32 length); void crypto_hmac_free(CryptoHmac hmac); @@ -119,7 +119,7 @@ boolean crypto_cert_verify(CryptoCert server_cert, CryptoCert cacert); rdpCertData* crypto_get_cert_data(X509* xcert, char* hostname); boolean crypto_cert_get_public_key(CryptoCert cert, rdpBlob* public_key); -void crypto_rsa_encrypt(uint8* input, int length, uint32 key_length, uint8* modulus, uint8* exponent, uint8* output); +void crypto_rsa_encrypt(const uint8* input, int length, uint32 key_length, const uint8* modulus, const uint8* exponent, uint8* output); void crypto_reverse(uint8* data, int length); void crypto_nonce(uint8* nonce, int size);