resolve conflicts

1 files changed, 17 insertions, 3 deletions

diff --git a/src/lib/libcrypto/objects/objects.txt b/src/lib/libcrypto/objects/objects.txt
index 50e9031e61..2635c4e667 100644
--- a/src/lib/libcrypto/objects/objects.txt
+++ b/src/lib/libcrypto/objects/objects.txt
@@ -63,6 +63,11 @@ pkcs1 2			: RSA-MD2		: md2WithRSAEncryption
 pkcs1 3                 : RSA-MD4               : md4WithRSAEncryption
 pkcs1 4                 : RSA-MD5               : md5WithRSAEncryption
 pkcs1 5                 : RSA-SHA1              : sha1WithRSAEncryption
+# According to PKCS #1 version 2.1
+pkcs1 11                : RSA-SHA256            : sha256WithRSAEncryption
+pkcs1 12                : RSA-SHA384            : sha384WithRSAEncryption
+pkcs1 13                : RSA-SHA512            : sha512WithRSAEncryption
+pkcs1 14                : RSA-SHA224            : sha224WithRSAEncryption
 
 pkcs 3                  : pkcs3
 pkcs3 1                 :                       : dhKeyAgreement
@@ -341,9 +346,9 @@ id-pe 3			: qcStatements
 id-pe 4                 : ac-auditEntity
 id-pe 5                 : ac-targeting
 id-pe 6                 : aaControls
-id-pe 7                 : sbqp-ipAddrBlock
-id-pe 8                 : sbqp-autonomousSysNum
-id-pe 9                 : sbqp-routerIdentifier
+id-pe 7                 : sbgp-ipAddrBlock
+id-pe 8                 : sbgp-autonomousSysNum
+id-pe 9                 : sbgp-routerIdentifier
 id-pe 10                : ac-proxying
 !Cname sinfo-access
 id-pe 11                : subjectInfoAccess     : Subject Information Access
@@ -584,6 +589,8 @@ id-ce 21		: CRLReason		: X509v3 CRL Reason Code
 id-ce 24                : invalidityDate        : Invalidity Date
 !Cname delta-crl
 id-ce 27                : deltaCRL              : X509v3 Delta CRL Indicator
+!Cname name-constraints
+id-ce 30                : nameConstraints       : X509v3 Name Constraints
 !Cname crl-distribution-points
 id-ce 31                : crlDistributionPoints : X509v3 CRL Distribution Points
 !Cname certificate-policies
@@ -703,6 +710,13 @@ aes 44			: AES-256-CFB		: aes-256-cfb
                         : DES-EDE3-CFB1         : des-ede3-cfb1
                         : DES-EDE3-CFB8         : des-ede3-cfb8
 
+# OIDs for SHA224, SHA256, SHA385 and SHA512, according to x9.84.
+!Alias nist_hashalgs nistAlgorithms 2
+nist_hashalgs 1         : SHA256                : sha256
+nist_hashalgs 2         : SHA384                : sha384
+nist_hashalgs 3         : SHA512                : sha512
+nist_hashalgs 4         : SHA224                : sha224
+
 # Hold instruction CRL entry extension
 !Cname hold-instruction-code
 id-ce 23                : holdInstructionCode   : Hold Instruction Code