Commit 56501ebd authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add ASN1_ITEM lookup and enumerate functions. 



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

crypto/asn1/asn1_item_list.c

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy

 * in the file LICENSE in the source distribution or at

 * https://www.openssl.org/source/license.html

 */



#include <stdio.h>

#include "internal/cryptlib.h"

#include <openssl/asn1.h>

#include <openssl/asn1t.h>

#include <openssl/cms.h>

#include <openssl/ocsp.h>

#include <openssl/pkcs7.h>

#include <openssl/pkcs12.h>

#include <openssl/x509v3.h>



#include "asn1_item_list.h"



const ASN1_ITEM *ASN1_ITEM_lookup(const char *name)

{

    size_t i;



    for (i = 0; i < OSSL_NELEM(asn1_item_list); i++) {

        const ASN1_ITEM *it = ASN1_ITEM_ptr(asn1_item_list[i]);



        if (strcmp(it->sname, name) == 0)

            return it;

    }

    return NULL;

}



const ASN1_ITEM *ASN1_ITEM_get(size_t i)

{

    if (i >= OSSL_NELEM(asn1_item_list))

        return NULL;

    return ASN1_ITEM_ptr(asn1_item_list[i]);

}

crypto/asn1/asn1_item_list.h

0 → 100644
+163 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy

 * in the file LICENSE in the source distribution or at

 * https://www.openssl.org/source/license.html

 */



static ASN1_ITEM_EXP *asn1_item_list[] = {



    ASN1_ITEM_ref(ACCESS_DESCRIPTION),

#ifndef OPENSSL_NO_RFC3779

    ASN1_ITEM_ref(ASIdOrRange),

    ASN1_ITEM_ref(ASIdentifierChoice),

    ASN1_ITEM_ref(ASIdentifiers),

#endif

    ASN1_ITEM_ref(ASN1_ANY),

    ASN1_ITEM_ref(ASN1_BIT_STRING),

    ASN1_ITEM_ref(ASN1_BMPSTRING),

    ASN1_ITEM_ref(ASN1_BOOLEAN),

    ASN1_ITEM_ref(ASN1_ENUMERATED),

    ASN1_ITEM_ref(ASN1_FBOOLEAN),

    ASN1_ITEM_ref(ASN1_GENERALIZEDTIME),

    ASN1_ITEM_ref(ASN1_GENERALSTRING),

    ASN1_ITEM_ref(ASN1_IA5STRING),

    ASN1_ITEM_ref(ASN1_INTEGER),

    ASN1_ITEM_ref(ASN1_NULL),

    ASN1_ITEM_ref(ASN1_OBJECT),

    ASN1_ITEM_ref(ASN1_OCTET_STRING_NDEF),

    ASN1_ITEM_ref(ASN1_OCTET_STRING),

    ASN1_ITEM_ref(ASN1_PRINTABLESTRING),

    ASN1_ITEM_ref(ASN1_PRINTABLE),

    ASN1_ITEM_ref(ASN1_SEQUENCE_ANY),

    ASN1_ITEM_ref(ASN1_SEQUENCE),

    ASN1_ITEM_ref(ASN1_SET_ANY),

    ASN1_ITEM_ref(ASN1_T61STRING),

    ASN1_ITEM_ref(ASN1_TBOOLEAN),

    ASN1_ITEM_ref(ASN1_TIME),

    ASN1_ITEM_ref(ASN1_UNIVERSALSTRING),

    ASN1_ITEM_ref(ASN1_UTCTIME),

    ASN1_ITEM_ref(ASN1_UTF8STRING),

    ASN1_ITEM_ref(ASN1_VISIBLESTRING),

#ifndef OPENSSL_NO_RFC3779

    ASN1_ITEM_ref(ASRange),

#endif

    ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS),

    ASN1_ITEM_ref(AUTHORITY_KEYID),

    ASN1_ITEM_ref(BASIC_CONSTRAINTS),

    ASN1_ITEM_ref(BIGNUM),

    ASN1_ITEM_ref(CBIGNUM),

    ASN1_ITEM_ref(CERTIFICATEPOLICIES),

#ifndef OPENSSL_NO_CMS

    ASN1_ITEM_ref(CMS_ContentInfo),

    ASN1_ITEM_ref(CMS_ReceiptRequest),

#endif

    ASN1_ITEM_ref(CRL_DIST_POINTS),

