diff options
| author | Anatol Belski <ab@php.net> | 2015-07-03 10:15:52 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-07-03 10:15:52 +0200 |
| commit | c01943bffc8b719e552d307f522820d50f783a4c (patch) | |
| tree | 160aa77d44234b20a656bdfa9179aa1d23308a45 | |
| parent | 3d7343f609b81ebac95d94480a2615df530806e7 (diff) | |
| download | php-git-c01943bffc8b719e552d307f522820d50f783a4c.tar.gz | |
fix improper behavior
openssl_spki_export() is documented to return string, but it's
obviously not achieved writing it to stdout :)
| -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 ebbc877c43..b3ef5ad003 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1637,7 +1637,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(), "s", &spkstr, &spkstr_len) == FAILURE) { return; @@ -1669,8 +1669,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); + } goto cleanup; cleanup: |