File openssl-0.9.6-x509.patch of Package mingw32-openssl

Overview Repositories Revisions Requests Users Attributes Meta

File openssl-0.9.6-x509.patch of Package mingw32-openssl

Do not treat duplicate certs as an error.

--- openssl-0.9.6/crypto/x509/by_file.c	Wed Sep 27 15:09:05 2000
+++ openssl-0.9.6/crypto/x509/by_file.c	Wed Sep 27 14:21:20 2000
@@ -163,8 +163,12 @@
 					}
 				}
 			i=X509_STORE_add_cert(ctx->store_ctx,x);
-			if (!i) goto err;
-			count++;
+			/* ignore any problems with current certificate 
+			    and continue with the next one */
+			if (i)
+			    count++;
+			else
+			    ERR_clear_error();
 			X509_free(x);
 			x=NULL;
 			}
@@ -179,7 +183,8 @@
 			goto err;
 			}
 		i=X509_STORE_add_cert(ctx->store_ctx,x);
-		if (!i) goto err;
+		if (!i)
+		  ERR_clear_error();
 		ret=i;
 		}
 	else
--- openssl-0.9.6/crypto/x509/x509.h	2009-08-11 17:12:14.000000000 +0200
+++ openssl-0.9.6/crypto/x509/x509.h	2009-08-11 17:12:25.000000000 +0200
@@ -116,6 +116,7 @@
 /* Under Win32 these are defined in wincrypt.h */
 #undef X509_NAME
 #undef X509_CERT_PAIR
+#undef X509_EXTENSIONS
 #endif
 
 #define X509_FILETYPE_PEM	1
--- openssl-0.9.6/crypto/store/store.h	2009-08-12 00:57:20.000000000 +0200
+++ openssl-0.9.6/crypto/store/store.h	2009-08-12 01:00:27.000000000 +0200
@@ -70,6 +70,13 @@
 extern "C" {
 #endif
 
+#ifdef OPENSSL_SYS_WIN32
+/* Under Win32 these are defined in wincrypt.h */
+#undef X509_NAME
+#undef X509_CERT_PAIR
+#undef X509_EXTENSIONS
+#endif
+
 /* Already defined in ossl_typ.h */
 /* typedef struct store_st STORE; */
 /* typedef struct store_method_st STORE_METHOD; */
--- openssl-0.9.6/crypto/pem/pem.h	2009-08-12 01:14:59.000000000 +0200
+++ openssl-0.9.6/crypto/pem/pem.h	2009-08-12 01:15:01.000000000 +0200
@@ -74,6 +74,13 @@
 extern "C" {
 #endif
 
+#ifdef OPENSSL_SYS_WIN32
+/* Under Win32 these are defined in wincrypt.h */
+#undef X509_NAME
+#undef X509_CERT_PAIR
+#undef X509_EXTENSIONS
+#endif
+
 #define PEM_BUFSIZE		1024
 
 #define PEM_OBJ_UNDEF		0

Places

File openssl-0.9.6-x509.patch of Package mingw32-openssl

Places