projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a3a82d
)
Don't allow -www etc options with DTLS.
author
Dr. Stephen Henson
<steve@openssl.org>
Tue, 15 Jul 2014 11:22:49 +0000
(12:22 +0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Tue, 15 Jul 2014 11:27:29 +0000
(12:27 +0100)
The options which emulate a web server don't make sense when doing DTLS.
Exit with an error if an attempt is made to use them.
PR#3453
(cherry picked from commit
58a2aaeade8bdecd0f9f0df41927f7cff3012547
)
apps/s_server.c
patch
|
blob
|
history
diff --git
a/apps/s_server.c
b/apps/s_server.c
index 045c2bdd75aa5371bb2c5c9ec22d9f7949f50631..fe33b41f6505ff5ab91ac6fdba679e822cb2b2a5 100644
(file)
--- a/
apps/s_server.c
+++ b/
apps/s_server.c
@@
-1095,6
+1095,14
@@
bad:
sv_usage();
goto end;
}
+#ifndef OPENSSL_NO_DTLS1
+ if (www && socket_type == SOCK_DGRAM)
+ {
+ BIO_printf(bio_err,
+ "Can't use -HTTP, -www or -WWW with DTLS\n");
+ goto end;
+ }
+#endif
SSL_load_error_strings();
OpenSSL_add_ssl_algorithms();