Re: svn commit: r1920597 - in /httpd/httpd/trunk: changes-entries/modssl-engine-fallback.txt modules/ssl/ssl_engine_pphrase.c

[Joe Orton]

On Fri, Sep 27, 2024 at 05:17:25PM +0200, Ruediger Pluem wrote:
> On 9/12/24 6:04 PM, jor...@apache.org wrote:
> > Author: jorton
> > Date: Thu Sep 12 16:04:39 2024
> > New Revision: 1920597
> > 
> > URL: http://svn.apache.org/viewvc?rev=1920597&view=rev
> > Log:
...
> > --- httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c (original)
> > +++ httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c Thu Sep 12 16:04:39 
> > 2024
> 
> > @@ -831,7 +834,7 @@ static apr_status_t modssl_load_keypair_
> >          ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(10131)
> >                       "Init: Unrecognized private key identifier `%s'",
> >                       keyid);
> 
> Shouldn't we switch from APLOG_EMERG to APLOG_NOTICE above?

Good catches - thanks for the review. Fixed both in r1921076.

> 
> > -        return ssl_die(s);
> > +        return APR_ENOTIMPL;
> >      }
> >  
> >      scheme = apr_pstrmemdup(ptemp, keyid, c - keyid);
> > @@ -839,8 +842,8 @@ static apr_status_t modssl_load_keypair_
> >          ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(10132)
> >                       "Init: Failed to load engine for private key %s",
> >                       keyid);
> 
> Shouldn't we switch from APLOG_EMERG to APLOG_NOTICE above?
> 
> > -        ssl_log_ssl_error(SSLLOG_MARK, APLOG_EMERG, s);
> > -        return ssl_die(s);
> > +        ssl_log_ssl_error(SSLLOG_MARK, APLOG_NOTICE, s);
> > +        return APR_ENOTIMPL;
> >      }
> >  
> >      if (!ENGINE_init(e)) {
> 
> Regards
> 
> Rüdiger
>