Commit 2008e714 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add missing functions to allow access to newer X509_STORE_CTX status 

information. Add more informative message to verify callback to indicate
when CRL path validation is taking place.
parent 245d2ee3

apps/verify.c

+3 −1
Original line number Diff line number Diff line
@@ -310,7 +310,9 @@ static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx) 
				0, XN_FLAG_ONELINE);

			printf("\n");

			}

		printf("error %d at %d depth lookup:%s\n",cert_error,

		printf("%serror %d at %d depth lookup:%s\n",

			X509_STORE_CTX_get0_parent_ctx(ctx) ? "[CRL path]" : "",

			cert_error,

			X509_STORE_CTX_get_error_depth(ctx),

			X509_verify_cert_error_string(cert_error));

		switch(cert_error)

crypto/x509/x509_vfy.c

+15 −0
Original line number Diff line number Diff line
@@ -1879,6 +1879,21 @@ STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *ctx) 
	return chain;

	}



X509 *X509_STORE_CTX_get0_current_issuer(X509_STORE_CTX *ctx)

	{

	return ctx->current_issuer;

	}



X509_CRL *X509_STORE_CTX_get0_current_crl(X509_STORE_CTX *ctx)

	{

	return ctx->current_crl;

	}



X509_STORE_CTX *X509_STORE_CTX_get0_parent_ctx(X509_STORE_CTX *ctx)

	{

	return ctx->parent;

	}



void X509_STORE_CTX_set_cert(X509_STORE_CTX *ctx, X509 *x)

	{

	ctx->cert=x;

crypto/x509/x509_vfy.h

+3 −0
Original line number Diff line number Diff line
@@ -480,6 +480,9 @@ int X509_STORE_CTX_get_error(X509_STORE_CTX *ctx); 
void	X509_STORE_CTX_set_error(X509_STORE_CTX *ctx,int s);

int	X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);

X509 *	X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx);

X509 *X509_STORE_CTX_get0_current_issuer(X509_STORE_CTX *ctx);

X509_CRL *X509_STORE_CTX_get0_current_crl(X509_STORE_CTX *ctx);

X509_STORE_CTX *X509_STORE_CTX_get0_parent_ctx(X509_STORE_CTX *ctx);

STACK_OF(X509) *X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx);

STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *ctx);

void	X509_STORE_CTX_set_cert(X509_STORE_CTX *c,X509 *x);