Re: ocspcheck typos

2017-01-26 Thread Jason McIntyre
On Fri, Jan 27, 2017 at 03:58:39AM +, 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 -   1.9
> +++ lib/libtls/tls_ocsp.c 27 Jan 2017 03:58:11 -
> @@ -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.y5 Jan 2017 13:53:09 -   1.87
> +++ usr.sbin/httpd/parse.y27 Jan 2017 03:58:11 -
> @@ -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(>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 -   
> 1.1
> +++ regress/usr.bin/openssl/appstest.sh   27 Jan 2017 03:58:11 -
> @@ -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



Re: ocspcheck typos

2017-01-26 Thread Tom Cosgrove
>>> 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)


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 -   1.9
+++ lib/libtls/tls_ocsp.c   27 Jan 2017 03:58:11 -
@@ -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 -   1.87
+++ usr.sbin/httpd/parse.y  27 Jan 2017 03:58:11 -
@@ -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(>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 -   1.1
+++ regress/usr.bin/openssl/appstest.sh 27 Jan 2017 03:58:11 -
@@ -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



Re: ocspcheck typos

2017-01-26 Thread Jason McIntyre
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

> Index: ocspcheck.8
> ===
> RCS file: /cvs/src/usr.sbin/ocspcheck/ocspcheck.8,v
> retrieving revision 1.5
> diff -u -p -u -r1.5 ocspcheck.8
> --- ocspcheck.8   24 Jan 2017 12:00:19 -  1.5
> +++ ocspcheck.8   26 Jan 2017 22:11:08 -
> @@ -19,7 +19,7 @@
>  .Os
>  .Sh NAME
>  .Nm ocspcheck
> -.Nd check a certificate for validity against its OSCP responder
> +.Nd check a certificate for validity against its OCSP responder
>  .Sh SYNOPSIS
>  .Nm
>  .Op Fl Nv
> Index: ocspcheck.c
> ===
> RCS file: /cvs/src/usr.sbin/ocspcheck/ocspcheck.c,v
> retrieving revision 1.13
> diff -u -p -u -r1.13 ocspcheck.c
> --- ocspcheck.c   26 Jan 2017 00:58:32 -  1.13
> +++ ocspcheck.c   26 Jan 2017 22:11:08 -
> @@ -556,7 +556,7 @@ main(int argc, char **argv)
>  
>   /*
>* Load our certificate and keystore, and build up an
> -  * OSCP request based on the full certificate chain
> +  * OCSP request based on the full certificate chain
>* we have been given to check.
>*/
>   if ((castore = read_cacerts(cafile)) == NULL)
> 



ocspcheck typos

2017-01-26 Thread Holger Mikolon
Hi,

below are two minor typo fixes: s/OSCP/OCSP/

Holger
;-se


Index: ocspcheck.8
===
RCS file: /cvs/src/usr.sbin/ocspcheck/ocspcheck.8,v
retrieving revision 1.5
diff -u -p -u -r1.5 ocspcheck.8
--- ocspcheck.8 24 Jan 2017 12:00:19 -  1.5
+++ ocspcheck.8 26 Jan 2017 22:11:08 -
@@ -19,7 +19,7 @@
 .Os
 .Sh NAME
 .Nm ocspcheck
-.Nd check a certificate for validity against its OSCP responder
+.Nd check a certificate for validity against its OCSP responder
 .Sh SYNOPSIS
 .Nm
 .Op Fl Nv
Index: ocspcheck.c
===
RCS file: /cvs/src/usr.sbin/ocspcheck/ocspcheck.c,v
retrieving revision 1.13
diff -u -p -u -r1.13 ocspcheck.c
--- ocspcheck.c 26 Jan 2017 00:58:32 -  1.13
+++ ocspcheck.c 26 Jan 2017 22:11:08 -
@@ -556,7 +556,7 @@ main(int argc, char **argv)
 
/*
 * Load our certificate and keystore, and build up an
-* OSCP request based on the full certificate chain
+* OCSP request based on the full certificate chain
 * we have been given to check.
 */
if ((castore = read_cacerts(cafile)) == NULL)