summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/libtls/tls_ocsp.c2
-rwxr-xr-xregress/usr.bin/openssl/appstest.sh2
-rw-r--r--usr.sbin/httpd/parse.y6
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/libtls/tls_ocsp.c b/lib/libtls/tls_ocsp.c
index 9ed60a2aa91..791bee0e171 100644
--- a/lib/libtls/tls_ocsp.c
+++ b/lib/libtls/tls_ocsp.c
@@ -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)
{
diff --git a/regress/usr.bin/openssl/appstest.sh b/regress/usr.bin/openssl/appstest.sh
index 69cb511052d..f241e2c34b2 100755
--- a/regress/usr.bin/openssl/appstest.sh
+++ b/regress/usr.bin/openssl/appstest.sh
@@ -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
diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y
index 967aeec5427..3afd9f95663 100644
--- a/usr.sbin/httpd/parse.y
+++ b/usr.sbin/httpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.87 2017/01/05 13:53:09 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.88 2017/01/27 07:03:27 tom Exp $ */
/*
* Copyright (c) 2007 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -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, struct server_config *alias,
}
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);