projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Zero the premaster secret after deriving the master secret in DH
[openssl.git]
/
ssl
/
ssl_task.c
diff --git
a/ssl/ssl_task.c
b/ssl/ssl_task.c
index ab72166665f5f81cb6f74047863b22c1f49fe087..cac701a798b40160e6c576579ee40bbc5e781882 100644
(file)
--- a/
ssl/ssl_task.c
+++ b/
ssl/ssl_task.c
@@
-123,11
+123,13
@@
int LIB$INIT_TIMER(), LIB$SHOW_TIMER();
#include <string.h> /* from ssltest.c */
#include <errno.h>
#include <string.h> /* from ssltest.c */
#include <errno.h>
-#include "buffer.h"
-#include "../e_os.h"
-#include "x509.h"
-#include "ssl.h"
-#include "err.h"
+
+#include "openssl/e_os.h"
+
+#include <openssl/buffer.h>
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
int MS_CALLBACK verify_callback(int ok, X509 *xs, X509 *xi, int depth,
int error);
int MS_CALLBACK verify_callback(int ok, X509 *xs, X509 *xi, int depth,
int error);
@@
-224,8
+226,12
@@
int main ( int argc, char **argv )
printf("cipher list: %s\n", cipher ? cipher : "{undefined}" );
SSL_load_error_strings();
printf("cipher list: %s\n", cipher ? cipher : "{undefined}" );
SSL_load_error_strings();
+ OpenSSL_add_all_algorithms();
+/* DRM, this was the original, but there is no such thing as SSLv2()
s_ctx=SSL_CTX_new(SSLv2());
s_ctx=SSL_CTX_new(SSLv2());
+*/
+ s_ctx=SSL_CTX_new(SSLv2_server_method());
if (s_ctx == NULL) goto end;
if (s_ctx == NULL) goto end;
@@
-267,8
+273,12
@@
int doit(io_channel chan, SSL_CTX *s_ctx )
c_to_s=BIO_new(BIO_s_rtcp());
s_to_c=BIO_new(BIO_s_rtcp());
if ((s_to_c == NULL) || (c_to_s == NULL)) goto err;
c_to_s=BIO_new(BIO_s_rtcp());
s_to_c=BIO_new(BIO_s_rtcp());
if ((s_to_c == NULL) || (c_to_s == NULL)) goto err;
+/* original, DRM 24-SEP-1997
BIO_set_fd ( c_to_s, "", chan );
BIO_set_fd ( s_to_c, "", chan );
BIO_set_fd ( c_to_s, "", chan );
BIO_set_fd ( s_to_c, "", chan );
+*/
+ BIO_set_fd ( c_to_s, 0, chan );
+ BIO_set_fd ( s_to_c, 0, chan );
c_bio=BIO_new(BIO_f_ssl());
s_bio=BIO_new(BIO_f_ssl());
c_bio=BIO_new(BIO_f_ssl());
s_bio=BIO_new(BIO_f_ssl());