Commit c73ad690 authored by Rich Salz's avatar Rich Salz
Browse files

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: default avatarRichard Levitte <levitte@openssl.org>
parent a00ae6c4

crypto/asn1/x_x509.c

+0 −4
Original line number Diff line number Diff line
@@ -95,10 +95,8 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, 
        ret->ex_pathlen = -1;

        ret->skid = NULL;

        ret->akid = NULL;

#ifndef OPENSSL_NO_RFC3779

        ret->rfc3779_addr = NULL;

        ret->rfc3779_asid = NULL;

#endif

        ret->aux = NULL;

        ret->crldp = NULL;

        CRYPTO_new_ex_data(CRYPTO_EX_INDEX_X509, ret, &ret->ex_data);
@@ -119,10 +117,8 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, 
        policy_cache_free(ret->policy_cache);

        GENERAL_NAMES_free(ret->altname);

        NAME_CONSTRAINTS_free(ret->nc);

#ifndef OPENSSL_NO_RFC3779

        sk_IPAddressFamily_pop_free(ret->rfc3779_addr, IPAddressFamily_free);

        ASIdentifiers_free(ret->rfc3779_asid);

#endif



        if (ret->name != NULL)

            OPENSSL_free(ret->name);

crypto/x509/x509.h

+0 −2
Original line number Diff line number Diff line
@@ -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

crypto/x509/x509_vfy.c

+0 −2
Original line number Diff line number Diff line
@@ -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))

crypto/x509v3/ext_dat.h

+0 −2
Original line number Diff line number Diff line
@@ -103,10 +103,8 @@ static const X509V3_EXT_METHOD *standard_exts[] = { 
#endif

    &v3_sxnet,

    &v3_info,

#ifndef OPENSSL_NO_RFC3779

    &v3_addr,

    &v3_asid,

#endif

#ifndef OPENSSL_NO_OCSP

    &v3_ocsp_nonce,

    &v3_ocsp_crlid,

crypto/x509v3/v3_addr.c

+4 −7
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ 
#include <openssl/buffer.h>

#include <openssl/x509v3.h>



#ifndef OPENSSL_NO_RFC3779



/*

 * OpenSSL ASN.1 template translation of RFC 3779 2.2.3.
@@ -1340,5 +1339,3 @@ int v3_addr_validate_resource_set(STACK_OF(X509) *chain, 
        return 0;

    return v3_addr_validate_path_internal(NULL, chain, ext);

}
 


#endif                          /* OPENSSL_NO_RFC3779 */