You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Yann Ylavic <yl...@gmail.com> on 2014/10/05 13:55:19 UTC
Re: svn commit: r1629372 - in /httpd/httpd/trunk: CHANGES
docs/log-message-tags/next-number modules/ssl/ssl_engine_init.c
modules/ssl/ssl_private.h modules/ssl/ssl_util_stapling.c
On Sat, Oct 4, 2014 at 12:58 PM, <kb...@apache.org> wrote:
> Author: kbrand
> Date: Sat Oct 4 10:58:49 2014
> New Revision: 1629372
>
> URL: http://svn.apache.org/r1629372
[...]
>
> Modified:
[...]
> httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c
>
[...]
> Modified: httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c?rev=1629372&r1=1629371&r2=1629372&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c (original)
> +++ httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c Sat Oct 4 10:58:49 2014
[...]
> @@ -106,70 +102,96 @@ static X509 *stapling_get_issuer(modssl_
[...]
> +
> + /* At this point, we have determined that there's something to store */
> + cinf = apr_pcalloc(p, sizeof(certinfo));
> + memcpy (cinf->idx, idx, sizeof(idx));
> + cinf->cid = cid;
> + /* make sure cid is also freed at pool cleanup */
> + apr_pool_cleanup_register(p, cid, ssl_stapling_certid_free,
> + apr_pool_cleanup_null);
> + if (aia) {
> + /* allocate uri from the pconf pool */
> + cinf->uri = apr_pstrdup(p, sk_OPENSSL_STRING_value(aia, 0));
sk_OPENSSL_STRING_value() is undefined in openssl-0.9.8x, I commited a
follow up in r1629485.
Can you please check this is the right thing to do?
> + X509_email_free(aia);
> + }
[...]
Regards,
Yann.
Re: svn commit: r1629372 - in /httpd/httpd/trunk: CHANGES
docs/log-message-tags/next-number modules/ssl/ssl_engine_init.c
modules/ssl/ssl_private.h modules/ssl/ssl_util_stapling.c
Posted by Yann Ylavic <yl...@gmail.com>.
On Sun, Oct 5, 2014 at 2:09 PM, Kaspar Brand <ht...@velox.ch> wrote:
> On 05.10.2014 13:55, Yann Ylavic wrote:
>> sk_OPENSSL_STRING_value() is undefined in openssl-0.9.8x, I commited a
>> follow up in r1629485.
>> Can you please check this is the right thing to do?
>
> Thanks. It would make more sense to change ssl_private.h, actually - you
> can just s/sk_OPENSSL_STRING_pop/sk_OPENSSL_STRING_value/ (as r1629372
> dropped the sk_OPENSSL_STRING_pop call, i.e. it's no longer used in
> anywhere in mod_ssl).
OK, thanks, done in r1629519.
I choose rather to the keep sk_OPENSSL_STRING_pop defined and add
sk_OPENSSL_STRING_value/num in ssl_private.h, to avoid this same issue
should any of these be used some day for any reason.
Regards,
Yann.
Re: svn commit: r1629372 - in /httpd/httpd/trunk: CHANGES docs/log-message-tags/next-number
modules/ssl/ssl_engine_init.c modules/ssl/ssl_private.h modules/ssl/ssl_util_stapling.c
Posted by Kaspar Brand <ht...@velox.ch>.
On 05.10.2014 13:55, Yann Ylavic wrote:
> sk_OPENSSL_STRING_value() is undefined in openssl-0.9.8x, I commited a
> follow up in r1629485.
> Can you please check this is the right thing to do?
Thanks. It would make more sense to change ssl_private.h, actually - you
can just s/sk_OPENSSL_STRING_pop/sk_OPENSSL_STRING_value/ (as r1629372
dropped the sk_OPENSSL_STRING_pop call, i.e. it's no longer used in
anywhere in mod_ssl).
Kaspar