From: Ferenc Kovacs <tyrael@php.net>
Date: Mon, 3 Feb 2014 03:20:16 +0000 (+0100)
Subject: mention the openssl SPKAC functions commited to master before branching out 5.6.... 
X-Git-Tag: php-5.6.0alpha2~1^2~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d3a2fde2482d32eb5faaa5db7e6d7d8371bea0d;p=php

mention the openssl SPKAC functions commited to master before branching out 5.6. see https://github.com/php/php-src/pull/267
---

diff --git a/NEWS b/NEWS
index ca1cd7b181..f9f93afc32 100644
--- a/NEWS
+++ b/NEWS
@@ -75,6 +75,7 @@ PHP                                                                        NEWS
   . Fixed segfault when built against OpenSSL>=1.0.1 (Daniel Lowrey)
   . Peer certificates now verified by default in client socket operations
     (RFC: https://wiki.php.net/rfc/tls-peer-verification). (Daniel Lowrey)
+  . Added SPKAC support. (Jason Gerfen)
 
 - PDO_pgsql:
   . Fixed Bug #42614 (PDO_pgsql: add pg_get_notify support). (Matteo)
diff --git a/UPGRADING b/UPGRADING
index 6758615974..500372ce15 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -107,6 +107,10 @@ PHP X.Y UPGRADE NOTES
 
 - Openssl:
   Added string openssl_x509_fingerprint($x509, $type, $binary).
+  Added string openssl_spki_new($private_key, $challenge, $algorithm)
+  Added bool openssl_spki_verify($spkac)
+  Added string openssl_spki_export($spkac)
+  Added string openssl_spki_export_challenge($spkac)
 
 - LDAP:
   Added ldap_escape($value, $ignore = "", $flags = 0).