Commit e92947d8 authored by Marek Klein's avatar Marek Klein Committed by Rich Salz
Browse files

fixing incorrect OID of signingCertificateV2 


Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3538)
parent 3bbecb0e

crypto/objects/obj_dat.h

+2 −2
Original line number Diff line number Diff line
@@ -976,7 +976,7 @@ static const unsigned char so[6911] = { 
    0x2A,0x83,0x1A,0x8C,0x9A,0x6E,0x01,0x01,0x0D,  /* [ 6872] OBJ_aria_256_cfb128 */

    0x2A,0x83,0x1A,0x8C,0x9A,0x6E,0x01,0x01,0x0E,  /* [ 6881] OBJ_aria_256_ofb128 */

    0x2A,0x83,0x1A,0x8C,0x9A,0x6E,0x01,0x01,0x0F,  /* [ 6890] OBJ_aria_256_ctr */

    0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1E,  /* [ 6899] OBJ_id_smime_aa_signingCertificateV2 */

    0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x2F,  /* [ 6899] OBJ_id_smime_aa_signingCertificateV2 */

};



#define NUM_NID 1087
@@ -5177,7 +5177,7 @@ static const unsigned int obj_objs[NUM_OBJ] = { 
     238,    /* OBJ_id_smime_aa_ets_archiveTimeStamp 1 2 840 113549 1 9 16 2 27 */

     239,    /* OBJ_id_smime_aa_signatureType    1 2 840 113549 1 9 16 2 28 */

     240,    /* OBJ_id_smime_aa_dvcs_dvc         1 2 840 113549 1 9 16 2 29 */

    1086,    /* OBJ_id_smime_aa_signingCertificateV2 1 2 840 113549 1 9 16 2 30 */

    1086,    /* OBJ_id_smime_aa_signingCertificateV2 1 2 840 113549 1 9 16 2 47 */

     241,    /* OBJ_id_smime_alg_ESDHwith3DES    1 2 840 113549 1 9 16 3 1 */

     242,    /* OBJ_id_smime_alg_ESDHwithRC2     1 2 840 113549 1 9 16 3 2 */

     243,    /* OBJ_id_smime_alg_3DESwrap        1 2 840 113549 1 9 16 3 3 */

crypto/objects/objects.txt

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ id-smime-aa 26 : id-smime-aa-ets-certCRLTimestamp 
id-smime-aa 27		: id-smime-aa-ets-archiveTimeStamp

id-smime-aa 28		: id-smime-aa-signatureType

id-smime-aa 29		: id-smime-aa-dvcs-dvc

id-smime-aa 30		: id-smime-aa-signingCertificateV2

id-smime-aa 47		: id-smime-aa-signingCertificateV2



# S/MIME Algorithm Identifiers

# obsolete

include/openssl/obj_mac.h

+1 −1
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ 


#define SN_id_smime_aa_signingCertificateV2             "id-smime-aa-signingCertificateV2"

#define NID_id_smime_aa_signingCertificateV2            1086

#define OBJ_id_smime_aa_signingCertificateV2            OBJ_id_smime_aa,30L

#define OBJ_id_smime_aa_signingCertificateV2            OBJ_id_smime_aa,47L



#define SN_id_smime_alg_ESDHwith3DES            "id-smime-alg-ESDHwith3DES"

#define NID_id_smime_alg_ESDHwith3DES           241