diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-27 10:19:14 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-27 10:19:14 -0500 |
| commit | c73ad690174171b63a53dabdb2f2d9ebfd30053a (patch) | |
| tree | e627ce5a98f6aeecfc985295f1a1a853fe91fc06 /crypto/x509 | |
| parent | a00ae6c46e0d7907a7c9f9e85334e968aa5fd338 (diff) | |
OPENSSL_NO_xxx cleanup: RFC3779
Remove OPENSSL_NO_RFCF3779.
Also, makevms.com was ignored by some of the other cleanups, so
I caught it up. Sorry I ignored you, poor little VMS...
Reviewed-by: Richard Levitte <levitte@openssl.org>
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, 0 insertions, 4 deletions
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h index 5b25de036b..13f7531c24 100644 --- a/crypto/x509/x509.h +++ b/crypto/x509/x509.h @@ -278,10 +278,8 @@ struct x509_st { STACK_OF(DIST_POINT) *crldp; STACK_OF(GENERAL_NAME) *altname; NAME_CONSTRAINTS *nc; -# ifndef OPENSSL_NO_RFC3779 STACK_OF(IPAddressFamily) *rfc3779_addr; struct ASIdentifiers_st *rfc3779_asid; -# endif # ifndef OPENSSL_NO_SHA unsigned char sha1_hash[SHA_DIGEST_LENGTH]; # endif diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 8e639c829d..31bb95b688 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -439,7 +439,6 @@ int X509_verify_cert(X509_STORE_CTX *ctx) if (!ok) goto end; -#ifndef OPENSSL_NO_RFC3779 /* RFC 3779 path validation, now that CRL check has been done */ ok = v3_asid_validate_path(ctx); if (!ok) @@ -447,7 +446,6 @@ int X509_verify_cert(X509_STORE_CTX *ctx) ok = v3_addr_validate_path(ctx); if (!ok) goto end; -#endif /* If we get this far evaluate policies */ if (!bad_chain && (ctx->param->flags & X509_V_FLAG_POLICY_CHECK)) |