com php-src: backport c01943bffc8b719e552d307f522820d50f783a4c into 5.6: ext/openssl/openssl.c
| From: | Anatol Belski | Date: | Fri, 03 Jul 2015 09:16:02 +0000 |
| Subject: | com php-src: backport c01943bffc8b719e552d307f522820d50f783a4c into 5.6: ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87724@lists.php.net to get a copy of this message | ||
Commit: d870683d6b37884bd4baf9a3aa5cd3e43a3c432a
Author: Anatol Belski <ab@php.net> Fri, 3 Jul 2015 11:16:02 +0200
Parents: 48d71af7ed0cac5b0a4f112703e81ec72715aa74
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d870683d6b37884bd4baf9a3aa5cd3e43a3c432a
Log:
backport c01943bffc8b719e552d307f522820d50f783a4c into 5.6
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 20a63b1..ae3b2e2 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1613,7 +1613,7 @@ PHP_FUNCTION(openssl_spki_export)
EVP_PKEY *pkey = NULL;
NETSCAPE_SPKI *spki = NULL;
- BIO *out = BIO_new(BIO_s_mem());
+ BIO *out = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &spkstr, &spkstr_len)
== FAILURE) {
return;
@@ -1640,8 +1640,13 @@ PHP_FUNCTION(openssl_spki_export)
goto cleanup;
}
- out = BIO_new_fp(stdout, BIO_NOCLOSE);
- PEM_write_bio_PUBKEY(out, pkey);
+ out = BIO_new(BIO_s_mem());
+ if (out && PEM_write_bio_PUBKEY(out, pkey)) {
+ BUF_MEM *bio_buf;
+
+ BIO_get_mem_ptr(out, &bio_buf);
+ RETVAL_STRINGL((char *)bio_buf->data, bio_buf->length, 0);
+ }
goto cleanup;
cleanup: