On Fri, Jan 27, 2017 at 03:58:39AM +0000, Tom Cosgrove wrote:
> >>> Jason McIntyre 26-Jan-17 23:00 >>>
> >
> > On Thu, Jan 26, 2017 at 11:15:05PM +0100, Holger Mikolon wrote:
> > > Hi,
> > >
> > > below are two minor typo fixes: s/OSCP/OCSP/
> > >
> > > Holger
> > > ;-se
> >
> > fixed, thanks, plus one more in nc.
> > jmc
>
> There are also these in comments and warning messages.
>
> ok? (Asking as these aren't any of my usual areas)
>
yes, ok.
jmc
>
> Index: lib/libtls/tls_ocsp.c
> ===================================================================
> RCS file: /cvs/src/lib/libtls/tls_ocsp.c,v
> retrieving revision 1.9
> diff -u -p -u -r1.9 tls_ocsp.c
> --- lib/libtls/tls_ocsp.c 5 Nov 2016 15:13:26 -0000 1.9
> +++ lib/libtls/tls_ocsp.c 27 Jan 2017 03:58:11 -0000
> @@ -356,7 +356,7 @@ tls_ocsp_stapling_cb(SSL *ssl, void *arg
> * Public API
> */
>
> -/* Retrieve OSCP URL from peer certificate, if present */
> +/* Retrieve OCSP URL from peer certificate, if present */
> const char *
> tls_peer_ocsp_url(struct tls *ctx)
> {
> Index: usr.sbin/httpd/parse.y
> ===================================================================
> RCS file: /cvs/src/usr.sbin/httpd/parse.y,v
> retrieving revision 1.87
> diff -u -p -u -r1.87 parse.y
> --- usr.sbin/httpd/parse.y 5 Jan 2017 13:53:09 -0000 1.87
> +++ usr.sbin/httpd/parse.y 27 Jan 2017 03:58:11 -0000
> @@ -344,7 +344,7 @@ server : SERVER optmatch STRING {
>
> if (server_tls_load_ocsp(srv) == -1) {
> yyerror("server \"%s\": failed to load "
> - "oscp staple", srv->srv_conf.name);
> + "ocsp staple", srv->srv_conf.name);
> serverconfig_free(srv_conf);
> free(srv);
> YYERROR;
> @@ -2069,7 +2069,7 @@ server_inherit(struct server *src, struc
> }
>
> if (server_tls_load_ocsp(dst) == -1) {
> - yyerror("failed to load oscp staple "
> + yyerror("failed to load ocsp staple "
> "for server %s", dst->srv_conf.name);
> serverconfig_free(&dst->srv_conf);
> free(dst);
> Index: regress/usr.bin/openssl/appstest.sh
> ===================================================================
> RCS file: /cvs/src/regress/usr.bin/openssl/appstest.sh,v
> retrieving revision 1.1
> diff -u -p -u -r1.1 appstest.sh
> --- regress/usr.bin/openssl/appstest.sh 6 Nov 2016 11:56:43 -0000
> 1.1
> +++ regress/usr.bin/openssl/appstest.sh 27 Jan 2017 03:58:11 -0000
> @@ -847,7 +847,7 @@ ocsp_svr_pid=$!
> echo "ocsp server pid = [ $ocsp_svr_pid ]"
> sleep 1
>
> -# send query to oscp server
> +# send query to ocsp server
> start_message "ocsp ... send OCSP request to server"
>
> ocsp_qry=$user1_dir/ocsp_qry.der
