Merge pull request #7 from paragonie/sodium-compat-upgrade

Update sodium_compat dependency
paragonie · Apr 20, 2024 · c3933d6 · c3933d6
2 parents 53d6a1c + acddf3d
commit c3933d6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
         phpunit-versions: ['latest']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -34,11 +34,11 @@ jobs:
     strategy:
       matrix:
         operating-system: ['ubuntu-latest']
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3']
         phpunit-versions: ['latest']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
     "ext-gmp": "*",
     "defuse/php-encryption": "^2.1",
     "mdanter/ecc": "^1",
-    "paragonie/sodium_compat": "^1.16",
+    "paragonie/sodium_compat": "^1|^2",
     "paragonie/constant_time_encoding": "^2.1"
   },
   "require-dev": {

diff --git a/src/Curve25519/X25519.php b/src/Curve25519/X25519.php
@@ -43,7 +43,7 @@ public function __construct(PrivateKeyInterface $sk = null, PublicKeyInterface $
      */
     public function scalarMult(): string
     {
-        return \ParagonIE_Sodium_Compat::crypto_scalarmult(
+        return \sodium_crypto_scalarmult(
             $this->sk->getAsString(),
             $this->pk->getAsString()
         );