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

Add accessors for AdmissionSyntax 



Based on code from Matthias Ballreich, Steve Henson, and Wolf Tobias.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4724)
parent 2b1aa198

crypto/x509v3/v3_admis.c

+152 −0
Original line number Diff line number Diff line
@@ -202,3 +202,155 @@ static int i2r_ADMISSION_SYNTAX(const struct v3_ext_method *method, void *in, 
err:

    return -1;

}



const ASN1_OBJECT *NAMING_AUTHORITY_get0_authorityId(const NAMING_AUTHORITY *n)

{

    return n->namingAuthorityId;

}



void NAMING_AUTHORITY_set0_authorityId(NAMING_AUTHORITY *n, ASN1_OBJECT* id)

{

    ASN1_OBJECT_free(n->namingAuthorityId);

    n->namingAuthorityId = id;

}



const ASN1_IA5STRING *NAMING_AUTHORITY_get0_authorityURL(

    const NAMING_AUTHORITY *n)

{

    return n->namingAuthorityUrl;

}



void NAMING_AUTHORITY_set0_authorityURL(NAMING_AUTHORITY *n, ASN1_IA5STRING* u)

{

    ASN1_IA5STRING_free(n->namingAuthorityUrl);

    n->namingAuthorityUrl = u;

}



const ASN1_STRING *NAMING_AUTHORITY_get0_authorityText(

    const NAMING_AUTHORITY *n)

{

    return n->namingAuthorityText;

}



void NAMING_AUTHORITY_set0_authorityText(NAMING_AUTHORITY *n, ASN1_STRING* t)

{

    ASN1_IA5STRING_free(n->namingAuthorityText);

    n->namingAuthorityText = t;

}



const GENERAL_NAME *ADMISSION_SYNTAX_get0_admissionAuthority(const ADMISSION_SYNTAX *as)

{

    return as->admissionAuthority;

}



void ADMISSION_SYNTAX_set0_admissionAuthority(ADMISSION_SYNTAX *as,

                                              GENERAL_NAME *aa)

{

    GENERAL_NAME_free(as->admissionAuthority);

    as->admissionAuthority = aa;

}



const STACK_OF(ADMISSIONS) *ADMISSION_SYNTAX_get0_contentsOfAdmissions(const ADMISSION_SYNTAX *as)

{

    return as->contentsOfAdmissions;

}



void ADMISSION_SYNTAX_set0_contentsOfAdmissions(ADMISSION_SYNTAX *as,

                                                STACK_OF(ADMISSIONS) *a)

{

    sk_ADMISSIONS_pop_free(as->contentsOfAdmissions, ADMISSIONS_free);

    as->contentsOfAdmissions = a;

}



const GENERAL_NAME *ADMISSIONS_get0_admissionAuthority(const ADMISSIONS *a)

{

    return a->admissionAuthority;

}



void ADMISSIONS_set0_admissionAuthority(ADMISSIONS *a, GENERAL_NAME *aa)

{

    GENERAL_NAME_free(a->admissionAuthority);

    a->admissionAuthority = aa;

}



const NAMING_AUTHORITY *ADMISSIONS_get0_namingAuthority(const ADMISSIONS *a)

{

    return a->namingAuthority;

}



void ADMISSIONS_set0_namingAuthority(ADMISSIONS *a, NAMING_AUTHORITY *na)

{

    NAMING_AUTHORITY_free(a->namingAuthority);

    a->namingAuthority = na;

}



const PROFESSION_INFOS *ADMISSIONS_get0_professionInfos(const ADMISSIONS *a)

{

    return a->professionInfos;

}



void ADMISSIONS_set0_professionInfos(ADMISSIONS *a, PROFESSION_INFOS *pi)

{

    sk_PROFESSION_INFO_pop_free(a->professionInfos, PROFESSION_INFO_free);

    a->professionInfos = pi;

}



const ASN1_OCTET_STRING *PROFESSION_INFO_get0_addProfessionInfo(const PROFESSION_INFO *pi)

{

    return pi->addProfessionInfo;

}



void PROFESSION_INFO_set0_addProfessionInfo(PROFESSION_INFO *pi,

                                            ASN1_OCTET_STRING *aos)

{

    ASN1_OCTET_STRING_free(pi->addProfessionInfo);

    pi->addProfessionInfo = aos;

}



