This file has a 'explicit' struct x509_store_ctx_st member. This words is
unfortunetely a C++ reserved word in g++ 3.4.1 at least. And from a bit of
googling, has been a reserved word for more than 6 years.
I suggest we replace with 'explicit_policy'.
--- crypto/x509v3/x509_vfy.h.orig Sat Sep 18 04:00:11 2004
+++ crypto/x509v3/x509_vfy.h Fri Oct 01 10:03:47 2004
@@ -254,7 +254,7 @@
STACK_OF(X509) *chain; /* chain of X509s - built up and trusted */
X509_POLICY_TREE *tree; /* Valid policy tree */
- int explicit; /* Require explicit policy value */
+ int explicit_policy; /* Require explicit policy value */
/* When something goes wrong, this is why */
int error_depth;
--- crypto/x509v3/x509_vfy.c.orig Mon Sep 06 21:00:14 2004
+++ crypto/x509v3/x509_vfy.c Fri Oct 01 10:05:09 2004
@@ -747,7 +747,7 @@
static int check_policy(X509_STORE_CTX *ctx)
{
int ret;
- ret = X509_policy_check(&ctx->tree, &ctx->explicit, ctx->chain,
+ ret = X509_policy_check(&ctx->tree, &ctx->explicit_policy, ctx->chain,
ctx->param->policies, ctx->param->flags);
if (ret == 0)
{
@@ -1246,7 +1246,7 @@
ctx->valid=0;
ctx->chain=NULL;
ctx->error=0;
- ctx->explicit=0;
+ ctx->explicit_policy=0;
ctx->error_depth=0;
ctx->current_cert=NULL;
ctx->current_issuer=NULL;
@@ -1398,7 +1398,7 @@
int X509_STORE_CTX_get_explicit_policy(X509_STORE_CTX *ctx)
{
- return ctx->explicit;
+ return ctx->explicit_policy;
}
int X509_STORE_CTX_set_default(X509_STORE_CTX *ctx, const char *name)
--gv
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [EMAIL PROTECTED]
Automated List Manager [EMAIL PROTECTED]
