diff -Nura openssl-1.0.1.orig//crypto/bio/bio_lib.c openssl-1.0.1//crypto/bio/bio_lib.c
--- openssl-1.0.1.orig//crypto/bio/bio_lib.c	2010-06-15 19:25:06.000000000 +0200
+++ openssl-1.0.1//crypto/bio/bio_lib.c	2012-04-12 15:07:59.646178882 +0200
@@ -521,40 +521,40 @@
 
 BIO *BIO_dup_chain(BIO *in)
 	{
-	BIO *ret=NULL,*eoc=NULL,*bio,*new;
+	BIO *ret=NULL,*eoc=NULL,*bio,*new_bio;
 
 	for (bio=in; bio != NULL; bio=bio->next_bio)
 		{
-		if ((new=BIO_new(bio->method)) == NULL) goto err;
-		new->callback=bio->callback;
-		new->cb_arg=bio->cb_arg;
-		new->init=bio->init;
-		new->shutdown=bio->shutdown;
-		new->flags=bio->flags;
+		if ((new_bio=BIO_new(bio->method)) == NULL) goto err;
+		new_bio->callback=bio->callback;
+		new_bio->cb_arg=bio->cb_arg;
+		new_bio->init=bio->init;
+		new_bio->shutdown=bio->shutdown;
+		new_bio->flags=bio->flags;
 
 		/* This will let SSL_s_sock() work with stdin/stdout */
-		new->num=bio->num;
+		new_bio->num=bio->num;
 
-		if (!BIO_dup_state(bio,(char *)new))
+		if (!BIO_dup_state(bio,(char *)new_bio))
 			{
-			BIO_free(new);
+			BIO_free(new_bio);
 			goto err;
 			}
 
 		/* copy app data */
-		if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_BIO, &new->ex_data,
+		if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_BIO, &new_bio->ex_data,
 					&bio->ex_data))
 			goto err;
 
 		if (ret == NULL)
 			{
-			eoc=new;
+			eoc=new_bio;
 			ret=eoc;
 			}
 		else
 			{
-			BIO_push(eoc,new);
-			eoc=new;
+			BIO_push(eoc,new_bio);
+			eoc=new_bio;
 			}
 		}
 	return(ret);
diff -Nura openssl-1.0.1.orig//crypto/x509/x509_lu.c openssl-1.0.1//crypto/x509/x509_lu.c
--- openssl-1.0.1.orig//crypto/x509/x509_lu.c	2010-02-19 19:26:23.000000000 +0100
+++ openssl-1.0.1//crypto/x509/x509_lu.c	2012-04-12 15:37:35.022246867 +0200
@@ -86,8 +86,8 @@
 	{
 	if (ctx == NULL) return;
 	if (	(ctx->method != NULL) &&
-		(ctx->method->free != NULL))
-		ctx->method->free(ctx);
+		(ctx->method->free_item != NULL))
+		ctx->method->free_item(ctx);
 	OPENSSL_free(ctx);
 	}
 
diff -Nura openssl-1.0.1.orig//crypto/x509/x509_vfy.h openssl-1.0.1//crypto/x509/x509_vfy.h
--- openssl-1.0.1.orig//crypto/x509/x509_vfy.h	2009-10-31 20:21:47.000000000 +0100
+++ openssl-1.0.1//crypto/x509/x509_vfy.h	2012-04-12 15:36:05.190243427 +0200
@@ -142,7 +142,7 @@
 	{
 	const char *name;
 	int (*new_item)(X509_LOOKUP *ctx);
-	void (*free)(X509_LOOKUP *ctx);
+	void (*free_item)(X509_LOOKUP *ctx);
 	int (*init)(X509_LOOKUP *ctx);
 	int (*shutdown)(X509_LOOKUP *ctx);
 	int (*ctrl)(X509_LOOKUP *ctx,int cmd,const char *argc,long argl,