const NAMING_AUTHORITY *PROFESSION_INFO_get0_namingAuthority(const PROFESSION_INFO *pi)

{

    return pi->namingAuthority;

}



void PROFESSION_INFO_set0_namingAuthority(PROFESSION_INFO *pi,

                                          NAMING_AUTHORITY *na)

{

    NAMING_AUTHORITY_free(pi->namingAuthority);

    pi->namingAuthority = na;

}



const STACK_OF(ASN1_STRING) *PROFESSION_INFO_get0_professionItems(const PROFESSION_INFO *pi)

{

    return pi->professionItems;

}



void PROFESSION_INFO_set0_professionItems(PROFESSION_INFO *pi,

                                          STACK_OF(ASN1_STRING) *as)

{

    sk_ASN1_STRING_pop_free(pi->professionItems, ASN1_STRING_free);

    pi->professionItems = as;

}



const STACK_OF(ASN1_OBJECT) *PROFESSION_INFO_get0_professionOIDs(const PROFESSION_INFO *pi)

{

    return pi->professionOIDs;

}



void PROFESSION_INFO_set0_professionOIDs(PROFESSION_INFO *pi,

                                         STACK_OF(ASN1_OBJECT) *po)

{

    sk_ASN1_OBJECT_pop_free(pi->professionOIDs, ASN1_OBJECT_free);

    pi->professionOIDs = po;

}



const ASN1_PRINTABLESTRING *PROFESSION_INFO_get0_registrationNumber(const PROFESSION_INFO *pi)

{

    return pi->registrationNumber;

}



void PROFESSION_INFO_set0_registrationNumber(PROFESSION_INFO *pi,

                                             ASN1_PRINTABLESTRING *rn)

{

    ASN1_PRINTABLESTRING_free(pi->registrationNumber);

    pi->registrationNumber = rn;

}

crypto/x509v3/v3_admis.h

+8 −22
Original line number Diff line number Diff line
@@ -14,44 +14,30 @@ 
extern "C" {

#endif



typedef struct NamingAuthority_st {

struct NamingAuthority_st {

    ASN1_OBJECT* namingAuthorityId;

    ASN1_IA5STRING* namingAuthorityUrl;

    ASN1_STRING* namingAuthorityText;          /* i.e. DIRECTORYSTRING */

} NAMING_AUTHORITY;

};



typedef struct ProfessionInfo_st {

struct ProfessionInfo_st {

    NAMING_AUTHORITY* namingAuthority;

    STACK_OF(ASN1_STRING)* professionItems;    /* i.e. DIRECTORYSTRING */

    STACK_OF(ASN1_OBJECT)* professionOIDs;

    ASN1_PRINTABLESTRING* registrationNumber;

    ASN1_OCTET_STRING* addProfessionInfo;

} PROFESSION_INFO;

};



typedef struct Admissions_st {

struct Admissions_st {

    GENERAL_NAME* admissionAuthority;

    NAMING_AUTHORITY* namingAuthority;

    STACK_OF(PROFESSION_INFO)* professionInfos;

} ADMISSIONS;

};



typedef struct AdmissionSyntax_st {

struct AdmissionSyntax_st {

    GENERAL_NAME* admissionAuthority;

    STACK_OF(ADMISSIONS)* contentsOfAdmissions;

} ADMISSION_SYNTAX;



DECLARE_ASN1_ITEM(ADMISSIONS)

DECLARE_ASN1_ITEM(NAMING_AUTHORITY)

DECLARE_ASN1_ITEM(PROFESSION_INFO)

DECLARE_ASN1_ITEM(ADMISSION_SYNTAX)



DECLARE_ASN1_FUNCTIONS(NAMING_AUTHORITY)

DECLARE_ASN1_FUNCTIONS(PROFESSION_INFO)

DECLARE_ASN1_FUNCTIONS(ADMISSIONS)

DECLARE_ASN1_FUNCTIONS(ADMISSION_SYNTAX)



DEFINE_STACK_OF(ADMISSIONS)

DEFINE_STACK_OF(PROFESSION_INFO)

DEFINE_STACK_OF(ASN1_STRING)

};



#ifdef  __cplusplus

}

doc/man3/ADMISSIONS.pod

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



