hnangelo Tue Jul 15 03:21:56 2008 UTC
Modified files:
/php-src/ext/openssl openssl.c
/php-src/ext/openssl/tests 012.phpt public.key
Log:
Fix error message
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.163&r2=1.164&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.163 php-src/ext/openssl/openssl.c:1.164
--- php-src/ext/openssl/openssl.c:1.163 Tue Jul 15 03:04:25 2008
+++ php-src/ext/openssl/openssl.c Tue Jul 15 03:21:56 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.163 2008/07/15 03:04:25 hnangelo Exp $ */
+/* $Id: openssl.c,v 1.164 2008/07/15 03:21:56 hnangelo Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -4164,7 +4164,7 @@
&pos) == SUCCESS) {
pkeys[i] = php_openssl_evp_from_zval(pubkey, 1, NULL, 0,
&key_resources[i] TSRMLS_CC);
if (pkeys[i] == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a
public key (%dth member of pubkeys)", i);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a
public key (%dth member of pubkeys)", i+1);
RETVAL_FALSE;
goto clean_exit;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/012.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/openssl/tests/012.phpt
diff -u /dev/null php-src/ext/openssl/tests/012.phpt:1.2
--- /dev/null Tue Jul 15 03:21:56 2008
+++ php-src/ext/openssl/tests/012.phpt Tue Jul 15 03:21:56 2008
@@ -0,0 +1,33 @@
+--TEST--
+openssl_seal() error tests
+--SKIPIF--
+<?php if (!extension_loaded("openssl")) print "skip"; ?>
+--FILE--
+<?php
+$data = b"openssl_open() test";
+$pub_key = "file://" . dirname(__FILE__) . "/public.key";
+$wrong = "wrong";
+
+openssl_seal($data, $sealed, $ekeys, array($pub_key));
+openssl_seal($data, $sealed, $ekeys, array($pub_key, $pub_key)); // no
output
+openssl_seal($data, $sealed, $ekeys, array($pub_key, $wrong));
+openssl_seal($data, $sealed, $ekeys, array($pub_key, (binary)$wrong));
+openssl_seal($data, $sealed, $ekeys, $pub_key);
+openssl_seal($data, $sealed, $ekeys, (binary)$wrong);
+openssl_seal($data, $sealed, $ekeys, array());
+openssl_seal($data, $sealed, $ekeys, array($wrong));
+?>
+--EXPECTF--
+
+Warning: openssl_seal(): not a public key (2th member of pubkeys) in %s on
line %d
+
+Warning: openssl_seal(): not a public key (2th member of pubkeys) in %s on
line %d
+
+Warning: openssl_seal() expects parameter 4 to be array, Unicode string given
in %s on line %d
+
+Warning: openssl_seal() expects parameter 4 to be array, binary string given
in %s on line %d
+
+Warning: openssl_seal(): Fourth argument to openssl_seal() must be a non-empty
array in %s on line %d
+
+Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s on
line %d
+
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/public.key?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/openssl/tests/public.key
diff -u /dev/null php-src/ext/openssl/tests/public.key:1.2
--- /dev/null Tue Jul 15 03:21:56 2008
+++ php-src/ext/openssl/tests/public.key Tue Jul 15 03:21:56 2008
@@ -0,0 +1,6 @@
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDLXp6PkCtbpV+P1gwFQWH6Ez0U
+83uEmS8IGnpeI8Fk8rY/vHOZzZZaxRCw+loyc342qCDIQheMOCNm5Fkevz06q757
+/oooiLR3yryYGKiKG1IZIiplmtsC95oKrzUSKk60wuI1mbgpMUP5LKi/Tvxes5Pm
+kUtXfimz2qgkeUcPpQIDAQAB
+-----END PUBLIC KEY-----
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
