diff --git a/libfreerdp/core/connection.c b/libfreerdp/core/connection.c
index a3307ee5e..d599c3bce 100644
--- a/libfreerdp/core/connection.c
+++ b/libfreerdp/core/connection.c
@@ -1708,7 +1708,7 @@ BOOL rdp_set_state(rdpRdp* rdp, CONNECTION_STATE state)
 	return TRUE;
 }
 
-const char* rdp_get_state_string(rdpRdp* rdp)
+const char* rdp_get_state_string(const rdpRdp* rdp)
 {
 	CONNECTION_STATE state = rdp_get_state(rdp);
 	return rdp_state_string(state);
diff --git a/libfreerdp/core/connection.h b/libfreerdp/core/connection.h
index 1890135a8..e3afca794 100644
--- a/libfreerdp/core/connection.h
+++ b/libfreerdp/core/connection.h
@@ -62,7 +62,7 @@ FREERDP_LOCAL BOOL rdp_server_accept_confirm_active(rdpRdp* rdp, wStream* s, UIN
 FREERDP_LOCAL BOOL rdp_server_establish_keys(rdpRdp* rdp, wStream* s);
 FREERDP_LOCAL BOOL rdp_server_reactivate(rdpRdp* rdp);
 FREERDP_LOCAL BOOL rdp_server_transition_to_state(rdpRdp* rdp, CONNECTION_STATE state);
-FREERDP_LOCAL const char* rdp_get_state_string(rdpRdp* rdp);
+FREERDP_LOCAL const char* rdp_get_state_string(const rdpRdp* rdp);
 
 FREERDP_LOCAL const char* rdp_client_connection_state_string(int state);
 
diff --git a/winpr/libwinpr/crypto/hmac_md5.c b/winpr/libwinpr/crypto/hmac_md5.c
index 5ec52e5e7..100c212f1 100644
--- a/winpr/libwinpr/crypto/hmac_md5.c
+++ b/winpr/libwinpr/crypto/hmac_md5.c
@@ -4,7 +4,7 @@
 #include "hmac_md5.h"
 #include "md5.h"
 
-void hmac_md5_init(WINPR_HMAC_MD5_CTX* ctx, unsigned char* key, size_t key_len)
+void hmac_md5_init(WINPR_HMAC_MD5_CTX* ctx, const unsigned char* key, size_t key_len)
 {
 	const WINPR_HMAC_MD5_CTX empty = { 0 };
 	unsigned char k_ipad[KEY_IOPAD_SIZE] = { 0 };
@@ -40,7 +40,7 @@ void hmac_md5_init(WINPR_HMAC_MD5_CTX* ctx, unsigned char* key, size_t key_len)
 	winpr_MD5_Update(&ctx->ocontext, k_opad, KEY_IOPAD_SIZE);
 }
 
-void hmac_md5_update(WINPR_HMAC_MD5_CTX* ctx, unsigned char* text, size_t text_len)
+void hmac_md5_update(WINPR_HMAC_MD5_CTX* ctx, const unsigned char* text, size_t text_len)
 {
 	assert(ctx);
 	winpr_MD5_Update(&ctx->icontext, text, text_len);
diff --git a/winpr/libwinpr/crypto/hmac_md5.h b/winpr/libwinpr/crypto/hmac_md5.h
index a1ea6a045..8ade3e424 100644
--- a/winpr/libwinpr/crypto/hmac_md5.h
+++ b/winpr/libwinpr/crypto/hmac_md5.h
@@ -12,8 +12,8 @@ typedef struct
 	WINPR_MD5_CTX ocontext;
 } WINPR_HMAC_MD5_CTX;
 
-void hmac_md5_init(WINPR_HMAC_MD5_CTX* ctx, unsigned char* key, size_t key_len);
-void hmac_md5_update(WINPR_HMAC_MD5_CTX* ctx, unsigned char* text, size_t text_len);
+void hmac_md5_init(WINPR_HMAC_MD5_CTX* ctx, const unsigned char* key, size_t key_len);
+void hmac_md5_update(WINPR_HMAC_MD5_CTX* ctx, const unsigned char* text, size_t text_len);
 void hmac_md5_finalize(WINPR_HMAC_MD5_CTX* ctx, unsigned char* hmac);
 
 #endif