diff options
author | guenther <> | 2014-04-19 10:59:54 +0000 |
---|---|---|
committer | guenther <> | 2014-04-19 10:59:54 +0000 |
commit | 39f58005c632334ca4cbd61a02d0582f84dce505 (patch) | |
tree | bab0f489794093e246f8a10d42983cbc29f1748e /src | |
parent | 31b6140ba0edafd20b0588bc37e5d019bea48af0 (diff) | |
download | openbsd-39f58005c632334ca4cbd61a02d0582f84dce505.tar.gz openbsd-39f58005c632334ca4cbd61a02d0582f84dce505.tar.bz2 openbsd-39f58005c632334ca4cbd61a02d0582f84dce505.zip |
The internal ssl2_* functions and variables are gone
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/src/ssl/ssl_locl.h | 30 | ||||
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 30 |
2 files changed, 0 insertions, 60 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h index 5767c1dd4b..ebc942b146 100644 --- a/src/lib/libssl/src/ssl/ssl_locl.h +++ b/src/lib/libssl/src/ssl/ssl_locl.h | |||
@@ -587,7 +587,6 @@ typedef struct ssl3_comp_st { | |||
587 | #endif | 587 | #endif |
588 | 588 | ||
589 | extern SSL3_ENC_METHOD ssl3_undef_enc_method; | 589 | extern SSL3_ENC_METHOD ssl3_undef_enc_method; |
590 | OPENSSL_EXTERN const SSL_CIPHER ssl2_ciphers[]; | ||
591 | OPENSSL_EXTERN SSL_CIPHER ssl3_ciphers[]; | 590 | OPENSSL_EXTERN SSL_CIPHER ssl3_ciphers[]; |
592 | 591 | ||
593 | 592 | ||
@@ -791,35 +790,6 @@ int ssl_verify_alarm_type(long type); | |||
791 | void ssl_load_ciphers(void); | 790 | void ssl_load_ciphers(void); |
792 | int ssl_fill_hello_random(SSL *s, int server, unsigned char *field, int len); | 791 | int ssl_fill_hello_random(SSL *s, int server, unsigned char *field, int len); |
793 | 792 | ||
794 | int ssl2_enc_init(SSL *s, int client); | ||
795 | int ssl2_generate_key_material(SSL *s); | ||
796 | void ssl2_enc(SSL *s, int send_data); | ||
797 | void ssl2_mac(SSL *s, unsigned char *mac, int send_data); | ||
798 | const SSL_CIPHER *ssl2_get_cipher_by_char(const unsigned char *p); | ||
799 | int ssl2_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p); | ||
800 | int ssl2_part_read(SSL *s, unsigned long f, int i); | ||
801 | int ssl2_do_write(SSL *s); | ||
802 | int ssl2_set_certificate(SSL *s, int type, int len, const unsigned char *data); | ||
803 | void ssl2_return_error(SSL *s, int reason); | ||
804 | void ssl2_write_error(SSL *s); | ||
805 | int ssl2_num_ciphers(void); | ||
806 | const SSL_CIPHER *ssl2_get_cipher(unsigned int u); | ||
807 | int ssl2_new(SSL *s); | ||
808 | void ssl2_free(SSL *s); | ||
809 | int ssl2_accept(SSL *s); | ||
810 | int ssl2_connect(SSL *s); | ||
811 | int ssl2_read(SSL *s, void *buf, int len); | ||
812 | int ssl2_peek(SSL *s, void *buf, int len); | ||
813 | int ssl2_write(SSL *s, const void *buf, int len); | ||
814 | int ssl2_shutdown(SSL *s); | ||
815 | void ssl2_clear(SSL *s); | ||
816 | long ssl2_ctrl(SSL *s, int cmd, long larg, void *parg); | ||
817 | long ssl2_ctx_ctrl(SSL_CTX *s, int cmd, long larg, void *parg); | ||
818 | long ssl2_callback_ctrl(SSL *s, int cmd, void (*fp)(void)); | ||
819 | long ssl2_ctx_callback_ctrl(SSL_CTX *s, int cmd, void (*fp)(void)); | ||
820 | int ssl2_pending(const SSL *s); | ||
821 | long ssl2_default_timeout(void ); | ||
822 | |||
823 | const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p); | 793 | const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p); |
824 | int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p); | 794 | int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p); |
825 | void ssl3_init_finished_mac(SSL *s); | 795 | void ssl3_init_finished_mac(SSL *s); |
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 5767c1dd4b..ebc942b146 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -587,7 +587,6 @@ typedef struct ssl3_comp_st { | |||
587 | #endif | 587 | #endif |
588 | 588 | ||
589 | extern SSL3_ENC_METHOD ssl3_undef_enc_method; | 589 | extern SSL3_ENC_METHOD ssl3_undef_enc_method; |
590 | OPENSSL_EXTERN const SSL_CIPHER ssl2_ciphers[]; | ||
591 | OPENSSL_EXTERN SSL_CIPHER ssl3_ciphers[]; | 590 | OPENSSL_EXTERN SSL_CIPHER ssl3_ciphers[]; |
592 | 591 | ||
593 | 592 | ||
@@ -791,35 +790,6 @@ int ssl_verify_alarm_type(long type); | |||
791 | void ssl_load_ciphers(void); | 790 | void ssl_load_ciphers(void); |
792 | int ssl_fill_hello_random(SSL *s, int server, unsigned char *field, int len); | 791 | int ssl_fill_hello_random(SSL *s, int server, unsigned char *field, int len); |
793 | 792 | ||
794 | int ssl2_enc_init(SSL *s, int client); | ||
795 | int ssl2_generate_key_material(SSL *s); | ||
796 | void ssl2_enc(SSL *s, int send_data); | ||
797 | void ssl2_mac(SSL *s, unsigned char *mac, int send_data); | ||
798 | const SSL_CIPHER *ssl2_get_cipher_by_char(const unsigned char *p); | ||
799 | int ssl2_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p); | ||
800 | int ssl2_part_read(SSL *s, unsigned long f, int i); | ||
801 | int ssl2_do_write(SSL *s); | ||
802 | int ssl2_set_certificate(SSL *s, int type, int len, const unsigned char *data); | ||
803 | void ssl2_return_error(SSL *s, int reason); | ||
804 | void ssl2_write_error(SSL *s); | ||
805 | int ssl2_num_ciphers(void); | ||
806 | const SSL_CIPHER *ssl2_get_cipher(unsigned int u); | ||
807 | int ssl2_new(SSL *s); | ||
808 | void ssl2_free(SSL *s); | ||
809 | int ssl2_accept(SSL *s); | ||
810 | int ssl2_connect(SSL *s); | ||
811 | int ssl2_read(SSL *s, void *buf, int len); | ||
812 | int ssl2_peek(SSL *s, void *buf, int len); | ||
813 | int ssl2_write(SSL *s, const void *buf, int len); | ||
814 | int ssl2_shutdown(SSL *s); | ||
815 | void ssl2_clear(SSL *s); | ||
816 | long ssl2_ctrl(SSL *s, int cmd, long larg, void *parg); | ||
817 | long ssl2_ctx_ctrl(SSL_CTX *s, int cmd, long larg, void *parg); | ||
818 | long ssl2_callback_ctrl(SSL *s, int cmd, void (*fp)(void)); | ||
819 | long ssl2_ctx_callback_ctrl(SSL_CTX *s, int cmd, void (*fp)(void)); | ||
820 | int ssl2_pending(const SSL *s); | ||
821 | long ssl2_default_timeout(void ); | ||
822 | |||
823 | const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p); | 793 | const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p); |
824 | int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p); | 794 | int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p); |
825 | void ssl3_init_finished_mac(SSL *s); | 795 | void ssl3_init_finished_mac(SSL *s); |