#ifndef OPENSSL_NO_DH

    ASN1_ITEM_ref(DHparams),

#endif

    ASN1_ITEM_ref(DIRECTORYSTRING),

    ASN1_ITEM_ref(DISPLAYTEXT),

    ASN1_ITEM_ref(DIST_POINT_NAME),

    ASN1_ITEM_ref(DIST_POINT),

#ifndef OPENSSL_NO_EC

    ASN1_ITEM_ref(ECPARAMETERS),

    ASN1_ITEM_ref(ECPKPARAMETERS),

#endif

    ASN1_ITEM_ref(EDIPARTYNAME),

    ASN1_ITEM_ref(EXTENDED_KEY_USAGE),

    ASN1_ITEM_ref(GENERAL_NAMES),

    ASN1_ITEM_ref(GENERAL_NAME),

    ASN1_ITEM_ref(GENERAL_SUBTREE),

#ifndef OPENSSL_NO_RFC3779

    ASN1_ITEM_ref(IPAddressChoice),

    ASN1_ITEM_ref(IPAddressFamily),

    ASN1_ITEM_ref(IPAddressOrRange),

    ASN1_ITEM_ref(IPAddressRange),

#endif

    ASN1_ITEM_ref(ISSUING_DIST_POINT),

    ASN1_ITEM_ref(LONG),

    ASN1_ITEM_ref(NAME_CONSTRAINTS),

    ASN1_ITEM_ref(NETSCAPE_CERT_SEQUENCE),

    ASN1_ITEM_ref(NETSCAPE_SPKAC),

    ASN1_ITEM_ref(NETSCAPE_SPKI),

    ASN1_ITEM_ref(NOTICEREF),

#ifndef OPENSSL_NO_OCSP

    ASN1_ITEM_ref(OCSP_BASICRESP),

    ASN1_ITEM_ref(OCSP_CERTID),

    ASN1_ITEM_ref(OCSP_CERTSTATUS),

    ASN1_ITEM_ref(OCSP_CRLID),

    ASN1_ITEM_ref(OCSP_ONEREQ),

    ASN1_ITEM_ref(OCSP_REQINFO),

    ASN1_ITEM_ref(OCSP_REQUEST),

    ASN1_ITEM_ref(OCSP_RESPBYTES),

    ASN1_ITEM_ref(OCSP_RESPDATA),

    ASN1_ITEM_ref(OCSP_RESPID),

    ASN1_ITEM_ref(OCSP_RESPONSE),

    ASN1_ITEM_ref(OCSP_REVOKEDINFO),

    ASN1_ITEM_ref(OCSP_SERVICELOC),

    ASN1_ITEM_ref(OCSP_SIGNATURE),

    ASN1_ITEM_ref(OCSP_SINGLERESP),

#endif

    ASN1_ITEM_ref(OTHERNAME),

    ASN1_ITEM_ref(PBE2PARAM),

    ASN1_ITEM_ref(PBEPARAM),

    ASN1_ITEM_ref(PBKDF2PARAM),

    ASN1_ITEM_ref(PKCS12_AUTHSAFES),

    ASN1_ITEM_ref(PKCS12_BAGS),

    ASN1_ITEM_ref(PKCS12_MAC_DATA),

    ASN1_ITEM_ref(PKCS12_SAFEBAGS),

    ASN1_ITEM_ref(PKCS12_SAFEBAG),

    ASN1_ITEM_ref(PKCS12),

    ASN1_ITEM_ref(PKCS7_ATTR_SIGN),

    ASN1_ITEM_ref(PKCS7_ATTR_VERIFY),

    ASN1_ITEM_ref(PKCS7_DIGEST),

    ASN1_ITEM_ref(PKCS7_ENCRYPT),

    ASN1_ITEM_ref(PKCS7_ENC_CONTENT),

    ASN1_ITEM_ref(PKCS7_ENVELOPE),

    ASN1_ITEM_ref(PKCS7_ISSUER_AND_SERIAL),

    ASN1_ITEM_ref(PKCS7_RECIP_INFO),

    ASN1_ITEM_ref(PKCS7_SIGNED),

    ASN1_ITEM_ref(PKCS7_SIGNER_INFO),

    ASN1_ITEM_ref(PKCS7_SIGN_ENVELOPE),

    ASN1_ITEM_ref(PKCS7),

    ASN1_ITEM_ref(PKCS8_PRIV_KEY_INFO),

    ASN1_ITEM_ref(PKEY_USAGE_PERIOD),

    ASN1_ITEM_ref(POLICYINFO),

    ASN1_ITEM_ref(POLICYQUALINFO),

    ASN1_ITEM_ref(POLICY_CONSTRAINTS),

    ASN1_ITEM_ref(POLICY_MAPPINGS),

    ASN1_ITEM_ref(POLICY_MAPPING),

    ASN1_ITEM_ref(PROXY_CERT_INFO_EXTENSION),

    ASN1_ITEM_ref(PROXY_POLICY),