=head1 NAME



ADMISSIONS,

ADMISSIONS_get0_admissionAuthority,

ADMISSIONS_get0_namingAuthority,

ADMISSIONS_get0_professionInfos,

ADMISSIONS_set0_admissionAuthority,

ADMISSIONS_set0_namingAuthority,

ADMISSIONS_set0_professionInfos,

ADMISSION_SYNTAX,

ADMISSION_SYNTAX_get0_admissionAuthority,

ADMISSION_SYNTAX_get0_contentsOfAdmissions,

ADMISSION_SYNTAX_set0_admissionAuthority,

ADMISSION_SYNTAX_set0_contentsOfAdmissions,

NAMING_AUTHORITY,

NAMING_AUTHORITY_get0_authorityId,

NAMING_AUTHORITY_get0_authorityURL,

NAMING_AUTHORITY_get0_authorityText,

NAMING_AUTHORITY_set0_authorityId,

NAMING_AUTHORITY_set0_authorityURL,

NAMING_AUTHORITY_set0_authorityText,

PROFESSION_INFO,

PROFESSION_INFOS,

PROFESSION_INFO_get0_addProfessionInfo,

PROFESSION_INFO_get0_namingAuthority,

PROFESSION_INFO_get0_professionItems,

PROFESSION_INFO_get0_professionOIDs,

PROFESSION_INFO_get0_registrationNumber,

PROFESSION_INFO_set0_addProfessionInfo,

PROFESSION_INFO_set0_namingAuthority,

PROFESSION_INFO_set0_professionItems,

PROFESSION_INFO_set0_professionOIDs,

PROFESSION_INFO_set0_registrationNumber

- Accessors and settors for ADMISSION_SYNTAX



=head1 SYNOPSIS



 typedef struct NamingAuthority_st NAMING_AUTHORITY;

 typedef struct ProfessionInfo_st PROFESSION_INFO;

 typedef STACK_OF(PROFESSION_INFO) PROFESSION_INFOS;

 typedef struct Admissions_st ADMISSIONS;

 typedef struct AdmissionSyntax_st ADMISSION_SYNTAX;



 const ASN1_OBJECT *NAMING_AUTHORITY_get0_authorityId(

     const NAMING_AUTHORITY *n);

 void NAMING_AUTHORITY_set0_authorityId(NAMING_AUTHORITY *n,

     ASN1_OBJECT* namingAuthorityId);

 const ASN1_IA5STRING *NAMING_AUTHORITY_get0_authorityURL(

     const NAMING_AUTHORITY *n);

 void NAMING_AUTHORITY_set0_authorityURL(NAMING_AUTHORITY *n,

     ASN1_IA5STRING* namingAuthorityUrl);

 const ASN1_STRING *NAMING_AUTHORITY_get0_authorityText(

     const NAMING_AUTHORITY *n);

 void NAMING_AUTHORITY_set0_authorityText(NAMING_AUTHORITY *n,

     ASN1_STRING* namingAuthorityText);



 const GENERAL_NAME *ADMISSION_SYNTAX_get0_admissionAuthority(

     const ADMISSION_SYNTAX *as);

 void ADMISSION_SYNTAX_set0_admissionAuthority(

     ADMISSION_SYNTAX *as, GENERAL_NAME *aa);

 const STACK_OF(ADMISSIONS) *ADMISSION_SYNTAX_get0_contentsOfAdmissions(

     const ADMISSION_SYNTAX *as);

 void ADMISSION_SYNTAX_set0_contentsOfAdmissions(

     ADMISSION_SYNTAX *as, STACK_OF(ADMISSIONS) *a);



 const GENERAL_NAME *ADMISSIONS_get0_admissionAuthority(const ADMISSIONS *a);

 void ADMISSIONS_set0_admissionAuthority(ADMISSIONS *a, GENERAL_NAME *aa);

 const NAMING_AUTHORITY *ADMISSIONS_get0_namingAuthority(const ADMISSIONS *a);

 void ADMISSIONS_set0_namingAuthority(ADMISSIONS *a, NAMING_AUTHORITY *na);

 const PROFESSION_INFOS *ADMISSIONS_get0_professionInfos(const ADMISSIONS *a);

 void ADMISSIONS_set0_professionInfos(ADMISSIONS *a, PROFESSION_INFOS *pi);



 const ASN1_OCTET_STRING *PROFESSION_INFO_get0_addProfessionInfo(

     const PROFESSION_INFO *pi);

 void PROFESSION_INFO_set0_addProfessionInfo(

     PROFESSION_INFO *pi, ASN1_OCTET_STRING *aos);

 const NAMING_AUTHORITY *PROFESSION_INFO_get0_namingAuthority(

     const PROFESSION_INFO *pi);

 void PROFESSION_INFO_set0_namingAuthority(

     PROFESSION_INFO *pi, NAMING_AUTHORITY *na);

 const STACK_OF(ASN1_STRING) *PROFESSION_INFO_get0_professionItems(

     const PROFESSION_INFO *pi);

 void PROFESSION_INFO_set0_professionItems(

     PROFESSION_INFO *pi, STACK_OF(ASN1_STRING) *as);

 const STACK_OF(ASN1_OBJECT) *PROFESSION_INFO_get0_professionOIDs(

     const PROFESSION_INFO *pi);

 void PROFESSION_INFO_set0_professionOIDs(

     PROFESSION_INFO *pi, STACK_OF(ASN1_OBJECT) *po);

 const ASN1_PRINTABLESTRING *PROFESSION_INFO_get0_registrationNumber(

     const PROFESSION_INFO *pi);

 void PROFESSION_INFO_set0_registrationNumber(

     PROFESSION_INFO *pi, ASN1_PRINTABLESTRING *rn);



