Typo.

[openssl.git] / ssl / s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 12f7ec60b6bfdcd6a622a4adf9098886046d80eb..c41e2548bdbd89ead141e7da579db38e8ba4d42b 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -57,19 +57,16 @@
  */
 
 #include <stdio.h>
-#include "objects.h"
+#include <openssl/md5.h>
+#include <openssl/sha.h>
+#include <openssl/objects.h>
 #include "ssl_locl.h"
 
 const char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;
 
 #define SSL3_NUM_CIPHERS       (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER))
 
-#ifndef NOPROTO
 static long ssl3_default_timeout(void );
-#else
-static long ssl3_default_timeout();
-#endif
-
 SSL_CIPHER ssl3_ciphers[]={
 /* The RSA ciphers */
 /* Cipher 01 */
@@ -640,11 +637,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, char *parg)
                }
                break;
        case SSL_CTRL_SET_TMP_RSA_CB:
-#ifndef NOPROTO
                s->cert->rsa_tmp_cb = (RSA *(*)(SSL *, int, int))parg;
-#else
-               s->cert->rsa_tmp_cb = (RSA *(*)())parg;
-#endif
                break;
 #endif
 #ifndef NO_DH
@@ -671,11 +664,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, char *parg)
                }
                break;
        case SSL_CTRL_SET_TMP_DH_CB:
-#ifndef NOPROTO
                s->cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))parg;
-#else
-               s->cert->dh_tmp_cb = (DH *(*)())parg;
-#endif
                break;
 #endif
        default:
@@ -731,11 +720,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, char *parg)
                }
                /* break; */
        case SSL_CTRL_SET_TMP_RSA_CB:
-#ifndef NOPROTO
                cert->rsa_tmp_cb=(RSA *(*)(SSL *, int, int))parg;
-#else
-               cert->rsa_tmp_cb=(RSA *(*)())parg;
-#endif
                break;
 #endif
 #ifndef NO_DH
@@ -762,11 +747,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, char *parg)
                }
                /*break; */
        case SSL_CTRL_SET_TMP_DH_CB:
-#ifndef NOPROTO
                cert->dh_tmp_cb=(DH *(*)(SSL *, int, int))parg;
-#else
-               cert->dh_tmp_cb=(DH *(*)())parg;
-#endif
                break;
 #endif
        /* A Thawte special :-) */
@@ -992,7 +973,7 @@ int ssl3_shutdown(SSL *s)
                return(0);
        }
 
-int ssl3_write(SSL *s, const char *buf, int len)
+int ssl3_write(SSL *s, const void *buf, int len)
        {
        int ret,n;
 
@@ -1045,7 +1026,7 @@ int ssl3_write(SSL *s, const char *buf, int len)
        return(ret);
        }
 
-int ssl3_read(SSL *s, char *buf, int len)
+int ssl3_read(SSL *s, void *buf, int len)
        {
        int ret;