[ipfire-3.x.git] / openssl / patches / openssl-0.9.6-x509.patch

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
Commit	Line	Data
0595faf5 MT	1	Do not treat duplicate certs as an error.
	2
	3	--- openssl-0.9.6/crypto/x509/by_file.c Wed Sep 27 15:09:05 2000
	4	+++ openssl-0.9.6/crypto/x509/by_file.c Wed Sep 27 14:21:20 2000
	5	@@ -163,8 +163,12 @@
	6	}
	7	}
	8	i=X509_STORE_add_cert(ctx->store_ctx,x);
	9	- if (!i) goto err;
	10	- count++;
	11	+ /* ignore any problems with current certificate
	12	+ and continue with the next one */
	13	+ if (i)
	14	+ count++;
	15	+ else
	16	+ ERR_clear_error();
	17	X509_free(x);
	18	x=NULL;
	19	}
	20	@@ -179,7 +183,8 @@
	21	goto err;
	22	}
	23	i=X509_STORE_add_cert(ctx->store_ctx,x);
	24	- if (!i) goto err;
	25	+ if (!i)
	26	+ ERR_clear_error();
	27	ret=i;
	28	}
	29	else