Merge branch 'main' into grain128-aead-update

Author: gefeili

core/src/main/java/org/bouncycastle/internal/asn1/iana/IANAObjectIdentifiers.java

@@ -37,8 +37,8 @@ public interface IANAObjectIdentifiers
     /** IANA security nametypes;  1.3.6.1.5.6 */
     static final ASN1ObjectIdentifier    security_nametypes   = security.branch("6");
 
-    /** PKIX base OID:            1.3.6.1.5.6.6 */
-    static final ASN1ObjectIdentifier    pkix                 = security_mechanisms.branch("6");
+    /** PKIX base OID:            1.3.6.1.5.5.7 */
+    static final ASN1ObjectIdentifier    pkix                 = security_mechanisms.branch("7");
 
 
     /** IPSEC base OID:                        1.3.6.1.5.5.8 */

util/src/main/java/org/bouncycastle/asn1/iana/IANAObjectIdentifiers.java

@@ -37,9 +37,8 @@ public interface IANAObjectIdentifiers
     /** IANA security nametypes;  1.3.6.1.5.6 */
     static final ASN1ObjectIdentifier    security_nametypes   = security.branch("6");
 
-    /** PKIX base OID:            1.3.6.1.5.6.6 */
-    static final ASN1ObjectIdentifier    pkix                 = security_mechanisms.branch("6");
-
+    /** PKIX base OID:            1.3.6.1.5.5.7 */
+    static final ASN1ObjectIdentifier    pkix                 = security_mechanisms.branch("7");
 
     /** IPSEC base OID:                        1.3.6.1.5.5.8 */
     static final ASN1ObjectIdentifier    ipsec                = security_mechanisms.branch("8");