fixed last bits of build

BasisVR · Mar 1, 2025 · 677fc0c · 677fc0c
1 parent 4946ebf
commit 677fc0c
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 9 deletions.
diff --git a/Contrib/Auth/Did/Did.asmdef b/Contrib/Auth/Did/Did.asmdef
@@ -1,7 +1,9 @@
 {
     "name": "Basis.Contrib.Auth.DecentralizedIds",
     "rootNamespace": "",
-    "references": [],
+    "references": [
+        "GUID:b02b12758fb9942cda32715ba18e00b0"
+    ],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
@@ -15,4 +17,4 @@
     "defineConstraints": [],
     "versionDefines": [],
     "noEngineReferences": true
-}
+}
diff --git a/Contrib/Auth/Did/DidKeyResolver.cs b/Contrib/Auth/Did/DidKeyResolver.cs
@@ -8,7 +8,7 @@
 using Debug = System.Diagnostics.Debug;
 using Did = Basis.Contrib.Auth.DecentralizedIds.Newtypes.Did;
 using DidUrlFragment = Basis.Contrib.Auth.DecentralizedIds.Newtypes.DidUrlFragment;
-using Ed25519 = Org.BouncyCastle.Math.EC.Rfc8032.Ed25519;
+using Ed25519 = Basis.Contrib.Crypto.Ed25519;
 using StringSplitOptions = System.StringSplitOptions;
 
 namespace Basis.Contrib.Auth.DecentralizedIds
@@ -69,7 +69,7 @@ out int prefixLen
 				);
 			}
 			var pubkeyBytes = multicodecPrefixed[prefixLen..];
-			if (pubkeyBytes.Length != Ed25519.PublicKeySize)
+			if (pubkeyBytes.Length != Ed25519.PubkeySize)
 			{
 				throw new DidKeyDecodeException(DidKeyDecodeError.WrongPubkeyLen);
 			}
@@ -86,7 +86,7 @@ out int prefixLen
 		/// See
 		private static JsonWebKey CreateEd25519Jwk(byte[] pubkeyBytes)
 		{
-			Debug.Assert(pubkeyBytes.Length == Ed25519.PublicKeySize);
+			Debug.Assert(pubkeyBytes.Length == Ed25519.PubkeySize);
 			var key = new JsonWebKey
 			{
 				Kty = "OKP",

diff --git a/Contrib/Auth/Did/Result.cs.meta b/Contrib/Auth/Did/Result.cs.meta
diff --git a/Contrib/Crypto/Crypto.asmdef b/Contrib/Crypto/Crypto.asmdef
@@ -7,10 +7,10 @@
     "allowUnsafeCode": false,
     "overrideReferences": true,
     "precompiledReferences": [
-        "BouncyCastle.Cryptography.dll",
+        "BouncyCastle.Cryptography.dll"
     ],
     "autoReferenced": true,
     "defineConstraints": [],
     "versionDefines": [],
     "noEngineReferences": true
-}
+}
diff --git a/Contrib/Crypto/Crypto.asmdef.meta b/Contrib/Crypto/Crypto.asmdef.meta
diff --git a/Contrib/Crypto/Crypto.cs.meta b/Contrib/Crypto/Crypto.cs.meta
diff --git a/Contrib/Crypto/Crypto.csproj.meta b/Contrib/Crypto/Crypto.csproj.meta
diff --git a/Contrib/Crypto/Ed25519.cs b/Contrib/Crypto/Ed25519.cs
@@ -2,12 +2,16 @@
 
 using Org.BouncyCastle.Crypto.Parameters;
 using Ed25519Signer = Org.BouncyCastle.Crypto.Signers.Ed25519Signer;
+using Rfc8032 = Org.BouncyCastle.Math.EC.Rfc8032;
 
 namespace Basis.Contrib.Crypto
 {
 	/// Ed25519 elliptic-curve signature algorithm.
-	public class Ed25519
+	public sealed class Ed25519
 	{
+		public static readonly int PubkeySize = Rfc8032.Ed25519.PublicKeySize;
+		public static readonly int PrivkeySize = Rfc8032.Ed25519.SecretKeySize;
+
 		public static bool VerifySignature(
 			Pubkey pubkey,
 			Signature sig,

diff --git a/Contrib/Crypto/Ed25519.cs.meta b/Contrib/Crypto/Ed25519.cs.meta
diff --git a/Contrib/Crypto/IsExternalInit.cs.meta b/Contrib/Crypto/IsExternalInit.cs.meta
diff --git a/Contrib/Crypto/package.json b/Contrib/Crypto/package.json
@@ -7,6 +7,6 @@
   "publishConfig": { "registry": "https://npm.pkg.github.com/@BasisVR" },
   "repository":"https://github.com/BasisVR/Basis",
   "dependencies": {
-    "org.basisvr.bouncycastle": "2.5.0",
+    "org.basisvr.bouncycastle": "2.5.0"
   }
 }
diff --git a/Contrib/Crypto/package.json.meta b/Contrib/Crypto/package.json.meta
diff --git a/Directory.build.props b/Directory.build.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <DisableTransitiveProjectReferences>true</DisableTransitiveProjectReferences>
+  </PropertyGroup>
+</Project>