mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: alias auditEntity OID

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24754)
This commit is contained in:
Jonathan M. Wilbur 2024-08-01 17:45:54 +00:00 committed by Matt Caswell
parent dbd3d65d7c
commit 91432b9ea0
7 changed files with 972 additions and 971 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1919
crypto/objects/obj_dat.h
View File

File diff suppressed because it is too large Load Diff

4
crypto/objects/obj_mac.num
View File

@ -284,7 +284,7 @@ id_mod_dvcs 283
id_mod_cmp2000 284
biometricInfo 285
qcStatements 286
ac_auditEntity 287
ac_auditIdentity 287
ac_targeting 288
aaControls 289
sbgp_ipAddrBlock 290
@ -1320,4 +1320,4 @@ associated_information 1319
id_ct_rpkiSignedPrefixList 1320
id_on_hardwareModuleName 1321
id_kp_wisun_fan_device 1322
ac_auditIdentity 1323
ac_auditEntity 1323

3
crypto/objects/objects.txt
View File

@ -519,7 +519,8 @@ id-pkix-mod 100 : id-mod-cmp2021-02
id-pe 1 : authorityInfoAccess : Authority Information Access
id-pe 2 : biometricInfo : Biometric Info
id-pe 3 : qcStatements
id-pe 4 : ac-auditEntity : X509v3 Audit Identity
id-pe 4 : ac-auditIdentity : X509v3 Audit Identity
!Alias ac-auditEntity ac-auditIdentity
id-pe 5 : ac-targeting
id-pe 6 : aaControls
id-pe 7 : sbgp-ipAddrBlock

2
crypto/x509/standard_exts.h
View File

@ -39,6 +39,7 @@ static const X509V3_EXT_METHOD *standard_exts[] = {
#endif
&ossl_v3_sxnet,
&ossl_v3_info,
&ossl_v3_audit_identity,
#ifndef OPENSSL_NO_RFC3779
&ossl_v3_addr,
&ossl_v3_asid,
@ -87,7 +88,6 @@ static const X509V3_EXT_METHOD *standard_exts[] = {
&ossl_v3_group_ac,
&ossl_v3_holder_name_constraints,
&ossl_v3_associated_info,
&ossl_v3_audit_identity,
};
/* Number of standard extensions */

3
fuzz/oids.txt
View File

@ -264,7 +264,7 @@ OBJ_id_mod_dvcs="\x2B\x06\x01\x05\x05\x07\x00\x0F"
OBJ_id_mod_cmp2000="\x2B\x06\x01\x05\x05\x07\x00\x10"
OBJ_biometricInfo="\x2B\x06\x01\x05\x05\x07\x01\x02"
OBJ_qcStatements="\x2B\x06\x01\x05\x05\x07\x01\x03"
OBJ_ac_auditEntity="\x2B\x06\x01\x05\x05\x07\x01\x04"
OBJ_ac_auditIdentity="\x2B\x06\x01\x05\x05\x07\x01\x04"
OBJ_ac_targeting="\x2B\x06\x01\x05\x05\x07\x01\x05"
OBJ_aaControls="\x2B\x06\x01\x05\x05\x07\x01\x06"
OBJ_sbgp_ipAddrBlock="\x2B\x06\x01\x05\x05\x07\x01\x07"
@ -1181,4 +1181,3 @@ OBJ_associated_information="\x55\x1D\x4B"
OBJ_id_ct_rpkiSignedPrefixList="\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x01\x33"
OBJ_id_on_hardwareModuleName="\x2B\x06\x01\x05\x05\x07\x08\x04"
OBJ_id_kp_wisun_fan_device="\x2B\x06\x01\x04\x01\x82\xE4\x25\x01"
OBJ_ac_auditIdentity="\x2B\x06\x01\x05\x05\x07\x01\x04"

5
include/openssl/obj_mac.h
View File

@ -1585,9 +1585,12 @@
#define SN_ac_auditIdentity "ac-auditIdentity"
#define LN_ac_auditIdentity "X509v3 Audit Identity"
#define NID_ac_auditIdentity 1323
#define NID_ac_auditIdentity 287
#define OBJ_ac_auditIdentity OBJ_id_pe,4L
#define NID_ac_auditEntity 1323
#define OBJ_ac_auditEntity OBJ_ac_auditIdentity
#define SN_ac_targeting "ac-targeting"
#define NID_ac_targeting 288
#define OBJ_ac_targeting OBJ_id_pe,5L

7
include/openssl/objects.h
View File

@ -176,12 +176,7 @@ int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid);
int OBJ_add_sigid(int signid, int dig_id, int pkey_id);
void OBJ_sigid_free(void);
/* This is to correct for the auditIdentity OID having been assigned the wrong
name. */
#define SN_ac_auditIdentity "ac-auditIdentity"
#define LN_ac_auditIdentity LN_ac_auditEntity
#define NID_ac_auditIdentity NID_ac_auditEntity
#define OBJ_ac_auditIdentity OBJ_ac_auditEntity
#define SN_ac_auditEntity SN_ac_auditIdentity
# ifdef __cplusplus
}