Module: wine Branch: master Commit: d01c8407a9c72aacdf0f18bbda84651b1e19321a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01c8407a9c72aacdf0f18bbda...
Author: Andrew Talbot andrew.talbot@talbotville.com Date: Sat Aug 25 22:21:07 2007 +0100
secur32: Constify some variables.
---
dlls/secur32/hmac_md5.c | 4 ++-- dlls/secur32/hmac_md5.h | 4 ++-- dlls/secur32/schannel.c | 10 +++++----- dlls/secur32/secur32.c | 6 +++--- dlls/secur32/secur32_priv.h | 4 ++-- dlls/secur32/thunks.c | 4 ++-- dlls/secur32/util.c | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/dlls/secur32/hmac_md5.c b/dlls/secur32/hmac_md5.c index 1b18659..6dafa31 100644 --- a/dlls/secur32/hmac_md5.c +++ b/dlls/secur32/hmac_md5.c @@ -21,7 +21,7 @@
#include "hmac_md5.h"
-void HMACMD5Init(HMAC_MD5_CTX *ctx, unsigned char *key, unsigned int key_len) +void HMACMD5Init(HMAC_MD5_CTX *ctx, const unsigned char *key, unsigned int key_len) { int i; unsigned char inner_padding[64]; @@ -55,7 +55,7 @@ void HMACMD5Init(HMAC_MD5_CTX *ctx, unsigned char *key, unsigned int key_len) MD5Update(&(ctx->ctx), inner_padding, 64); }
-void HMACMD5Update(HMAC_MD5_CTX *ctx, unsigned char *data, unsigned int data_len) +void HMACMD5Update(HMAC_MD5_CTX *ctx, const unsigned char *data, unsigned int data_len) { MD5Update(&(ctx->ctx), data, data_len); } diff --git a/dlls/secur32/hmac_md5.h b/dlls/secur32/hmac_md5.h index 3a94bb0..8fc2a44 100644 --- a/dlls/secur32/hmac_md5.h +++ b/dlls/secur32/hmac_md5.h @@ -42,7 +42,7 @@ void WINAPI MD5Init( MD5_CTX *ctx ); void WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ); void WINAPI MD5Final( MD5_CTX *ctx );
-void HMACMD5Init(HMAC_MD5_CTX *ctx, unsigned char *key, unsigned int key_len); -void HMACMD5Update(HMAC_MD5_CTX *ctx, unsigned char *data, unsigned int data_len); +void HMACMD5Init(HMAC_MD5_CTX *ctx, const unsigned char *key, unsigned int key_len); +void HMACMD5Update(HMAC_MD5_CTX *ctx, const unsigned char *data, unsigned int data_len); void HMACMD5Final(HMAC_MD5_CTX *ctx, unsigned char *digest); #endif /*_HMAC_MD5_H_*/ diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index a8f50b6..b74e54c 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32);
static SECURITY_STATUS schan_QueryCredentialsAttributes( - PCredHandle phCredential, ULONG ulAttribute, PVOID pBuffer) + PCredHandle phCredential, ULONG ulAttribute, const VOID *pBuffer) { SECURITY_STATUS ret;
@@ -111,7 +111,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryCredentialsAttributesW( return ret; }
-static SECURITY_STATUS schan_CheckCreds(PSCHANNEL_CRED schanCred) +static SECURITY_STATUS schan_CheckCreds(const SCHANNEL_CRED *schanCred) { SECURITY_STATUS st;
@@ -149,7 +149,7 @@ static SECURITY_STATUS schan_CheckCreds(PSCHANNEL_CRED schanCred) return st; }
-static SECURITY_STATUS schan_AcquireClientCredentials(PSCHANNEL_CRED schanCred, +static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schanCred, PCredHandle phCredential, PTimeStamp ptsExpiry) { SECURITY_STATUS st = SEC_E_OK; @@ -177,7 +177,7 @@ static SECURITY_STATUS schan_AcquireClientCredentials(PSCHANNEL_CRED schanCred, return st; }
-static SECURITY_STATUS schan_AcquireServerCredentials(PSCHANNEL_CRED schanCred, +static SECURITY_STATUS schan_AcquireServerCredentials(const SCHANNEL_CRED *schanCred, PCredHandle phCredential, PTimeStamp ptsExpiry) { SECURITY_STATUS st; @@ -194,7 +194,7 @@ static SECURITY_STATUS schan_AcquireServerCredentials(PSCHANNEL_CRED schanCred, }
static SECURITY_STATUS schan_AcquireCredentialsHandle(ULONG fCredentialUse, - PSCHANNEL_CRED schanCred, PCredHandle phCredential, PTimeStamp ptsExpiry) + const SCHANNEL_CRED *schanCred, PCredHandle phCredential, PTimeStamp ptsExpiry) { SECURITY_STATUS ret;
diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index aabb56c..2e12c66 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -588,7 +588,7 @@ static void SECUR32_initializeProviders(void) } }
-SecurePackage *SECUR32_findPackageW(PWSTR packageName) +SecurePackage *SECUR32_findPackageW(PCWSTR packageName) { SecurePackage *ret = NULL; BOOL matched = FALSE; @@ -634,7 +634,7 @@ SecurePackage *SECUR32_findPackageW(PWSTR packageName) return ret; }
-SecurePackage *SECUR32_findPackageA(PSTR packageName) +SecurePackage *SECUR32_findPackageA(PCSTR packageName) { SecurePackage *ret;
@@ -778,7 +778,7 @@ SECURITY_STATUS WINAPI EnumerateSecurityPackagesW(PULONG pcPackages, * structures) into an array of SecPkgInfoA structures, which it returns. */ static PSecPkgInfoA thunk_PSecPkgInfoWToA(ULONG cPackages, - const PSecPkgInfoW info) + const SecPkgInfoW *info) { PSecPkgInfoA ret;
diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 303d8fc..4835525 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -112,11 +112,11 @@ void SECUR32_addPackages(SecureProvider *provider, ULONG toAdd, /* Tries to find the package named packageName. If it finds it, implicitly * loads the package if it isn't already loaded. */ -SecurePackage *SECUR32_findPackageW(PWSTR packageName); +SecurePackage *SECUR32_findPackageW(PCWSTR packageName);
/* Tries to find the package named packageName. (Thunks to _findPackageW) */ -SecurePackage *SECUR32_findPackageA(PSTR packageName); +SecurePackage *SECUR32_findPackageA(PCSTR packageName);
/* A few string helpers; will return NULL if str is NULL. Free return with * SECUR32_FREE */ diff --git a/dlls/secur32/thunks.c b/dlls/secur32/thunks.c index f21f351..b56507d 100644 --- a/dlls/secur32/thunks.c +++ b/dlls/secur32/thunks.c @@ -351,7 +351,7 @@ SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsW(PCredHandle hCredentials, return ret; }
-static PSecPkgInfoA _copyPackageInfoFlatWToA(PSecPkgInfoW infoW) +static PSecPkgInfoA _copyPackageInfoFlatWToA(const SecPkgInfoW *infoW) { PSecPkgInfoA ret;
@@ -576,7 +576,7 @@ SECURITY_STATUS SEC_ENTRY thunk_QueryContextAttributesA(PCtxtHandle phContext, return ret; }
-static PSecPkgInfoW _copyPackageInfoFlatAToW(PSecPkgInfoA infoA) +static PSecPkgInfoW _copyPackageInfoFlatAToW(const SecPkgInfoA *infoA) { PSecPkgInfoW ret;
diff --git a/dlls/secur32/util.c b/dlls/secur32/util.c index 6d36e20..15d3a2a 100644 --- a/dlls/secur32/util.c +++ b/dlls/secur32/util.c @@ -143,7 +143,7 @@ SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(PBYTE password, int len, PBYTE se return SEC_E_OK; }
-static void SECUR32_CalcNTLMv2Subkey(PBYTE session_key, const char *magic, PBYTE subkey) +static void SECUR32_CalcNTLMv2Subkey(const BYTE *session_key, const char *magic, PBYTE subkey) { MD5_CTX ctx;