Skip to content

Commit 969ac34

Browse files
committed
Merge branch 'release/0.3.2'
2 parents 8cf3df4 + 9d538b6 commit 969ac34

File tree

5 files changed

+67
-24
lines changed

5 files changed

+67
-24
lines changed

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ php:
1717

1818
notifications:
1919
email: false
20-
irc: "irc.iiens.net#Clicky"
20+
irc:
21+
channels:
22+
- "irc.iiens.net#Clicky"
23+
on_success: change
24+
on_failure: always
2125

2226
before_install:
2327
- export TEST_PHP_EXECUTABLE=`which php`

README.rst

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ I made this extension for two reasons:
2929

3030
Installation
3131
------------
32+
33+
POSIX systems (Linux, etc.)
34+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
35+
3236
You can install this extension using ``pear``:
3337

3438
.. sourcecode:: console
@@ -45,6 +49,21 @@ the following line to your ``php.ini``:
4549

4650
extension=tomcrypt.so
4751

52+
Microsoft Windows
53+
~~~~~~~~~~~~~~~~~
54+
55+
Download a pre-built ``php_tomcrypt.dll`` from the
56+
`release page <https://github.com/fpoirotte/tomcrypt/releases/latest>`_
57+
or `compile the DLL yourself <./README.WIN32.rst>`_.
58+
59+
After that, just drop the DLL into you're PHP installation's ``extension_dir``
60+
and add the following line of configuration to your ``php.ini``:
61+
62+
.. sourcecode:: ini
63+
64+
extension=php_tomcrypt.dll
65+
66+
4867
Usage
4968
-----
5069

@@ -288,15 +307,6 @@ Various algorithms of (pseudo-)random number generators are available:
288307
and should not be used when truly random data is required.
289308

290309

291-
Windows support
292-
---------------
293-
The extension should compile and run just fine under Windows.
294-
Unfortunately, I do not have access to Windows development tools
295-
and cannot compile a binary release for Windows users.
296-
297-
If you manage to compile the extension on Windows, please let us know through
298-
`our issue tracker <https://github.com/fpoirotte/tomcrypt/issues>`_.
299-
300310
License
301311
-------
302312
libtomcrypt is released under a dual

RELEASES

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
Version: 0.3.2
2+
Date: 2018-03-25 23:59:59
3+
Stability: beta
4+
5+
notes: Sun, Mar 25, 2018 - tomcrypt 0.3.2
6+
7+
+ Changes:
8+
9+
- Add support for PHP 7.2
10+
11+
112
Version: 0.3.1
213
Date: 2018-02-25 16:30:00
314
Stability: beta

package.xml

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,22 @@ The following features are currently supported:
2525
<email>[email protected]</email>
2626
<active>yes</active>
2727
</lead>
28-
<date>2018-02-25</date>
29-
<time>16:30:00</time>
28+
<date>2018-03-25</date>
29+
<time>23:59:59</time>
3030
<version>
31-
<release>0.3.1</release>
31+
<release>0.3.2</release>
3232
<api>0.3.1</api>
3333
</version>
3434
<stability>
3535
<release>beta</release>
3636
<api>stable</api>
3737
</stability>
3838
<license uri="http://www.php.net/license/3_01.txt">PHP</license>
39-
<notes>Sun, Feb 25, 2018 - tomcrypt 0.3.1
39+
<notes>Sun, Mar 25, 2018 - tomcrypt 0.3.3
4040

4141
+ Changes:
4242

43-
- Added instructions on how to build the extension on Windows.
44-
45-
= Fixed bugs:
46-
47-
- Fixed config.w32 so that it actually works under Windows.
48-
- Replaced several calls to index() with equivalent calls to strchr()
49-
for MSVC/C89 compatibility.
43+
- Added support for PHP 7.2
5044
</notes>
5145
<contents>
5246
<dir name="/">
@@ -90,7 +84,7 @@ The following features are currently supported:
9084
<required>
9185
<php>
9286
<min>5.3.0</min>
93-
<max>7.2.0</max>
87+
<max>7.3.0</max>
9488
</php>
9589
<pearinstaller>
9690
<min>1.4.0a2</min>
@@ -100,6 +94,31 @@ The following features are currently supported:
10094
<providesextension>tomcrypt</providesextension>
10195
<extsrcrelease />
10296
<changelog>
97+
<release>
98+
<date>2018-02-25</date>
99+
<time>16:30:00</time>
100+
<version>
101+
<release>0.3.1</release>
102+
<api>0.3.1</api>
103+
</version>
104+
<stability>
105+
<release>beta</release>
106+
<api>stable</api>
107+
</stability>
108+
<license uri="http://www.php.net/license/3_01.txt">PHP</license>
109+
<notes>Sun, Feb 25, 2018 - tomcrypt 0.3.1
110+
111+
+ Changes:
112+
113+
- Added instructions on how to build the extension on Windows.
114+
115+
= Fixed bugs:
116+
117+
- Fixed config.w32 so that it actually works under Windows.
118+
- Replaced several calls to index() with equivalent calls to strchr()
119+
for MSVC/C89 compatibility.
120+
</notes>
121+
</release>
103122
<release>
104123
<date>2017-12-30</date>
105124
<time>23:59:59</time>
@@ -157,7 +176,6 @@ The following features are currently supported:
157176
function
158177
- Added support for HKDF (Hash-based Key Derivation Function) through
159178
the new tomcrypt_hkdf() function (requires LTC v1.18+)
160-
161179

162180
= Fixed bugs:
163181

php_tomcrypt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828

2929
#define PHP_TOMCRYPT_EXTNAME "tomcrypt"
30-
#define PHP_TOMCRYPT_VERSION "0.3.1"
30+
#define PHP_TOMCRYPT_VERSION "0.3.2"
3131

3232
extern zend_module_entry tomcrypt_module_entry;
3333
#define tomcrypt_module_ptr &tomcrypt_module_entry

0 commit comments

Comments
 (0)