release 1.8.4: compile with MS VS 2013

Author: Hans Zandbelt

ChangeLog

@@ -1,3 +1,7 @@
+7/3/2015
+- allow for compilation on Windows using VS 2013
+- bump to 1.8.4
+
 6/30/2015
 - improve memcache logging: don't report cache misses as an error, thanks to @scottdear
 - work around JSON timestamp print modifier issue (%lld) on some platforms, thanks to @ralphvanetten

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([mod_auth_openidc],[1.8.4rc3],[[email protected]])
+AC_INIT([mod_auth_openidc],[1.8.4],[[email protected]])
 
 AC_SUBST(NAMEVER, AC_PACKAGE_TARNAME()-AC_PACKAGE_VERSION())
 

debian/changelog

@@ -1,3 +1,9 @@
+libapache2-mod-auth-openidc (1.8.4-1) unstable; urgency=medium
+
+  * allow for compilation on MS Windows
+
+ -- Hans Zandbelt <[email protected]>  Fri, 03 Jul 2015 19:39:11 +0200
+
 libapache2-mod-auth-openidc (1.8.3-1) unstable; urgency=medium
 
   * remove accounts.google.com exceptions

src/cache/lock.c

@@ -50,7 +50,9 @@
  * @Author: Hans Zandbelt - [email protected]
  */
 
+#ifndef WIN32
 #include <unistd.h>
+#endif
 
 #include "apr_general.h"
 

src/config.c

@@ -528,7 +528,7 @@ static const char *oidc_set_public_key_files(cmd_parms *cmd, void *struct_ptr,
 			cmd->server->module_config, &auth_openidc_module);
 
 	int offset = (int) (long) cmd->info;
-	apr_hash_t **public_keys = (apr_hash_t **) ((void *) cfg + offset);
+	apr_hash_t **public_keys = (apr_hash_t **) ((char *) cfg + offset);
 
 	if (apr_jwk_parse_rsa_public_key(cmd->pool, arg, &jwk, &err) == FALSE) {
 		return apr_psprintf(cmd->pool,
@@ -551,7 +551,7 @@ static const char *oidc_set_shared_keys(cmd_parms *cmd, void *struct_ptr,
 	oidc_cfg *cfg = (oidc_cfg *) ap_get_module_config(
 			cmd->server->module_config, &auth_openidc_module);
 	int offset = (int) (long) cmd->info;
-	apr_hash_t **shared_keys = (apr_hash_t **) ((void *) cfg + offset);
+	apr_hash_t **shared_keys = (apr_hash_t **) ((char *) cfg + offset);
 	*shared_keys = oidc_util_merge_symmetric_key(cmd->pool, *shared_keys, arg,
 			NULL);
 	return NULL;
@@ -702,7 +702,7 @@ static const char *oidc_set_remote_user_claim(cmd_parms *cmd, void *struct_ptr,
 
 	int offset = (int) (long) cmd->info;
 	oidc_remote_user_claim_t *remote_user_claim =
-			(oidc_remote_user_claim_t *) ((void *) cfg + offset);
+			(oidc_remote_user_claim_t *) ((char *) cfg + offset);
 
 	remote_user_claim->claim_name = v1;
 	if (v2)

src/jose/apr_jose.h

@@ -53,6 +53,7 @@
 #ifndef _APR_JOSE_H_
 #define _APR_JOSE_H_
 
+#include <stdint.h>
 #include "apr_pools.h"
 #include "apr_tables.h"
 #include "apr_hash.h"

src/jose/apr_jwt.c

@@ -55,6 +55,10 @@
 #include "apr_jose.h"
 #include <openssl/opensslv.h>
 
+#ifdef WIN32
+#define snprintf _snprintf
+#endif
+
 /*
  * assemble an error report
  */

src/mod_auth_openidc.c

@@ -133,6 +133,8 @@ static void oidc_scrub_request_headers(request_rec *r, const char *claim_prefix,
 	r->headers_in = clean_headers;
 }
 
+#define OIDC_SHA1_LEN 20
+
 /*
  * calculates a hash value based on request fingerprint plus a provided nonce string.
  */
@@ -172,13 +174,12 @@ static char *oidc_get_browser_state_hash(request_rec *r, const char *nonce) {
 	apr_sha1_update(&sha1, nonce, strlen(nonce));
 
 	/* finalize the hash input and calculate the resulting hash output */
-	const int sha1_len = 20;
-	unsigned char hash[sha1_len];
+	unsigned char hash[OIDC_SHA1_LEN];
 	apr_sha1_final(hash, &sha1);
 
 	/* base64url-encode the resulting hash and return it */
 	char *result = NULL;
-	oidc_base64url_encode(r, &result, (const char *) hash, sha1_len, TRUE);
+	oidc_base64url_encode(r, &result, (const char *) hash, OIDC_SHA1_LEN, TRUE);
 	return result;
 }
 

src/mod_auth_openidc.h

@@ -51,6 +51,7 @@
 #ifndef MOD_AUTH_OPENIDC_H_
 #define MOD_AUTH_OPENIDC_H_
 
+#include <stdint.h>
 #include <openssl/evp.h>
 #include <apr_uri.h>
 #include <apr_uuid.h>
@@ -433,9 +434,10 @@ apr_byte_t oidc_metadata_get(request_rec *r, oidc_cfg *cfg, const char *selected
 apr_byte_t oidc_metadata_jwks_get(request_rec *r, oidc_cfg *cfg, const oidc_jwks_uri_t *jwks_uri, json_t **j_jwks, apr_byte_t *refresh);
 
 // oidc_session.c
-#if MODULE_MAGIC_NUMBER_MAJOR >= 20081201
+#if MODULE_MAGIC_NUMBER_MAJOR_NOT_WORKING_YET >= 20081201
 // this stuff should make it easy to migrate to the post 2.3 mod_session infrastructure
 #include "mod_session.h"
+//#define OIDC_SESSION_USE_APACHE_SESSIONS 1
 #else
 typedef struct {
     apr_pool_t *pool;             /* pool to be used for this session */

src/session.c

@@ -172,6 +172,7 @@ static char x2c(const char *what) {
 	return (digit);
 }
 
+#ifndef WIN32
 AP_DECLARE(char *) ap_escape_urlencoded_buffer(char *copy, const char *buffer) {
 	const unsigned char *s = (const unsigned char *) buffer;
 	unsigned char *d = (unsigned char *) copy;
@@ -190,6 +191,7 @@ AP_DECLARE(char *) ap_escape_urlencoded_buffer(char *copy, const char *buffer) {
 	*d = '\0';
 	return copy;
 }
+#endif
 
 static int oidc_session_unescape_url(char *url, const char *forbid,
 		const char *reserved) {
@@ -240,6 +242,7 @@ static int oidc_session_unescape_url(char *url, const char *forbid,
 	}
 }
 
+#ifndef WIN32
 AP_DECLARE(int) ap_unescape_urlencoded(char *query) {
 	char *slider;
 	/* replace plus with a space */
@@ -253,6 +256,7 @@ AP_DECLARE(int) ap_unescape_urlencoded(char *query) {
 	/* unescape everything else */
 	return oidc_session_unescape_url(query, NULL, NULL);
 }
+#endif
 
 // copied from mod_session.c
 static apr_status_t oidc_session_identity_decode(request_rec * r,