diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-12-06 13:38:59 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-12-06 13:38:59 +0000 |
| commit | 9b945233b16c8be1aaa1085d0454b12cc3cbb962 (patch) | |
| tree | a46e1c47008c3684813c253abf21f48b354924dd /crypto/x509 | |
| parent | b065dc2eee2754a3100a175366d5b4a7def1724d (diff) | |
Update from HEAD.
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/x509.h | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_vfy.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h index efbc95f58a..16a954f709 100644 --- a/crypto/x509/x509.h +++ b/crypto/x509/x509.h @@ -288,7 +288,7 @@ struct x509_st ASN1_OCTET_STRING *skid; struct AUTHORITY_KEYID_st *akid; X509_POLICY_CACHE *policy_cache; -#ifdef OPENSSL_RFC3779 +#ifndef OPENSSL_NO_RFC3779 STACK_OF(IPAddressFamily) *rfc3779_addr; struct ASIdentifiers_st *rfc3779_asid; #endif diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 009817066e..60eb6b8683 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -312,7 +312,7 @@ int X509_verify_cert(X509_STORE_CTX *ctx) ok=internal_verify(ctx); if(!ok) goto end; -#ifdef OPENSSL_RFC3779 +#ifndef OPENSSL_NO_RFC3779 /* RFC 3779 path validation, now that CRL check has been done */ ok = v3_asid_validate_path(ctx); if (!ok) goto end; |