diff options
| author | Anatol Belski <ab@php.net> | 2015-07-03 11:16:02 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-07-03 11:16:02 +0200 |
| commit | d870683d6b37884bd4baf9a3aa5cd3e43a3c432a (patch) | |
| tree | 738996d0e315228f6cd23f9cfeadba349eb6b8e3 | |
| parent | 48d71af7ed0cac5b0a4f112703e81ec72715aa74 (diff) | |
| download | php-git-d870683d6b37884bd4baf9a3aa5cd3e43a3c432a.tar.gz | |
backport c01943bffc8b719e552d307f522820d50f783a4c into 5.6
| -rw-r--r-- | ext/openssl/openssl.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 20a63b1d3c..ae3b2e2c9f 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: |