Initial support for certificate purpose checking: this will

[openssl.git] / ssl / s23_lib.c

diff --git a/ssl/s23_lib.c b/ssl/s23_lib.c
index c4064726fb0bc2c1e93e1e8faf1fcdd44811a98e..822a3958372d0335ef4eef33625056b95e63c54e 100644 (file)
--- a/ssl/s23_lib.c
+++ b/ssl/s23_lib.c
@@ -57,10 +57,9 @@
  */
 
 #include <stdio.h>
-#include "objects.h"
+#include <openssl/objects.h>
 #include "ssl_locl.h"
 
-#ifndef NOPROTO
 static int ssl23_num_ciphers(void );
 static SSL_CIPHER *ssl23_get_cipher(unsigned int u);
 static int ssl23_read(SSL *s, void *buf, int len);
@@ -68,16 +67,6 @@ static int ssl23_write(SSL *s, const void *buf, int len);
 static long ssl23_default_timeout(void );
 static int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p);
 static SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p);
-#else
-static int ssl23_num_ciphers();
-static SSL_CIPHER *ssl23_get_cipher();
-static int ssl23_read();
-static int ssl23_write();
-static long ssl23_default_timeout();
-static int ssl23_put_cipher_by_char();
-static SSL_CIPHER *ssl23_get_cipher_by_char();
-#endif
-
 char *SSL23_version_str="SSLv2/3 compatibility" OPENSSL_VERSION_PTEXT;
 
 static SSL_METHOD SSLv23_data= {
@@ -88,7 +77,7 @@ static SSL_METHOD SSLv23_data= {
        ssl_undefined_function,
        ssl_undefined_function,
        ssl23_read,
-        (int (*)(struct ssl_st *, char *, int))ssl_undefined_function,
+       (int (*)(struct ssl_st *, char *, int))ssl_undefined_function,
        ssl23_write,
        ssl_undefined_function,
        ssl_undefined_function,