Add some checks and public method

Author: Trolldemorted

libsignal-protocol-dotnet/InvalidMacException.cs

@@ -1,4 +1,4 @@
-/** 
+/** 
  * Copyright (C) 2016 smndtrl, langboost
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 
 namespace TextSecure.libsignal
 {
-    class InvalidMacException : Exception
+    public class InvalidMacException : Exception
     {
 
         public InvalidMacException(String detailMessage)

libsignal-protocol-dotnet/SessionCipher.cs

@@ -1,20 +1,3 @@
-/** 
- * Copyright (C) 2016 smndtrl, langboost
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 using libsignal.ecc;
 using libsignal.exceptions;
 using libsignal.protocol;
@@ -40,7 +23,7 @@ namespace libsignal
     public class SessionCipher
     {
 
-        public static readonly Object SESSION_LOCK = new Object();
+        public static readonly object SESSION_LOCK = new object();
 
         private readonly SessionStore sessionStore;
         private readonly IdentityKeyStore identityKeyStore;

libsignal-protocol-dotnet/ecc/Curve.cs

@@ -1,4 +1,4 @@
-/** 
+/** 
  * Copyright (C) 2017 smndtrl, langboost, golf1052
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -36,7 +36,7 @@ public static ECKeyPair generateKeyPair()
 
         public static ECPublicKey decodePoint(byte[] bytes, int offset)
         {
-            if (bytes.Length - offset < 1)
+            if (bytes == null || bytes.Length - offset < 1)
             {
                 throw new InvalidKeyException("No key type identifier");
             }
@@ -65,6 +65,16 @@ public static ECPrivateKey decodePrivatePoint(byte[] bytes)
 
         public static byte[] calculateAgreement(ECPublicKey publicKey, ECPrivateKey privateKey)
         {
+            if (publicKey == null)
+            {
+                throw new InvalidKeyException("public value is null");
+            }
+
+            if (privateKey == null)
+            {
+                throw new InvalidKeyException("private value is null");
+            }
+
             if (publicKey.getType() != privateKey.getType())
             {
                 throw new InvalidKeyException("Public and private keys must be of the same type!");
@@ -84,6 +94,11 @@ public static byte[] calculateAgreement(ECPublicKey publicKey, ECPrivateKey priv
 
         public static bool verifySignature(ECPublicKey signingKey, byte[] message, byte[] signature)
         {
+            if (signingKey == null || message == null || signature == null)
+            {
+                throw new InvalidKeyException("Values must not be null");
+            }
+
             if (signingKey.getType() == DJB_TYPE)
             {
                 return Curve25519.getInstance(Curve25519ProviderType.BEST)
@@ -97,6 +112,11 @@ public static bool verifySignature(ECPublicKey signingKey, byte[] message, byte[
 
         public static byte[] calculateSignature(ECPrivateKey signingKey, byte[] message)
         {
+            if (signingKey == null || message == null)
+            {
+                throw new InvalidKeyException("Values must not be null");
+            }
+
             if (signingKey.getType() == DJB_TYPE)
             {
                 return Curve25519.getInstance(Curve25519ProviderType.BEST)
@@ -110,6 +130,11 @@ public static byte[] calculateSignature(ECPrivateKey signingKey, byte[] message)
 
         public static byte[] calculateVrfSignature(ECPrivateKey signingKey, byte[] message)
         {
+            if (signingKey == null || message == null)
+            {
+                throw new InvalidKeyException("Values must not be null");
+            }
+
             if (signingKey.getType() == DJB_TYPE)
             {
                 return Curve25519.getInstance(Curve25519ProviderType.BEST)
@@ -123,6 +148,11 @@ public static byte[] calculateVrfSignature(ECPrivateKey signingKey, byte[] messa
 
         public static byte[] verifyVrfSignature(ECPublicKey signingKey, byte[] message, byte[] signature)
         {
+            if (signingKey == null || message == null || signature == null)
+            {
+                throw new InvalidKeyException("Values must not be null");
+            }
+
             if (signingKey.getType() == DJB_TYPE)
             {
                 return Curve25519.getInstance(Curve25519ProviderType.BEST)

libsignal-protocol-dotnet/state/IdentityKeyStore.cs

@@ -1,4 +1,4 @@
-/** 
+/** 
  * Copyright (C) 2016 smndtrl, langboost
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -82,5 +82,12 @@ public interface IdentityKeyStore
          */
         bool IsTrustedIdentity(SignalProtocolAddress address, IdentityKey identityKey, Direction direction);
 
+        /// <summary>
+        /// Return the saved public identity key for a remote client
+        /// </summary>
+        /// <param name="address">The address of the remote client</param>
+        /// <returns>The public identity key, or null if absent</returns>
+        IdentityKey GetIdentity(SignalProtocolAddress address);
+
     }
 }

libsignal-protocol-dotnet/state/impl/InMemoryIdentityKeyStore.cs

@@ -1,4 +1,4 @@
-/** 
+/** 
  * Copyright (C) 2016 smndtrl, langboost
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -73,5 +73,11 @@ public bool IsTrustedIdentity(SignalProtocolAddress address, IdentityKey identit
             trustedKeys.TryGetValue(address, out trusted); // get(name)
             return (trusted == null || trusted.Equals(identityKey));
         }
+
+        public IdentityKey GetIdentity(SignalProtocolAddress address)
+        {
+            trustedKeys.TryGetValue(address, out var identity);
+            return identity;
+        }
     }
 }

libsignal-protocol-dotnet/state/impl/InMemorySignalProtocolStore.cs

@@ -1,4 +1,4 @@
-/** 
+/** 
  * Copyright (C) 2016 smndtrl, langboost
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -147,5 +147,10 @@ public void RemoveSignedPreKey(uint signedPreKeyId)
         {
             signedPreKeyStore.RemoveSignedPreKey(signedPreKeyId);
         }
+
+        public IdentityKey GetIdentity(SignalProtocolAddress address)
+        {
+            return identityKeyStore.GetIdentity(address);
+        }
     }
 }