diff options
author | Vanilla I. Shu <vanilla@FreeBSD.org> | 1998-10-19 15:49:06 +0000 |
---|---|---|
committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 1998-10-19 15:49:06 +0000 |
commit | 74ed251b0ed9b6d44347fd50e3060163219b930a (patch) | |
tree | c48fb73ef5cc96b3af4fb125d5382beaf1960fc9 /net/SSLtelnet/files/patch-ad | |
parent | Fix a typo error. (diff) |
Upgrade to 0.13.
Agreed by: maintainer
Notes
Notes:
svn path=/head/; revision=14079
Diffstat (limited to '')
-rw-r--r-- | net/SSLtelnet/files/patch-ad | 65 |
1 files changed, 2 insertions, 63 deletions
diff --git a/net/SSLtelnet/files/patch-ad b/net/SSLtelnet/files/patch-ad index 042fe53b8524..54344b9f5a6f 100644 --- a/net/SSLtelnet/files/patch-ad +++ b/net/SSLtelnet/files/patch-ad @@ -1,66 +1,5 @@ ---- lib/libtelnet/sslapp.c.orig Sat Aug 2 13:52:35 1997 -+++ lib/libtelnet/sslapp.c Wed Sep 2 12:53:21 1998 -@@ -31,6 +31,7 @@ - int ssl_cert_required=0; - int ssl_verbose_flag=0; - int ssl_disabled_flag=0; -+int ssl_quiet_flag=0; - char *ssl_cert_file=NULL; - char *ssl_key_file=NULL; - char *ssl_cipher_list=NULL; -@@ -59,7 +60,7 @@ - * a clean interface for doing things - */ - if (ssl_debug_flag) -- BIO_printf(bio_err,"SSL_DEBUG_FLAG on\n"); -+ BIO_printf(bio_err,"SSL_DEBUG_FLAG on\r\n"); - - - /* init things so we will get meaningful error messages -@@ -79,15 +80,18 @@ - if (SSL_CTX_need_tmp_RSA(ssl_ctx)) { - RSA *rsa; - -- BIO_printf(bio_err,"Generating temp (512 bit) RSA key ...\n"); -+ if (!ssl_quiet_flag) -+ BIO_printf(bio_err,"Generating temp (512 bit) RSA key ...\r\n"); - rsa=RSA_generate_key(512,RSA_F4,NULL); -- BIO_printf(bio_err,"Generation of temp (512 bit) RSA key done\n"); -+ if (!ssl_quiet_flag) -+ BIO_printf(bio_err,"Generation of temp (512 bit) RSA key done\r\n"); - -- if (!SSL_CTX_set_tmp_rsa(ssl_ctx,rsa)) { -- BIO_printf(bio_err,"Failed to assign generated temp RSA key!\n"); -+ if (!SSL_CTX_set_tmp_rsa(ssl_ctx,rsa) && !ssl_quiet_flag) { -+ BIO_printf(bio_err,"Failed to assign generated temp RSA key!\r\n"); - } - RSA_free(rsa); -- BIO_printf(bio_err,"Assigned temp (512 bit) RSA key\n"); -+ if (!ssl_quiet_flag) -+ BIO_printf(bio_err,"Assigned temp (512 bit) RSA key\r\n"); - } - } - -@@ -161,14 +165,14 @@ - int ret; - { - if (where==SSL_CB_CONNECT_LOOP) { -- BIO_printf(bio_err,"SSL_connect:%s %s\n", -+ BIO_printf(bio_err,"SSL_connect:%s %s\r\n", - SSL_state_string(s),SSL_state_string_long(s)); - } else if (where==SSL_CB_CONNECT_EXIT) { - if (ret == 0) { -- BIO_printf(bio_err,"SSL_connect:failed in %s %s\n", -+ BIO_printf(bio_err,"SSL_connect:failed in %s %s\r\n", - SSL_state_string(s),SSL_state_string_long(s)); - } else if (ret < 0) { -- BIO_printf(bio_err,"SSL_connect:error in %s %s\n", -+ BIO_printf(bio_err,"SSL_connect:error in %s %s\r\n", - SSL_state_string(s),SSL_state_string_long(s)); - } - } ---- lib/libtelnet/sslapp.h.orig Sat Aug 2 13:56:21 1997 -+++ lib/libtelnet/sslapp.h Wed Sep 2 12:53:22 1998 +--- lib/libtelnet/sslapp.h.orig Fri Oct 16 21:14:59 1998 ++++ lib/libtelnet/sslapp.h Fri Oct 16 21:15:07 1998 @@ -53,6 +53,7 @@ extern int ssl_disabled_flag; extern int ssl_cert_required; |