#ifndef OPENSSL_NO_RSA

    ASN1_ITEM_ref(RSAPrivateKey),

    ASN1_ITEM_ref(RSAPublicKey),

    ASN1_ITEM_ref(RSA_OAEP_PARAMS),

    ASN1_ITEM_ref(RSA_PSS_PARAMS),

#endif

    ASN1_ITEM_ref(SXNETID),

    ASN1_ITEM_ref(SXNET),

    ASN1_ITEM_ref(USERNOTICE),

    ASN1_ITEM_ref(X509_ALGORS),

    ASN1_ITEM_ref(X509_ALGOR),

    ASN1_ITEM_ref(X509_ATTRIBUTE),

    ASN1_ITEM_ref(X509_CERT_AUX),

    ASN1_ITEM_ref(X509_CINF),

    ASN1_ITEM_ref(X509_CRL_INFO),

    ASN1_ITEM_ref(X509_CRL),

    ASN1_ITEM_ref(X509_EXTENSIONS),

    ASN1_ITEM_ref(X509_EXTENSION),

    ASN1_ITEM_ref(X509_NAME_ENTRY),

    ASN1_ITEM_ref(X509_NAME),

    ASN1_ITEM_ref(X509_PUBKEY),

    ASN1_ITEM_ref(X509_REQ_INFO),

    ASN1_ITEM_ref(X509_REQ),

    ASN1_ITEM_ref(X509_REVOKED),

    ASN1_ITEM_ref(X509_SIG),

    ASN1_ITEM_ref(X509_VAL),

    ASN1_ITEM_ref(X509),

    ASN1_ITEM_ref(ZLONG),

};

crypto/asn1/build.info

+1 −1
Original line number Diff line number Diff line
@@ -13,4 +13,4 @@ SOURCE[../../libcrypto]=\ 
        x_pkey.c bio_asn1.c bio_ndef.c asn_mime.c \

        asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_strnid.c \

        evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p5_scrypt.c p8_pkey.c \

        asn_moid.c asn_mstbl.c
 
        asn_moid.c asn_mstbl.c asn1_item_list.c

doc/crypto/ASN1_ITEM_lookup.pod

0 → 100644
+39 −0
Original line number Diff line number Diff line 
=pod



=head1 NAME



ASN1_ITEM_lookup, ASN1_ITEM_get - lookup ASN.1 structures



=head1 SYNOPSIS



 #include <openssl/asn1.h>



 const ASN1_ITEM *ASN1_ITEM_lookup(const char *name);

 const ASN1_ITEM *ASN1_ITEM_get(size_t i);



=head1 DESCRIPTION



ASN1_ITEM_lookup() returns the B<ASN1_ITEM name>.



ASN1_ITEM_get() returns the B<ASN1_ITEM> with index B<i>. This function

returns B<NULL> if the index B<i> is out of range.



=head1 RETURN VALUES



ASN1_ITEM_lookup() and ASN1_ITEM_get() return a valid B<ASN1_ITEM> structure

or B<NULL> if an error occurred.



=head1 SEE ALSO



L<ERR_get_error(3)>



=head1 COPYRIGHT



Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.



Licensed under the OpenSSL license (the "License").  You may not use

this file except in compliance with the License.  You can obtain a copy

in the file LICENSE in the source distribution or at

L<https://www.openssl.org/source/license.html>.



=cut

include/openssl/asn1.h

+3 −0
Original line number Diff line number Diff line
@@ -870,6 +870,9 @@ ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it); 
int SMIME_crlf_copy(BIO *in, BIO *out, int flags);

int SMIME_text(BIO *in, BIO *out);



const ASN1_ITEM *ASN1_ITEM_lookup(const char *name);

const ASN1_ITEM *ASN1_ITEM_get(size_t i);



/* BEGIN ERROR CODES */

/*

 * The following lines are auto generated by the script mkerr.pl. Any changes