Blame openssl-0.9.6-x509.patch
|
cvsdist |
0cfdac5 |
Do not treat duplicate certs as an error.
|
|
cvsdist |
0cfdac5 |
|
|
cvsdist |
107c5de |
--- openssl-0.9.6/crypto/x509/by_file.c Wed Sep 27 15:09:05 2000
|
|
cvsdist |
107c5de |
+++ openssl-0.9.6/crypto/x509/by_file.c Wed Sep 27 14:21:20 2000
|
|
cvsdist |
107c5de |
@@ -163,8 +163,12 @@
|
|
cvsdist |
107c5de |
}
|
|
cvsdist |
107c5de |
}
|
|
cvsdist |
107c5de |
i=X509_STORE_add_cert(ctx->store_ctx,x);
|
|
cvsdist |
107c5de |
- if (!i) goto err;
|
|
cvsdist |
107c5de |
- count++;
|
|
cvsdist |
107c5de |
+ /* ignore any problems with current certificate
|
|
cvsdist |
107c5de |
+ and continue with the next one */
|
|
cvsdist |
107c5de |
+ if (i)
|
|
cvsdist |
107c5de |
+ count++;
|
|
cvsdist |
107c5de |
+ else
|
|
cvsdist |
107c5de |
+ ERR_clear_error();
|
|
cvsdist |
107c5de |
X509_free(x);
|
|
cvsdist |
107c5de |
x=NULL;
|
|
cvsdist |
107c5de |
}
|
|
cvsdist |
107c5de |
@@ -179,7 +183,8 @@
|
|
cvsdist |
107c5de |
goto err;
|
|
cvsdist |
107c5de |
}
|
|
cvsdist |
107c5de |
i=X509_STORE_add_cert(ctx->store_ctx,x);
|
|
cvsdist |
107c5de |
- if (!i) goto err;
|
|
cvsdist |
107c5de |
+ if (!i)
|
|
cvsdist |
107c5de |
+ ERR_clear_error();
|
|
cvsdist |
107c5de |
ret=i;
|
|
cvsdist |
107c5de |
}
|
|
cvsdist |
107c5de |
else
|