Commit 4903abd5 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

make X509_EXTENSION opaque 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent c7f5b5d7

crypto/asn1/t_req.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, 
                    goto err;

                if (!X509V3_EXT_print(bp, ex, cflag, 16)) {

                    BIO_printf(bp, "%16s", "");

                    ASN1_STRING_print(bp, ex->value);

                    ASN1_STRING_print(bp, X509_EXTENSION_get_data(ex));

                }

                if (BIO_write(bp, "\n", 1) <= 0)

                    goto err;

crypto/asn1/x_crl.c

+4 −4
Original line number Diff line number Diff line
@@ -179,8 +179,8 @@ static int crl_set_issuers(X509_CRL *crl) 


        for (j = 0; j < sk_X509_EXTENSION_num(exts); j++) {

            ext = sk_X509_EXTENSION_value(exts, j);

            if (ext->critical > 0) {

                if (OBJ_obj2nid(ext->object) == NID_certificate_issuer)

            if (X509_EXTENSION_get_critical(ext)) {

                if (OBJ_obj2nid(X509_EXTENSION_get_object(ext)) == NID_certificate_issuer)

                    continue;

                crl->flags |= EXFLAG_CRITICAL;

                break;
@@ -253,10 +253,10 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, 
        for (idx = 0; idx < sk_X509_EXTENSION_num(exts); idx++) {

            int nid;

            ext = sk_X509_EXTENSION_value(exts, idx);

            nid = OBJ_obj2nid(ext->object);

            nid = OBJ_obj2nid(X509_EXTENSION_get_object(ext));

            if (nid == NID_freshest_crl)

                crl->flags |= EXFLAG_FRESHEST;

            if (ext->critical > 0) {

            if (X509_EXTENSION_get_critical(ext)) {

                /* We handle IDP and deltas */

                if ((nid == NID_issuing_distribution_point)

                    || (nid == NID_authority_key_identifier)

crypto/ocsp/ocsp_ext.c

+2 −1
Original line number Diff line number Diff line
@@ -388,7 +388,8 @@ int OCSP_check_nonce(OCSP_REQUEST *req, OCSP_BASICRESP *bs) 
     */

    req_ext = OCSP_REQUEST_get_ext(req, req_idx);

    resp_ext = OCSP_BASICRESP_get_ext(bs, resp_idx);

    if (ASN1_OCTET_STRING_cmp(req_ext->value, resp_ext->value))

    if (ASN1_OCTET_STRING_cmp(X509_EXTENSION_get_data(req_ext),

                              X509_EXTENSION_get_data(resp_ext)))

        return 0;

    return 1;

}

crypto/ts/ts_lib.c

+2 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include "cryptlib.h"

#include <openssl/objects.h>

#include <openssl/bn.h>

#include <openssl/x509.h>

#include <openssl/x509v3.h>

#include <openssl/ts.h>
@@ -115,7 +116,7 @@ int TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions) 
        BIO_printf(bio, ": %s\n", critical ? "critical" : "");

        if (!X509V3_EXT_print(bio, ex, 0, 4)) {

            BIO_printf(bio, "%4s", "");

            ASN1_STRING_print(bio, ex->value);

            ASN1_STRING_print(bio, X509_EXTENSION_get_data(ex));

        }

        BIO_write(bio, "\n", 1);

    }

crypto/x509/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ LIBSRC= x509_def.c x509_d2.c x509_r2x.c x509_cmp.c \ 
	x509_set.c x509cset.c x509rset.c x509_err.c \

	x509name.c x509_v3.c x509_ext.c x509_att.c \

	x509type.c x509_lu.c x_all.c x509_txt.c \

	x509_trs.c by_file.c by_dir.c x509_vpm.c x_attrib.c

	x509_trs.c by_file.c by_dir.c x509_vpm.c x_attrib.c x_exten.c

LIBOBJ= x509_def.o x509_d2.o x509_r2x.o x509_cmp.o \

	x509_obj.o x509_req.o x509spki.o x509_vfy.o \

	x509_set.o x509cset.o x509rset.o x509_err.o \

	x509name.o x509_v3.o x509_ext.o x509_att.o \

	x509type.o x509_lu.o x_all.o x509_txt.o \

	x509_trs.o by_file.o by_dir.o x509_vpm.o x_attrib.o

	x509_trs.o by_file.o by_dir.o x509_vpm.o x_attrib.o x_exten.o



SRC= $(LIBSRC)