diff options
| author |   markus <markus@openbsd.org> | 2002-09-14 11:18:01 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2002-09-14 11:18:01 +0000 |
| commit | cf5de1f602bfe31a1de0d5bcba280f0bf0a50ae2 (patch) | |
| tree | 2658bb71397039b6e8ea6265a0bfe5a109de2a64 /lib/libssl/ssl_locl.h | |
| parent | spaces (diff) | |
| download | wireguard-openbsd-cf5de1f602bfe31a1de0d5bcba280f0bf0a50ae2.tar.xz wireguard-openbsd-cf5de1f602bfe31a1de0d5bcba280f0bf0a50ae2.zip | |
merge with openssl-0.9.7-stable-SNAP-20020911,
new minor for libcrypto (_X509_REQ_print_ex)
tested by miod@, pb@
Diffstat (limited to 'lib/libssl/ssl_locl.h')
| -rw-r--r-- | lib/libssl/ssl_locl.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h index 4c77e27acca..dd6c7a7323f 100644 --- a/lib/libssl/ssl_locl.h +++ b/lib/libssl/ssl_locl.h @@ -510,7 +510,7 @@ STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s); int ssl_verify_alarm_type(long type); int ssl2_enc_init(SSL *s, int client); -void ssl2_generate_key_material(SSL *s); +int ssl2_generate_key_material(SSL *s); void ssl2_enc(SSL *s,int send_data); void ssl2_mac(SSL *s,unsigned char *mac,int send_data); SSL_CIPHER *ssl2_get_cipher_by_char(const unsigned char *p); @@ -616,8 +616,5 @@ int ssl_ok(SSL *s); SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n); STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void); -/* die if we have to */ -void OpenSSLDie(const char *file,int line,const char *assertion); -#define die(e) ((e) ? (void)0 : OpenSSLDie(__FILE__, __LINE__, #e)) #endif |