=head1 DESCRIPTION



The B<PROFESSION_INFOS>, B<ADMISSION_SYNTAX>, B<ADMISSIONS>, and

B<PROFESSION_INFO> types are opaque structures representing the

analogous types defined in the Common PKI Specification published

by L<https://www.t7ev.org>.

Knowledge of those strutures and their semantics is assumed.



The conventional routines to convert between DER and the local format

are desribed in L<d2i_X509(3)>.

The conventional routines to allocate and free the types are defined

in L<X509_dup(3)>.



The B<PROFESSION_INFOS> type is a stack of B<PROFESSION_INFO>; see

L<DEFINE_STACK_OF(3)> for details.



The B<NAMING_AUTHORITY> type has an authority ID and URL, and text fields.

The NAMING_AUTHORITY_get0_authorityId(),

NAMING_AUTHORITY_get0_get0_authorityURL(), and

NAMING_AUTHORITY_get0_get0_authorityText(), functions return pointers

to those values within the object.

The NAMING_AUTHORITY_set0_authorityId(),

NAMING_AUTHORITY_set0_get0_authorityURL(), and

NAMING_AUTHORITY_set0_get0_authorityText(),

functions free any existing value and set the pointer to the specified value.



The B<ADMISSION_SYNTAX> type has an authority name and a stack of

B<ADMISSION> objects.

The ADMISSION_SYNTAX_get0_admissionAuthority()

and ADMISSION_SYNTAX_get0_contentsOfAdmissions() functions return pointers

to those values within the object.

The

ADMISSION_SYNTAX_set0_admissionAuthority() and

ADMISSION_SYNTAX_set0_contentsOfAdmissions()

functions free any existing value and set the pointer to the specified value.



The B<ADMISSION> type has an authority name, authority object, and a

stack of B<PROFSSION_INFO> items.

The ADMISSIONS_get0_admissionAuthority(), ADMISSIONS_get0_namingAuthority(),

and ADMISSIONS_get0_professionInfos()

functions return pointers to those values within the object.

The

ADMISSIONS_set0_admissionAuthority(),

ADMISSIONS_set0_namingAuthority(), and

ADMISSIONS_set0_professionInfos()

functions free any existing value and set the pointer to the specified value.



The B<PROFESSION_INFO> type has a name authority, stacks of

profession Items and OIDs, a registration number, and additional

profession info.

The functions PROFESSION_INFO_get0_addProfessionInfo(),

PROFESSION_INFO_get0_namingAuthority(), PROFESSION_INFO_get0_professionItems(),

PROFESSION_INFO_get0_professionOIDs(), and

PROFESSION_INFO_get0_registrationNumber()

functions return pointers to those values within the object.

The

PROFESSION_INFO_set0_addProfessionInfo(),

