More prototypes.

[openssl.git] / ssl / s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 41b18140707ee9736165e94ce0e9f4be7caeb500..495c1c334fe4b21c3fe5891581a60ac920d963b0 100644 (file)
--- 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 OpenSSL 0.9.2 31-Dec-1998";
 
 #define SSL3_NUM_CIPHERS       (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER))
 
@@ -456,6 +456,9 @@ err:
 void ssl3_free(s)
 SSL *s;
        {
+       if(s == NULL)
+           return;
+
        ssl3_cleanup_key_block(s);
        if (s->s3->rbuf.buf != NULL)
                Free(s->s3->rbuf.buf);
@@ -530,7 +533,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 +622,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)
                        {
@@ -638,7 +641,7 @@ char *parg;
 /* This function needs to check if the ciphers required are actually
  * available */
 SSL_CIPHER *ssl3_get_cipher_by_char(p)
-unsigned char *p;
+const unsigned char *p;
        {
        static int init=1;
        static SSL_CIPHER *sorted[SSL3_NUM_CIPHERS];
@@ -671,7 +674,7 @@ unsigned char *p;
        }
 
 int ssl3_put_cipher_by_char(c,p)
-SSL_CIPHER *c;
+const SSL_CIPHER *c;
 unsigned char *p;
        {
        long l;
@@ -837,7 +840,7 @@ SSL *s;
 
 int ssl3_write(s,buf,len)
 SSL *s;
-char *buf;
+const char *buf;
 int len;
        {
        int ret,n;