summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/ci.yaml4
-rw-r--r--.gitignore1
-rw-r--r--.gitleaks.toml13
-rw-r--r--README.md17
-rw-r--r--composer.json13
-rw-r--r--package.xml31
-rw-r--r--php_xpass.h2
7 files changed, 66 insertions, 15 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 502f8fe..a18dd09 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -11,7 +11,7 @@ jobs:
matrix:
distro: ['rockylinux']
el: [9]
- php: [0, '8.1', '8.2', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']
+ php: [0, '8.1', '8.2', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']
container:
image: ${{ matrix.distro }}:${{ matrix.el }}
steps:
@@ -42,7 +42,7 @@ jobs:
strategy:
matrix:
fedora: [39, 40, 41]
- php: [0, 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']
+ php: [0, 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']
container:
image: fedora:${{ matrix.fedora }}
steps:
diff --git a/.gitignore b/.gitignore
index d7cc116..f798fd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,4 +42,5 @@ tests/**/*.sh
tests/**/*.db
tests/**/*.mem
tmp-php.ini
+sendpackagist
xpass-*.tgz
diff --git a/.gitleaks.toml b/.gitleaks.toml
new file mode 100644
index 0000000..dbc852b
--- /dev/null
+++ b/.gitleaks.toml
@@ -0,0 +1,13 @@
+[allowlist]
+ description = "Global Allowlist"
+
+ # Ignore based on any subset of the file path
+ paths = [
+ # Ignore documentation
+ '''README.md''',
+
+ # Ignore tests
+ '''tests\/.*\.phpt''',
+ ]
+
+
diff --git a/README.md b/README.md
index 6b2ecb5..32be2bd 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,9 @@ Notices: these can be fast, don't expect improved security level.
It also provides additional functions from libxcrypt missing in core PHP:
-* crypt_preferred_method: get the prefix of the preferred hash method
-* crypt_gensalt: encode settings for passphrase hashing
-* crypt_checksalt: validate a crypt setting string
+* `crypt_preferred_method`: get the prefix of the preferred hash method
+* `crypt_gensalt`: encode settings for passphrase hashing
+* `crypt_checksalt`: validate a crypt setting string
See the Linux man pages.
@@ -35,7 +35,7 @@ See the Linux man pages.
Compatible with PHP 8.0 or greater.
-You need the Extended crypt library development files (libxcrypt-devel)
+You need the Extended crypt library development files (libxcrypt-devel, libcrypt-dev)
version 4.4 or greater.
From the sources tree
@@ -45,6 +45,15 @@ From the sources tree
$ make
$ make test
+From https://pecl.php.net/ using pecl command
+
+ $ pecl install xpass
+
+From https://packagist.org/ using PHP Installer for Extensions
+
+ $ pie install remi/xpass
+
+
# Usage
## password hashing and verifying
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..9e7fd3c
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,13 @@
+{
+ "name": "remi/xpass",
+ "type": "php-ext",
+ "license": "PHP-3.01",
+ "description": "Extended password extension",
+ "require": {
+ "php": ">= 8.0.0"
+ },
+ "php-ext": {
+ "extension-name": "xpass",
+ "configure-options": []
+ }
+}
diff --git a/package.xml b/package.xml
index f00ea28..1a90f12 100644
--- a/package.xml
+++ b/package.xml
@@ -22,21 +22,18 @@ It also provides additional functions from libxcrypt missing in core PHP:
<email>remi@php.net</email>
<active>yes</active>
</lead>
- <date>2024-09-13</date>
+ <date>2024-09-26</date>
<version>
- <release>1.1.0RC1</release>
+ <release>1.1.1dev</release>
<api>1.1.0</api>
</version>
<stability>
- <release>beta</release>
- <api>beta</api>
+ <release>stable</release>
+ <api>stable</api>
</stability>
<license uri="https://www.php.net/license/3_01.txt" filesource="LICENSE">PHP-3.01</license>
<notes><![CDATA[
-- add crypt_gensalt(?string $prefix = null, int $count = 0): ?string {}
-- add crypt_preferred_method(): ?string {}
-- add crypt_checksalt(string $salt): int {}
-- add CRYPT_PREFIX_* and CRYPT_SALT_* constants
+-
]]></notes>
<contents>
<dir name="/">
@@ -76,6 +73,24 @@ It also provides additional functions from libxcrypt missing in core PHP:
<extsrcrelease/>
<changelog>
<release>
+ <date>2024-09-26</date>
+ <version>
+ <release>1.1.0</release>
+ <api>1.1.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="https://www.php.net/license/3_01.txt" filesource="LICENSE">PHP-3.01</license>
+ <notes><![CDATA[
+- add crypt_gensalt(?string $prefix = null, int $count = 0): ?string {}
+- add crypt_preferred_method(): ?string {}
+- add crypt_checksalt(string $salt): int {}
+- add CRYPT_PREFIX_* and CRYPT_SALT_* constants
+ ]]></notes>
+ </release>
+ <release>
<date>2024-09-09</date>
<version>
<release>1.0.0</release>
diff --git a/php_xpass.h b/php_xpass.h
index 56da634..0d10ff2 100644
--- a/php_xpass.h
+++ b/php_xpass.h
@@ -22,7 +22,7 @@
extern zend_module_entry xpass_module_entry;
#define phpext_xpass_ptr &xpass_module_entry
-#define PHP_XPASS_VERSION "1.1.0RC1"
+#define PHP_XPASS_VERSION "1.1.0"
#define PHP_XPASS_AUTHOR "Remi Collet"
#define PHP_XPASS_LICENSE "PHP-3.01"