polish

src/vmod_crypto.c

@@ -56,7 +56,7 @@
  */
 
 
-static unsigned long
+static inline unsigned long
 crypto_thread_id(void)
 {
 	return ((unsigned long)pthread_self());
@@ -65,8 +65,8 @@ crypto_thread_id(void)
 static pthread_mutex_t *crypto_locks = NULL;
 static size_t crypto_locks_n = 0;
 
-static void
-crypto_lock(int mode, size_t n, const char *file, int line)
+static inline void
+crypto_lock(int mode, int n, const char *file, int line)
 {
 	(void) file;
 	(void) line;
@@ -539,7 +539,7 @@ crypto_err_cb(const char *s, size_t l, void *u)
 {
 	VRT_CTX;
 	CAST_OBJ_NOTNULL(ctx, u, VRT_CTX_MAGIC);
-	VSLb(ctx->vsl, SLT_Debug, "crypto %.*s", l, s);
+	VSLb(ctx->vsl, SLT_Debug, "crypto %.*s", (int)l, s);
 	return (0);
 }
 
@@ -569,7 +569,7 @@ vmod_verifier__init(VRT_CTX,
 		return;
 	}
 
-	if (args->valid_pem ^ args->valid_key == 0) {
+	if ((args->valid_pem ^ args->valid_key) == 0) {
 		VRT_fail(ctx, "Need either pem or key, but not both");
 		return;
 	}
@@ -762,7 +762,7 @@ vmod_signer__init(VRT_CTX,
 		return;
 	}
 
-	if (args->valid_pem ^ args->valid_key == 0) {
+	if ((args->valid_pem ^ args->valid_key) == 0) {
 		VRT_fail(ctx, "Need either pem or key, but not both");
 		return;
 	}
@@ -929,7 +929,7 @@ VCL_BLOB vmod_signer_final(VRT_CTX, struct vmod_crypto_signer *vcs)
 
 	return (VRT_blob(ctx, "xsigner.final()", sig, siglen, 0x6bba960e));
   err:
-	VSLb(ctx->vsl, SLT_Debug, "%s.final() failed: %s",
+	VSLb(ctx->vsl, SLT_Debug, "%s.final() failed: 0x%lx",
 	    vcs->vcl_name, ERR_get_error());
 	ERR_print_errors_cb(crypto_err_cb, (void *)ctx);
 	return (NULL);