summary refs log tree commit diff
path: root/crypto/src/asn1
diff options
context:
space:
mode:
authorPeter Dettman <peter.dettman@bouncycastle.org>2020-07-30 15:33:18 +0700
committerPeter Dettman <peter.dettman@bouncycastle.org>2020-07-30 15:33:18 +0700
commit5e0b449eae68f6adf1f988f9601a299f3aa6c468 (patch)
treecc622c2de05cd5bd27f1044b6bb614c520d2cd7e /crypto/src/asn1
parentEdDSA updates (diff)
downloadBouncyCastle.NET-ed25519-5e0b449eae68f6adf1f988f9601a299f3aa6c468.tar.xz
Misc. updates from bc-java
Diffstat (limited to 'crypto/src/asn1')
-rw-r--r--crypto/src/asn1/cmp/PKIHeaderBuilder.cs4
-rw-r--r--crypto/src/asn1/misc/MiscObjectIdentifiers.cs4
2 files changed, 6 insertions, 2 deletions
diff --git a/crypto/src/asn1/cmp/PKIHeaderBuilder.cs b/crypto/src/asn1/cmp/PKIHeaderBuilder.cs
index 00073c062..d771dda4c 100644
--- a/crypto/src/asn1/cmp/PKIHeaderBuilder.cs
+++ b/crypto/src/asn1/cmp/PKIHeaderBuilder.cs
@@ -64,8 +64,8 @@ namespace Org.BouncyCastle.Asn1.Cmp
 		{
             return SetRecipKID(kid == null ? null : new DerOctetString(kid));
 		}
-		
-		public virtual PkiHeaderBuilder SetRecipKID(DerOctetString kid)
+
+		public virtual PkiHeaderBuilder SetRecipKID(Asn1OctetString kid)
 		{
 			recipKID = kid;
 			return this;
diff --git a/crypto/src/asn1/misc/MiscObjectIdentifiers.cs b/crypto/src/asn1/misc/MiscObjectIdentifiers.cs
index 9a817f5c3..1f101882f 100644
--- a/crypto/src/asn1/misc/MiscObjectIdentifiers.cs
+++ b/crypto/src/asn1/misc/MiscObjectIdentifiers.cs
@@ -52,6 +52,10 @@ namespace Org.BouncyCastle.Asn1.Misc
 
         public static readonly DerObjectIdentifier cast5CBC = new DerObjectIdentifier(Entrust+ ".66.10");
 
+        //
+        // HMAC-SHA1       hMAC-SHA1 OBJECT IDENTIFIER ::= { iso(1) identified-organization(3)
+        //       dod(6) internet(1) security(5) mechanisms(5) 8 1 2 }
+        //
         public static readonly DerObjectIdentifier HMAC_SHA1 = new DerObjectIdentifier("1.3.6.1.5.5.8.1.2");
 
         //