Clean up argument types for openconnect_base64_decode()

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
sailfishos-mirror · Jul 4, 2014 · aa37b09 · aa37b09
1 parent f4e1239
commit aa37b09
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/gssapi.c b/gssapi.c
@@ -86,7 +86,7 @@ int gssapi_authorization(struct openconnect_info *vpninfo, struct oc_text_buf *h
 	}
 
 	if (vpninfo->auth[AUTH_TYPE_GSSAPI].challenge && *vpninfo->auth[AUTH_TYPE_GSSAPI].challenge) {
-		int len = openconnect_base64_decode((unsigned char **)&in.value, vpninfo->auth[AUTH_TYPE_GSSAPI].challenge);
+		int len = openconnect_base64_decode(&in.value, vpninfo->auth[AUTH_TYPE_GSSAPI].challenge);
 		if (len < 0)
 			return -EINVAL;
 		in.length = len;

diff --git a/http.c b/http.c
@@ -1662,7 +1662,7 @@ static inline int b64_char(char c)
 	return -1;
 }
 
-int openconnect_base64_decode(unsigned char **out, char *in)
+int openconnect_base64_decode(void **out, const char *in)
 {
 	unsigned char *buf;
 	int b[4];

diff --git a/ntlm.c b/ntlm.c
@@ -43,7 +43,7 @@
 #define NTLM_MANUAL_REQ		4	/* manual type1 packet sent */
 
 #ifdef _WIN32
-static int ntlm_sspi(struct openconnect_info *vpninfo, struct oc_text_buf *buf, char *challenge)
+static int ntlm_sspi(struct openconnect_info *vpninfo, struct oc_text_buf *buf, const char *challenge)
 {
         SECURITY_STATUS status;
         SecBufferDesc input_desc, output_desc;
@@ -58,7 +58,7 @@ static int ntlm_sspi(struct openconnect_info *vpninfo, struct oc_text_buf *buf,
 		input_desc.ulVersion = SECBUFFER_VERSION;
 
 		in_token.BufferType = SECBUFFER_TOKEN;
-		token_len = openconnect_base64_decode((unsigned char **)&in_token.pvBuffer, challenge);
+		token_len = openconnect_base64_decode(&in_token.pvBuffer, challenge);
 		if (token_len < 0)
 			return token_len;
 		in_token.cbBuffer = token_len;
@@ -947,7 +947,7 @@ static int ntlm_manual_challenge(struct openconnect_info *vpninfo, struct oc_tex
 	if (ntlm_nt_hash (vpninfo->proxy_pass, (char *) hash))
 		return -EINVAL;
 
-	token_len = openconnect_base64_decode(&token,
+	token_len = openconnect_base64_decode((void **)&token,
 					      vpninfo->auth[AUTH_TYPE_NTLM].challenge);
 	if (token_len < 0)
 		return token_len;

diff --git a/openconnect-internal.h b/openconnect-internal.h
@@ -606,7 +606,7 @@ void  __attribute__ ((format (printf, 2, 3)))
 	buf_append(struct oc_text_buf *buf, const char *fmt, ...);
 void buf_append_bytes(struct oc_text_buf *buf, const void *bytes, int len);
 void buf_append_base64(struct oc_text_buf *buf, const void *bytes, int len);
-int openconnect_base64_decode(unsigned char **out, char *in);
+int openconnect_base64_decode(void **out, const char *in);
 int buf_error(struct oc_text_buf *buf);
 int buf_free(struct oc_text_buf *buf);
 char *openconnect_create_useragent(const char *base);

diff --git a/sspi.c b/sspi.c
@@ -64,7 +64,7 @@ int gssapi_authorization(struct openconnect_info *vpninfo, struct oc_text_buf *h
 		input_desc.ulVersion = SECBUFFER_VERSION;
 
 		in_token.BufferType = SECBUFFER_TOKEN;
-		token_len = openconnect_base64_decode((unsigned char **)&in_token.pvBuffer,
+		token_len = openconnect_base64_decode(&in_token.pvBuffer,
 						      vpninfo->auth[AUTH_TYPE_GSSAPI].challenge);
 		if (token_len < 0)
 			return token_len;