From 651d0aff98d28e2db146afa1790e9e22f3ef22db Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Tue, 22 Dec 1998 15:04:48 +0000 Subject: Various cleanups and fixed by Marc and Ralf to start the OpenTLS project --- ssl/.cvsignore | 1 + ssl/f | 12 ------------ ssl/f.mak | 0 ssl/s23_lib.c | 2 +- ssl/s2_lib.c | 2 +- ssl/s2_srvr.c | 5 ++++- ssl/s3_both.c | 2 +- ssl/s3_lib.c | 6 +++--- ssl/ssl_cert.c | 2 +- ssl/ssl_lib.c | 2 +- ssl/ssl_locl.h | 2 +- ssl/t1_lib.c | 2 +- 12 files changed, 15 insertions(+), 23 deletions(-) create mode 100644 ssl/.cvsignore delete mode 100644 ssl/f delete mode 100644 ssl/f.mak (limited to 'ssl') diff --git a/ssl/.cvsignore b/ssl/.cvsignore new file mode 100644 index 0000000000..a65b41774a --- /dev/null +++ b/ssl/.cvsignore @@ -0,0 +1 @@ +lib diff --git a/ssl/f b/ssl/f deleted file mode 100644 index 9f4bfe8471..0000000000 --- a/ssl/f +++ /dev/null @@ -1,12 +0,0 @@ - * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_TLSV1_ALERT_DECRYPTION_FAILED); - * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_TLSV1_ALERT_RECORD_OVERFLOW - * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_TLSV1_ALERT_UNKNOWN_CA); - * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_TLSV1_ALERT_ACCESS_DENIED); - * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_TLSV1_ALERT_DECODE_ERROR); - * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_TLSV1_ALERT_DECRYPT_ERROR); - * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_TLSV1_ALERT_EXPORT_RESTRICION); - * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_TLSV1_ALERT_PROTOCOL_VERSION); - * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY); - * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_TLSV1_ALERT_INTERNAL_ERROR); - * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_TLSV1_ALERT_USER_CANCLED); - * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_TLSV1_ALERT_NO_RENEGOTIATION); diff --git a/ssl/f.mak b/ssl/f.mak deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/ssl/s23_lib.c b/ssl/s23_lib.c index 1eb2b3a331..5019a1a636 100644 --- a/ssl/s23_lib.c +++ b/ssl/s23_lib.c @@ -78,7 +78,7 @@ static int ssl23_put_cipher_by_char(); static SSL_CIPHER *ssl23_get_cipher_by_char(); #endif -char *SSL23_version_str="SSLv2/3 compatablity part of SSLeay 0.9.1a 06-Jul-1998"; +char *SSL23_version_str="SSLv2/3 compatibility part of SSLeay 0.9.1c 22-Dec-1998"; static SSL_METHOD SSLv23_data= { TLS1_VERSION, diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c index 172fc361cf..deada3261f 100644 --- a/ssl/s2_lib.c +++ b/ssl/s2_lib.c @@ -67,7 +67,7 @@ static long ssl2_default_timeout(void ); static long ssl2_default_timeout(); #endif -char *ssl2_version_str="SSLv2 part of SSLeay 0.9.1a 06-Jul-1998"; +char *ssl2_version_str="SSLv2 part of SSLeay 0.9.1c 22-Dec-1998"; #define SSL2_NUM_CIPHERS (sizeof(ssl2_ciphers)/sizeof(SSL_CIPHER)) diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c index c6c8ea32f1..5ad8b12263 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c @@ -333,7 +333,10 @@ end: static int get_client_master_key(s) SSL *s; { - int export,i,n,keya,error=0,ek; + int export,i,n,keya,ek; +#if 0 + int error=0; +#endif unsigned char *p; SSL_CIPHER *cp; EVP_CIPHER *c; diff --git a/ssl/s3_both.c b/ssl/s3_both.c index 251bcedd7d..487981ef0e 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -243,7 +243,7 @@ X509 *x; X509_STORE_CTX_cleanup(&xs_ctx); } - /* Thwate special :-) */ + /* Thawte special :-) */ if (s->ctx->extra_certs != NULL) for (i=0; ictx->extra_certs); i++) { diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 41b1814070..8bf221a139 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -60,7 +60,7 @@ #include "objects.h" #include "ssl_locl.h" -char *ssl3_version_str="SSLv3 part of SSLeay 0.9.1a 06-Jul-1998"; +char *ssl3_version_str="SSLv3 part of SSLeay 0.9.1c 22-Dec-1998"; #define SSL3_NUM_CIPHERS (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER)) @@ -530,7 +530,7 @@ char *parg; ret=s->s3->total_renegotiations; break; case SSL_CTRL_GET_FLAGS: - ret=s->s3->flags; + ret=(int)(s->s3->flags); break; default: break; @@ -619,7 +619,7 @@ char *parg; cert->dh_tmp_cb=(DH *(*)())parg; break; #endif - /* A Thwate special :-) */ + /* A Thawte special :-) */ case SSL_CTRL_EXTRA_CHAIN_CERT: if (ctx->extra_certs == NULL) { diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 783c079e17..1bff91eaa8 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -69,7 +69,7 @@ int SSL_get_ex_data_X509_STORE_CTX_idx() if (ssl_x509_store_ctx_idx < 0) { ssl_x509_store_ctx_idx=X509_STORE_CTX_get_ex_new_index( - 0,"SSL for verifiy callback",NULL,NULL,NULL); + 0,"SSL for verify callback",NULL,NULL,NULL); } return(ssl_x509_store_ctx_idx); } diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index b16339848b..093ab052e1 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -61,7 +61,7 @@ #include "lhash.h" #include "ssl_locl.h" -char *SSL_version_str="SSLeay 0.9.1a 06-Jul-1998"; +char *SSL_version_str="SSLeay 0.9.1c 22-Dec-1998"; static STACK *ssl_meth=NULL; static STACK *ssl_ctx_meth=NULL; diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 71d4c08c09..cb67d311b1 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -315,7 +315,7 @@ typedef struct ssl3_enc_method int (*alert_value)(); } SSL3_ENC_METHOD; -/* Used for holding the relevent compression methods loaded into SSL_CTX */ +/* Used for holding the relevant compression methods loaded into SSL_CTX */ typedef struct ssl3_comp_st { int comp_id; /* The identifer byte for this compression type */ diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 2a319cd09b..5a22bd62d6 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -60,7 +60,7 @@ #include "objects.h" #include "ssl_locl.h" -char *tls1_version_str="TLSv1 part of SSLeay 0.9.1a 06-Jul-1998"; +char *tls1_version_str="TLSv1 part of SSLeay 0.9.1c 22-Dec-1998"; #ifndef NO_PROTO static long tls1_default_timeout(void); -- cgit v1.2.3