PROFESSION_INFO_set0_namingAuthority(),

PROFESSION_INFO_set0_professionItems(),

PROFESSION_INFO_set0_professionOIDs(), and

PROFESSION_INFO_set0_registrationNumber()

functions free any existing value and set the pointer to the specified value.



=head1 RETURN VALUES



Described above.

Note that all of the I<get0> functions return a pointer to the internal data

structure and must not be freed.



=head1 SEE ALSO



L<X509_dup(3)>,

L<d2i_X509(3)>,



=head1 COPYRIGHT



Copyright 2017 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

doc/man3/X509_dup.pod

+10 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ IMPLEMENT_ASN1_FUNCTIONS, 
ASN1_ITEM,

ACCESS_DESCRIPTION_free,

ACCESS_DESCRIPTION_new,

ADMISSIONS_free,

ADMISSIONS_new,

ADMISSION_SYNTAX_free,

ADMISSION_SYNTAX_new,

ASIdOrRange_free,

ASIdOrRange_new,

ASIdentifierChoice_free,
@@ -75,6 +79,8 @@ ISSUING_DIST_POINT_free, 
ISSUING_DIST_POINT_new,

NAME_CONSTRAINTS_free,

NAME_CONSTRAINTS_new,

NAMING_AUTHORITY_free,

NAMING_AUTHORITY_new,

NETSCAPE_CERT_SEQUENCE_free,

NETSCAPE_CERT_SEQUENCE_new,

NETSCAPE_SPKAC_free,
@@ -160,6 +166,10 @@ POLICY_CONSTRAINTS_free, 
POLICY_CONSTRAINTS_new,

POLICY_MAPPING_free,

POLICY_MAPPING_new,

PROFESSION_INFO_free,

PROFESSION_INFO_new,

PROFESSION_INFOS_free,

PROFESSION_INFOS_new,

PROXY_CERT_INFO_EXTENSION_free,

PROXY_CERT_INFO_EXTENSION_new,

PROXY_POLICY_free,

doc/man3/d2i_X509.pod

+8 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
=head1 NAME



d2i_ACCESS_DESCRIPTION,

d2i_ADMISSIONS,

d2i_ADMISSION_SYNTAX,

d2i_ASIdOrRange,

d2i_ASIdentifierChoice,

d2i_ASIdentifiers,
@@ -71,6 +73,7 @@ d2i_IPAddressFamily, 
d2i_IPAddressOrRange,

d2i_IPAddressRange,

d2i_ISSUING_DIST_POINT,

d2i_NAMING_AUTHORITY,

d2i_NETSCAPE_CERT_SEQUENCE,

d2i_NETSCAPE_SPKAC,

d2i_NETSCAPE_SPKI,
@@ -120,6 +123,7 @@ d2i_PKCS8_fp, 
d2i_PKEY_USAGE_PERIOD,

d2i_POLICYINFO,

d2i_POLICYQUALINFO,

d2i_PROFESSION_INFO,

d2i_PROXY_CERT_INFO_EXTENSION,

d2i_PROXY_POLICY,

d2i_RSAPrivateKey,
@@ -175,6 +179,8 @@ d2i_X509_REVOKED, 
d2i_X509_SIG,

d2i_X509_VAL,

i2d_ACCESS_DESCRIPTION,

i2d_ADMISSIONS,

i2d_ADMISSION_SYNTAX,

i2d_ASIdOrRange,

i2d_ASIdentifierChoice,

i2d_ASIdentifiers,
@@ -243,6 +249,7 @@ i2d_IPAddressFamily, 
i2d_IPAddressOrRange,

i2d_IPAddressRange,

i2d_ISSUING_DIST_POINT,

i2d_NAMING_AUTHORITY,

i2d_NETSCAPE_CERT_SEQUENCE,

i2d_NETSCAPE_SPKAC,

i2d_NETSCAPE_SPKI,
@@ -295,6 +302,7 @@ i2d_PKCS8_fp, 
i2d_PKEY_USAGE_PERIOD,

i2d_POLICYINFO,

i2d_POLICYQUALINFO,

i2d_PROFESSION_INFO,

i2d_PROXY_CERT_INFO_EXTENSION,

i2d_PROXY_POLICY,

i2d_PublicKey,