Commit 9b945233 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from HEAD.

parent b065dc2e

crypto/asn1/x_x509.c

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) 
		ret->ex_pathlen = -1;

		ret->skid = NULL;

		ret->akid = NULL;

#ifdef OPENSSL_RFC3779

#ifndef OPENSSL_NO_RFC3779

		ret->rfc3779_addr = NULL;

		ret->rfc3779_asid = NULL;

#endif
@@ -113,7 +113,7 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) 
		ASN1_OCTET_STRING_free(ret->skid);

		AUTHORITY_KEYID_free(ret->akid);

		policy_cache_free(ret->policy_cache);

#ifdef OPENSSL_RFC3779

#ifndef OPENSSL_NO_RFC3779

		sk_IPAddressFamily_pop_free(ret->rfc3779_addr, IPAddressFamily_free);

		ASIdentifiers_free(ret->rfc3779_asid);

#endif

crypto/stack/safestack.h

+2 −4
Original line number Diff line number Diff line
@@ -234,7 +234,6 @@ STACK_OF(type) \ 
#define sk_ACCESS_DESCRIPTION_sort(st) SKM_sk_sort(ACCESS_DESCRIPTION, (st))

#define sk_ACCESS_DESCRIPTION_is_sorted(st) SKM_sk_is_sorted(ACCESS_DESCRIPTION, (st))



#ifdef OPENSSL_RFC3779

#define sk_ASIdOrRange_new(st) SKM_sk_new(ASIdOrRange, (st))

#define sk_ASIdOrRange_new_null() SKM_sk_new_null(ASIdOrRange)

#define sk_ASIdOrRange_free(st) SKM_sk_free(ASIdOrRange, (st))
@@ -256,7 +255,6 @@ STACK_OF(type) \ 
#define sk_ASIdOrRange_pop(st) SKM_sk_pop(ASIdOrRange, (st))

#define sk_ASIdOrRange_sort(st) SKM_sk_sort(ASIdOrRange, (st))

#define sk_ASIdOrRange_is_sorted(st) SKM_sk_is_sorted(ASIdOrRange, (st))

#endif /* def OPENSSL_RFC3779 */



#define sk_ASN1_GENERALSTRING_new(st) SKM_sk_new(ASN1_GENERALSTRING, (st))

#define sk_ASN1_GENERALSTRING_new_null() SKM_sk_new_null(ASN1_GENERALSTRING)
@@ -632,7 +630,7 @@ STACK_OF(type) \ 
#define sk_GENERAL_SUBTREE_sort(st) SKM_sk_sort(GENERAL_SUBTREE, (st))

#define sk_GENERAL_SUBTREE_is_sorted(st) SKM_sk_is_sorted(GENERAL_SUBTREE, (st))



#ifdef OPENSSL_RFC3779

#ifndef OPENSSL_NO_RFC3779

#define sk_IPAddressFamily_new(st) SKM_sk_new(IPAddressFamily, (st))

#define sk_IPAddressFamily_new_null() SKM_sk_new_null(IPAddressFamily)

#define sk_IPAddressFamily_free(st) SKM_sk_free(IPAddressFamily, (st))
@@ -676,7 +674,7 @@ STACK_OF(type) \ 
#define sk_IPAddressOrRange_pop(st) SKM_sk_pop(IPAddressOrRange, (st))

#define sk_IPAddressOrRange_sort(st) SKM_sk_sort(IPAddressOrRange, (st))

#define sk_IPAddressOrRange_is_sorted(st) SKM_sk_is_sorted(IPAddressOrRange, (st))

#endif /* def OPENSSL_RFC3779 */

#endif /* OPENSSL_NO_RFC3779 */



#define sk_KRB5_APREQBODY_new(st) SKM_sk_new(KRB5_APREQBODY, (st))

#define sk_KRB5_APREQBODY_new_null() SKM_sk_new_null(KRB5_APREQBODY)

crypto/x509/x509.h

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

crypto/x509/x509_vfy.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

crypto/x509v3/ext_dat.h

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ extern X509V3_EXT_METHOD v3_ocsp_crlid, v3_ocsp_nocheck, v3_ocsp_serviceloc; 
extern X509V3_EXT_METHOD v3_crl_hold, v3_pci;

extern X509V3_EXT_METHOD v3_policy_mappings, v3_policy_constraints;

extern X509V3_EXT_METHOD v3_name_constraints, v3_inhibit_anyp;

#ifdef OPENSSL_RFC3779

#ifndef OPENSSL_NO_RFC3779

extern X509V3_EXT_METHOD v3_addr, v3_asid;

#endif
@@ -102,7 +102,7 @@ static X509V3_EXT_METHOD *standard_exts[] = { 
#endif

&v3_sxnet,

&v3_info,

#ifdef OPENSSL_RFC3779

#ifndef OPENSSL_NO_RFC3779

&v3_addr,

&v3_asid,

#endif