Skip to content

Commit 10834d1

Browse files
committed
Fix #47728: Add missing openssl constants
This adds PKCS7_NOSMIMECAP, PKCS7_CRLFEOL, PKCS7_NOCRL and PKCS7_NO_DUAL_CONTENT constants. They might be potentially useful in some scenarious. Test is not added as it is not clear if there is much need for those and it would require much bigger effort just to test OpenSSL functionality. Closes GH-19450
1 parent c5f79b8 commit 10834d1

File tree

4 files changed

+31
-1
lines changed

4 files changed

+31
-1
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ PHP NEWS
3636
(Girgias)
3737
. Implement #80495 (Enable to set padding in openssl_(sign|verify).
3838
(Jakub Zelenka)
39+
. Implement #47728 (openssl_pkcs7_sign ignores new openssl flags).
40+
(Jakub Zelenka)
3941

4042
- PDO:
4143
. The "uri:" DSN scheme has been deprecated due to security concerns with

UPGRADING

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,10 @@ PHP 8.5 UPGRADE NOTES
674674

675675
- OpenSSL:
676676
. OPENSSL_PKCS1_PSS_PADDING
677+
. PKCS7_NOSMIMECAP
678+
. PKCS7_CRLFEOL
679+
. PKCS7_NOCRL
680+
. PKCS7_NO_DUAL_CONTENT
677681

678682
- POSIX:
679683
. POSIX_SC_OPEN_MAX.

ext/openssl/openssl.stub.php

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,26 @@
166166
* @cvalue PKCS7_NOOLDMIMETYPE
167167
*/
168168
const PKCS7_NOOLDMIMETYPE = UNKNOWN;
169+
/**
170+
* @var int
171+
* @cvalue PKCS7_NOSMIMECAP
172+
*/
173+
const PKCS7_NOSMIMECAP = UNKNOWN;
174+
/**
175+
* @var int
176+
* @cvalue PKCS7_CRLFEOL
177+
*/
178+
const PKCS7_CRLFEOL = UNKNOWN;
179+
/**
180+
* @var int
181+
* @cvalue PKCS7_NOCRL
182+
*/
183+
const PKCS7_NOCRL = UNKNOWN;
184+
/**
185+
* @var int
186+
* @cvalue PKCS7_NO_DUAL_CONTENT
187+
*/
188+
const PKCS7_NO_DUAL_CONTENT = UNKNOWN;
169189

170190
/**
171191
* @var int

ext/openssl/openssl_arginfo.h

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)