From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 20 Oct 2013 21:31:00 +0000 (+0100)
Subject: Fix various typos.
X-Git-Tag: OpenSSL_1_0_2-beta1~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1180833643d7310573366b7e3d36e70c7defba9c;p=thirdparty%2Fopenssl.git

Fix various typos.
(cherry picked from commit f3efeaad540b000779277b4fc49a239529ee616e)
---

diff --git a/demos/bio/saccept.c b/demos/bio/saccept.c
index 40cd4daad2..699930db51 100644
--- a/demos/bio/saccept.c
+++ b/demos/bio/saccept.c
@@ -1,13 +1,13 @@
 /* NOCW */
 /* demos/bio/saccept.c */
 
-/* A minimal program to server an SSL connection.
+/* A minimal program to serve an SSL connection.
  * It uses blocking.
  * saccept host:port
  * host is the interface IP to use.  If any interface, use *:port
  * The default it *:4433
  *
- * cc -I../../include saccept.c -L../.. -lssl -lcrypto
+ * cc -I../../include saccept.c -L../.. -lssl -lcrypto -ldl
  */
 
 #include <stdio.h>
@@ -67,8 +67,8 @@ char *argv[];
 
 	if ((in=BIO_new_accept(port)) == NULL) goto err;
 
-	/* This means that when a new connection is acceptede on 'in',
-	 * The ssl_bio will be 'dupilcated' and have the new socket
+	/* This means that when a new connection is accepted on 'in',
+	 * The ssl_bio will be 'duplicated' and have the new socket
 	 * BIO push into it.  Basically it means the SSL BIO will be
 	 * automatically setup */
 	BIO_set_accept_bios(in,ssl_bio);
diff --git a/demos/bio/server-arg.c b/demos/bio/server-arg.c
index cf8e86b754..be35e6210b 100644
--- a/demos/bio/server-arg.c
+++ b/demos/bio/server-arg.c
@@ -1,13 +1,11 @@
 /* NOCW */
-/* demos/bio/saccept.c */
+/* demos/bio/server-arg.c */
 
-/* A minimal program to server an SSL connection.
+/* A minimal program to serve an SSL connection.
  * It uses blocking.
- * saccept host:port
- * host is the interface IP to use.  If any interface, use *:port
- * The default it *:4433
+ * It use the SSL_CONF API with the command line.
  *
- * cc -I../../include saccept.c -L../.. -lssl -lcrypto
+ * cc -I../../include server-arg.c -L../.. -lssl -lcrypto -ldl
  */
 
 #include <stdio.h>
@@ -90,8 +88,8 @@ int main(int argc, char *argv[])
 
 	if ((in=BIO_new_accept(port)) == NULL) goto err;
 
-	/* This means that when a new connection is acceptede on 'in',
-	 * The ssl_bio will be 'dupilcated' and have the new socket
+	/* This means that when a new connection is accepted on 'in',
+	 * The ssl_bio will be 'duplicated' and have the new socket
 	 * BIO push into it.  Basically it means the SSL BIO will be
 	 * automatically setup */
 	BIO_set_accept_bios(in,ssl_bio);
diff --git a/demos/bio/server-conf.c b/demos/bio/server-conf.c
index ce8e7a5672..0d940f0f77 100644
--- a/demos/bio/server-conf.c
+++ b/demos/bio/server-conf.c
@@ -1,13 +1,11 @@
 /* NOCW */
-/* demos/bio/saccept.c */
+/* demos/bio/saccept-conf.c */
 
-/* A minimal program to server an SSL connection.
+/* A minimal program to serve an SSL connection.
  * It uses blocking.
- * saccept host:port
- * host is the interface IP to use.  If any interface, use *:port
- * The default it *:4433
+ * It uses the SSL_CONF API with a configuration file.
  *
- * cc -I../../include saccept.c -L../.. -lssl -lcrypto
+ * cc -I../../include saccept.c -L../.. -lssl -lcrypto -ldl
  */
 
 #include <stdio.h>
@@ -98,8 +96,8 @@ int main(int argc, char *argv[])
 
 	if ((in=BIO_new_accept(port)) == NULL) goto err;
 
-	/* This means that when a new connection is acceptede on 'in',
-	 * The ssl_bio will be 'dupilcated' and have the new socket
+	/* This means that when a new connection is accepted on 'in',
+	 * The ssl_bio will be 'duplicated' and have the new socket
 	 * BIO push into it.  Basically it means the SSL BIO will be
 	 * automatically setup */
 	BIO_set_accept_bios(in,ssl_bio);