Merge pull request #145 from paragonie/fix-autoload

Guarantee Curve25519 is loaded from Ed25519
paragonie · Mar 30, 2022 · 2ccc078 · 2ccc078
2 parents ac99405 + 67e9432
commit 2ccc078
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/Core/Ed25519.php b/src/Core/Ed25519.php
@@ -3,6 +3,9 @@
 if (class_exists('ParagonIE_Sodium_Core_Ed25519', false)) {
     return;
 }
+if (!class_exists('ParagonIE_Sodium_Core_Curve25519')) {
+    require_once dirname(__FILE__) . '/Curve25519.php';
+}
 
 /**
  * Class ParagonIE_Sodium_Core_Ed25519

diff --git a/src/Core32/Ed25519.php b/src/Core32/Ed25519.php
@@ -3,6 +3,9 @@
 if (class_exists('ParagonIE_Sodium_Core32_Ed25519', false)) {
     return;
 }
+if (!class_exists('ParagonIE_Sodium_Core32_Curve25519')) {
+    require_once dirname(__FILE__) . '/Curve25519.php';
+}
 
 /**
  * Class ParagonIE_Sodium_Core32_Ed25519