Puhhh... now we've documented the prototypes of all 214 API "functions". This

is a pain to do, because of the various macro definitions which I had to
expand manually to get their prototype :-(

What's now needed is a volunteer who wants to write down one or two sentences
per API function to document it a little bit...

diff --git a/doc/ssl.pod b/doc/ssl.pod
index 558d0b5bbd8904b07f4579fd6e751c8a953cfa0f..d992117ffca28f0c36fcdf0e81ada1c33067ddb7 100644 (file)
--- a/doc/ssl.pod
+++ b/doc/ssl.pod
@@ -52,25 +52,11 @@ a server or client per established connection.
 
 =head1 FUNCTIONS
 
-Currently the OpenSSL B<ssl> library exports 143 API functions.
+Currently the OpenSSL B<ssl> library exports 214 API functions.
 They are documented in the following:
 
 =over 4
 
-=item [MACRO] B<SSL_ADH>(SSL_kEDH|SSL_aNULL);
-
-=item [MACRO] B<SSL_CB_ACCEPT_EXIT>(SSL_ST_ACCEPT|SSL_CB_EXIT);
-
-=item [MACRO] B<SSL_CB_ACCEPT_LOOP>(SSL_ST_ACCEPT|SSL_CB_LOOP);
-
-=item [MACRO] B<SSL_CB_CONNECT_EXIT>(SSL_ST_CONNECT|SSL_CB_EXIT);
-
-=item [MACRO] B<SSL_CB_CONNECT_LOOP>(SSL_ST_CONNECT|SSL_CB_LOOP);
-
-=item [MACRO] B<SSL_CB_READ_ALERT>(SSL_CB_ALERT|SSL_CB_READ);
-
-=item [MACRO] B<SSL_CB_WRITE_ALERT>(SSL_CB_ALERT|SSL_CB_WRITE);
-
 =item char *B<SSL_CIPHER_description>(SSL_CIPHER *cipher, char *buf, int len);
 
 =item int B<SSL_CIPHER_get_bits>(SSL_CIPHER *c, int *alg_bits);
@@ -81,7 +67,7 @@ They are documented in the following:
 
 =item int B<SSL_CTX_add_client_CA>(SSL_CTX *ctx, X509 *x);
 
-=item [MACRO] B<SSL_CTX_add_extra_chain_cert>(ctx,x509);
+=item long B<SSL_CTX_add_extra_chain_cert>(SSL_CTX *ctx, X509 *x509);
 
 =item int B<SSL_CTX_add_session>(SSL_CTX *ctx, SSL_SESSION *c);
 
@@ -93,123 +79,119 @@ They are documented in the following:
 
 =item void B<SSL_CTX_free>(SSL_CTX *a);
 
-=item [MACRO] B<SSL_CTX_get_app_data>(ctx);
+=item char *B<SSL_CTX_get_app_data>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_get_cert_store>(ctx);
+=item X509_STORE *B<SSL_CTX_get_cert_store>(SSL_CTX *ctx);
 
 =item STACK *B<SSL_CTX_get_client_CA_list>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_get_client_cert_cb>(ctx);
+=item int (*B<SSL_CTX_get_client_cert_cb>(SSL_CTX *ctx))(SSL *ssl, X509 **x509, EVP_PKEY **pkey);
 
 =item char *B<SSL_CTX_get_ex_data>(SSL_CTX *s, int idx);
 
 =item int B<SSL_CTX_get_ex_new_index>(long argl, char *argp, int (*new_func);(void), int (*dup_func)(void), void (*free_func)(void))
 
-=item [MACRO] B<SSL_CTX_get_info_callback>(ctx);
+=item void (*B<SSL_CTX_get_info_callback>(SSL_CTX *ctx))(SSL *ssl, int cb, int ret);
 
 =item int B<SSL_CTX_get_quiet_shutdown>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_get_session_cache_mode>(ctx);
+=item int B<SSL_CTX_get_session_cache_mode>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_get_timeout>(ctx);
+=item long B<SSL_CTX_get_timeout>(SSL_CTX *ctx);
 
-=item int (*B<SSL_CTX_get_verify_callback>(SSL_CTX *ctx);)(void)
+=item int (*B<SSL_CTX_get_verify_callback>(SSL_CTX *ctx))(int ok, X509_STORE_CTX *ctx);
 
 =item int B<SSL_CTX_get_verify_mode>(SSL_CTX *ctx);
 
 =item int B<SSL_CTX_load_verify_locations>(SSL_CTX *ctx, char *CAfile, char *CApath);
 
-=item [MACRO] B<SSL_CTX_need_tmp_RSA>(ctx);
+=item long B<SSL_CTX_need_tmp_RSA>(SSL_CTX *ctx);
 
 =item SSL_CTX *B<SSL_CTX_new>(SSL_METHOD *meth);
 
 =item int B<SSL_CTX_remove_session>(SSL_CTX *ctx, SSL_SESSION *c);
 
-=item [MACRO] B<SSL_CTX_sess_accept>(ctx);
-
-=item [MACRO] B<SSL_CTX_sess_accept_good>(ctx);
+=item int B<SSL_CTX_sess_accept>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_sess_accept_renegotiate>(ctx);
+=item int B<SSL_CTX_sess_accept_good>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_sess_cache_full>(ctx);
+=item int B<SSL_CTX_sess_accept_renegotiate>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_sess_cb_hits>(ctx);
+=item int B<SSL_CTX_sess_cache_full>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_sess_connect>(ctx);
+=item int B<SSL_CTX_sess_cb_hits>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_sess_connect_good>(ctx);
+=item int B<SSL_CTX_sess_connect>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_sess_connect_renegotiate>(ctx);
+=item int B<SSL_CTX_sess_connect_good>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_sess_get_cache_size>(ctx);
+=item int B<SSL_CTX_sess_connect_renegotiate>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_sess_get_get_cb>(ctx);
+=item int B<SSL_CTX_sess_get_cache_size>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_sess_get_new_cb>(ctx);
+=item SSL_SESSION *(*B<SSL_CTX_sess_get_get_cb>(SSL_CTX *ctx))(SSL *ssl, unsigned char *data, int len, int *copy);
 
-=item [MACRO] B<SSL_CTX_sess_get_remove_cb>(ctx);
+=item int (*B<SSL_CTX_sess_get_new_cb>(SSL_CTX *ctx)(SSL *ssl, SSL_SESSION *sess);
 
-=item [MACRO] B<SSL_CTX_sess_hits>(ctx);
+=item void (*B<SSL_CTX_sess_get_remove_cb>(SSL_CTX *ctx)(SSL_CTX *ctx, SSL_SESSION *sess);
 
-=item [MACRO] B<SSL_CTX_sess_misses>(ctx);
+=item int B<SSL_CTX_sess_hits>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_sess_number>(ctx);
+=item int B<SSL_CTX_sess_misses>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_sess_set_cache_size>(ctx,t);
+=item int B<SSL_CTX_sess_number>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_sess_set_get_cb>(ctx,cb);
+=item void B<SSL_CTX_sess_set_cache_size>(SSL_CTX *ctx,t);
 
-=item [MACRO] B<SSL_CTX_sess_set_new_cb>(ctx,cb);
+=item void B<SSL_CTX_sess_set_get_cb>(SSL_CTX *ctx, SSL_SESSION *(*cb)(SSL *ssl, unsigned char *data, int len, int *copy));
 
-=item [MACRO] B<SSL_CTX_sess_set_remove_cb>(ctx,cb);
+=item void B<SSL_CTX_sess_set_new_cb>(SSL_CTX *ctx, int (*cb)(SSL *ssl, SSL_SESSION *sess));
 
-=item [MACRO] B<SSL_CTX_sess_timeouts>(ctx);
+=item void B<SSL_CTX_sess_set_remove_cb>(SSL_CTX *ctx, void (*cb)(SSL_CTX *ctx, SSL_SESSION *sess));
 
-=item [MACRO] B<SSL_CTX_sessions>(ctx);
+=item int B<SSL_CTX_sess_timeouts>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_set_app_data>(ctx,arg);
+=item LHASH *B<SSL_CTX_sessions>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_CTX_set_cert_store>(ctx,cs);
+=item void B<SSL_CTX_set_app_data>(SSL_CTX *ctx, void *arg);
 
-=item [MACRO] B<SSL_CTX_set_cert_verify_callback>(a,b,c);
+=item void B<SSL_CTX_set_cert_store>(SSL_CTX *ctx, X509_STORE *cs);
 
-=item void B<SSL_CTX_set_cert_verify_cb>(SSL_CTX *ctx, int (*cb);(void), char *arg)
+=item void B<SSL_CTX_set_cert_verify_cb>(SSL_CTX *ctx, int (*cb)(SSL_CTX *), char *arg)
 
 =item int B<SSL_CTX_set_cipher_list>(SSL_CTX *ctx, char *str);
 
 =item void B<SSL_CTX_set_client_CA_list>(SSL_CTX *ctx, STACK *list);
 
-=item [MACRO] B<SSL_CTX_set_client_cert_cb>(ctx,cb);
+=item void B<SSL_CTX_set_client_cert_cb>(SSL_CTX *ctx, int (*cb)(SSL *ssl, X509 **x509, EVP_PKEY **pkey));
 
 =item void B<SSL_CTX_set_default_passwd_cb>(SSL_CTX *ctx, int (*cb);(void))
 
-=item [MACRO] B<SSL_CTX_set_default_read_ahead>(ctx,m);
-
-=item [MACRO] B<SSL_CTX_set_default_verify>(a,b,c);
+=item void B<SSL_CTX_set_default_read_ahead>(SSL_CTX *ctx, int m);
 
 =item int B<SSL_CTX_set_default_verify_paths>(SSL_CTX *ctx);
 
 =item int B<SSL_CTX_set_ex_data>(SSL_CTX *s, int idx, char *arg);
 
-=item [MACRO] B<SSL_CTX_set_info_callback>(ctx,cb);
+=item void B<SSL_CTX_set_info_callback>(SSL_CTX *ctx, void (*cb)(SSL *ssl, int cb, int ret));
 
-=item [MACRO] B<SSL_CTX_set_options>(ctx,op);
+=item void B<SSL_CTX_set_options>(SSL_CTX *ctx, unsigned long op);
 
 =item void B<SSL_CTX_set_quiet_shutdown>(SSL_CTX *ctx, int mode);
 
-=item [MACRO] B<SSL_CTX_set_session_cache_mode>(ctx,m);
+=item void B<SSL_CTX_set_session_cache_mode>(SSL_CTX *ctx, int mode);
 
 =item int B<SSL_CTX_set_ssl_version>(SSL_CTX *ctx, SSL_METHOD *meth);
 
-=item [MACRO] B<SSL_CTX_set_timeout>(ctx,t);
+=item void B<SSL_CTX_set_timeout>(SSL_CTX *ctx, long t);
 
-=item [MACRO] B<SSL_CTX_set_tmp_dh>(ctx,dh);
+=item long B<SSL_CTX_set_tmp_dh>(SSL_CTX* ctx, DH *dh);
 
-=item [MACRO] B<SSL_CTX_set_tmp_dh_callback>(ctx,dh);
+=item long B<SSL_CTX_set_tmp_dh_callback>(SSL_CTX *ctx, DH *(*cb)(void));
 
-=item [MACRO] B<SSL_CTX_set_tmp_rsa>(ctx,rsa);
+=item long B<SSL_CTX_set_tmp_rsa>(SSL_CTX *ctx, RSA *rsa);
 
-=item [MACRO] B<SSL_CTX_set_tmp_rsa_callback>(ctx,cb);
+=item long B<SSL_CTX_set_tmp_rsa_callback>(SSL_CTX *ctx, RSA *(*cb)(void));
 
 =item void B<SSL_CTX_set_verify>(SSL_CTX *ctx, int mode, int (*cb);(void))
 
@@ -231,25 +213,11 @@ They are documented in the following:
 
 =item int B<SSL_CTX_use_certificate_file>(SSL_CTX *ctx, char *file, int type);
 
-=item [MACRO] B<SSL_DH>(SSL_kDHr|SSL_kDHd|SSL_kEDH);
-
-=item [MACRO] B<SSL_EDH>(SSL_kEDH|(SSL_AUTH_MASK^SSL_aNULL);
-
-=item [MACRO] B<SSL_FZA>(SSL_aFZA|SSL_kFZA|SSL_eFZA);
-
-=item [MACRO] B<SSL_MIN_RSA_MODULUS_LENGTH_IN_BYTES>(512/8);
-
-=item [MACRO] B<SSL_NULL>(SSL_eNULL);
-
-=item [MACRO] B<SSL_RSA>(SSL_kRSA|SSL_aRSA);
-
-=item [MACRO] B<SSL_SESSION_CACHE_MAX_SIZE_DEFAULT>(1024*20);
-
 =item int B<SSL_SESSION_cmp>(SSL_SESSION *a, SSL_SESSION *b);
 
 =item void B<SSL_SESSION_free>(SSL_SESSION *ss);
 
-=item [MACRO] B<SSL_SESSION_get_app_data>(s);
+=item char *B<SSL_SESSION_get_app_data>(SSL_SESSION *s);
 
 =item char *B<SSL_SESSION_get_ex_data>(SSL_SESSION *s, int idx);
 
@@ -267,7 +235,7 @@ They are documented in the following:
 
 =item int B<SSL_SESSION_print_fp>(FILE *fp, SSL_SESSION *x);
 
-=item [MACRO] B<SSL_SESSION_set_app_data>(s,a);
+=item void B<SSL_SESSION_set_app_data>(SSL_SESSION *s, char *a);
 
 =item int B<SSL_SESSION_set_ex_data>(SSL_SESSION *s, int idx, char *arg);
 
@@ -275,20 +243,10 @@ They are documented in the following:
 
 =item long B<SSL_SESSION_set_timeout>(SSL_SESSION *s, long t);
 
-=item [MACRO] B<SSL_SESS_CACHE_BOTH>(SSL_SESS_CACHE_CLIENT|SSL_SESS_CACHE_SERVER);
-
-=item [MACRO] B<SSL_SHA>(SSL_SHA1);
-
-=item [MACRO] B<SSL_ST_INIT>(SSL_ST_CONNECT|SSL_ST_ACCEPT);
-
-=item [MACRO] B<SSL_ST_RENEGOTIATE>(0x04|SSL_ST_INIT);
-
-=item int B<SSL_accept>(SSL *s);
+=item int B<SSL_accept>(SSL *ssl);
 
 =item int B<SSL_add_client_CA>(SSL *ssl, X509 *x);
 
-=item [MACRO] B<SSL_add_session>(a,b);
-
 =item char *B<SSL_alert_desc_string>(int value);
 
 =item char *B<SSL_alert_desc_string_long>(int value);
@@ -299,107 +257,105 @@ They are documented in the following:
 
 =item int B<SSL_check_private_key>(SSL *ssl);
 
-=item void B<SSL_clear>(SSL *s);
+=item void B<SSL_clear>(SSL *ssl);
 
-=item [MACRO] B<SSL_clear_num_renegotiations>(ssl);
+=item long B<SSL_clear_num_renegotiations>(SSL *ssl);
 
-=item int B<SSL_connect>(SSL *s);
+=item int B<SSL_connect>(SSL *ssl);
 
 =item void B<SSL_copy_session_id>(SSL *t, SSL *f);
 
-=item long B<SSL_ctrl>(SSL *s, int cmd, long larg, char *parg);
+=item long B<SSL_ctrl>(SSL *ssl, int cmd, long larg, char *parg);
 
-=item int B<SSL_do_handshake>(SSL *s);
+=item int B<SSL_do_handshake>(SSL *ssl);
 
-=item SSL *B<SSL_dup>(SSL *s);
+=item SSL *B<SSL_dup>(SSL *ssl);
 
 =item STACK *B<SSL_dup_CA_list>(STACK *sk);
 
-=item [MACRO] B<SSL_flush_sessions>(a,b);
-
-=item void B<SSL_free>(SSL *s);
+=item void B<SSL_free>(SSL *ssl);
 
 =item SSL_CTX *B<SSL_get_SSL_CTX>(SSL *ssl);
 
-=item [MACRO] B<SSL_get_app_data>(s);
+=item char *B<SSL_get_app_data>(SSL *ssl);
 
-=item X509 *B<SSL_get_certificate>(SSL *s);
+=item X509 *B<SSL_get_certificate>(SSL *ssl);
 
-=item [MACRO] B<SSL_get_cipher>(s);
+=item SSL_CIPHER *B<SSL_get_cipher>(SSL *ssl);
 
-=item [MACRO] B<SSL_get_cipher_bits>(s,np);
+=item int B<SSL_get_cipher_bits>(SSL *ssl, int *alg_bits);
 
-=item char *B<SSL_get_cipher_list>(SSL *s, int n);
+=item char *B<SSL_get_cipher_list>(SSL *ssl, int n);
 
-=item [MACRO] B<SSL_get_cipher_name>(s);
+=item char *B<SSL_get_cipher_name>(SSL *ssl);
 
-=item [MACRO] B<SSL_get_cipher_version>(s);
+=item char *B<SSL_get_cipher_version>(SSL *ssl);
 
-=item STACK *B<SSL_get_ciphers>(SSL *s);
+=item STACK *B<SSL_get_ciphers>(SSL *ssl);
 
-=item STACK *B<SSL_get_client_CA_list>(SSL *s);
+=item STACK *B<SSL_get_client_CA_list>(SSL *ssl);
 
-=item SSL_CIPHER *B<SSL_get_current_cipher>(SSL *s);
+=item SSL_CIPHER *B<SSL_get_current_cipher>(SSL *ssl);
 
-=item long B<SSL_get_default_timeout>(SSL *s);
+=item long B<SSL_get_default_timeout>(SSL *ssl);
 
-=item int B<SSL_get_error>(SSL *s, int i);
+=item int B<SSL_get_error>(SSL *ssl, int i);
 
-=item char *B<SSL_get_ex_data>(SSL *s, int idx);
+=item char *B<SSL_get_ex_data>(SSL *ssl, int idx);
 
 =item int B<SSL_get_ex_data_X509_STORE_CTX_idx>(void);
 
 =item int B<SSL_get_ex_new_index>(long argl, char *argp, int (*new_func);(void), int (*dup_func)(void), void (*free_func)(void))
 
-=item int B<SSL_get_fd>(SSL *s);
+=item int B<SSL_get_fd>(SSL *ssl);
 
 =item void (*B<SSL_get_info_callback>(SSL *ssl);)(void)
 
-=item STACK *B<SSL_get_peer_cert_chain>(SSL *s);
+=item STACK *B<SSL_get_peer_cert_chain>(SSL *ssl);
 
-=item X509 *B<SSL_get_peer_certificate>(SSL *s);
+=item X509 *B<SSL_get_peer_certificate>(SSL *ssl);
 
-=item EVP_PKEY *B<SSL_get_privatekey>(SSL *s);
+=item EVP_PKEY *B<SSL_get_privatekey>(SSL *ssl);
 
-=item int B<SSL_get_quiet_shutdown>(SSL *s);
+=item int B<SSL_get_quiet_shutdown>(SSL *ssl);
 
-=item BIO *B<SSL_get_rbio>(SSL *s);
+=item BIO *B<SSL_get_rbio>(SSL *ssl);
 
-=item int B<SSL_get_read_ahead>(SSL *s);
+=item int B<SSL_get_read_ahead>(SSL *ssl);
 
 =item SSL_SESSION *B<SSL_get_session>(SSL *ssl);
 
-=item char *B<SSL_get_shared_ciphers>(SSL *s, char *buf, int len);
+=item char *B<SSL_get_shared_ciphers>(SSL *ssl, char *buf, int len);
 
-=item int B<SSL_get_shutdown>(SSL *s);
+=item int B<SSL_get_shutdown>(SSL *ssl);
 
-=item SSL_METHOD *B<SSL_get_ssl_method>(SSL *s);
+=item SSL_METHOD *B<SSL_get_ssl_method>(SSL *ssl);
 
-=item [MACRO] B<SSL_get_state>(a);
+=item int B<SSL_get_state>(SSL *ssl);
 
-=item [MACRO] B<SSL_get_time>(a);
+=item long B<SSL_get_time>(SSL *ssl);
 
-=item [MACRO] B<SSL_get_timeout>(a);
+=item long B<SSL_get_timeout>(SSL *ssl);
 
-=item int (*B<SSL_get_verify_callback>(SSL *s);)(void)
+=item int (*B<SSL_get_verify_callback>(SSL *ssl);)(void)
 
-=item int B<SSL_get_verify_mode>(SSL *s);
+=item int B<SSL_get_verify_mode>(SSL *ssl);
 
 =item long B<SSL_get_verify_result>(SSL *ssl);
 
-=item char *B<SSL_get_version>(SSL *s);
+=item char *B<SSL_get_version>(SSL *ssl);
 
-=item BIO *B<SSL_get_wbio>(SSL *s);
+=item BIO *B<SSL_get_wbio>(SSL *ssl);
 
-=item [MACRO] B<SSL_in_accept_init>(a);
+=item int B<SSL_in_accept_init>(SSL *ssl);
 
-=item [MACRO] B<SSL_in_before>(a);
+=item int B<SSL_in_before>(SSL *ssl);
 
-=item [MACRO] B<SSL_in_connect_init>(a);
+=item int B<SSL_in_connect_init>(SSL *ssl);
 
-=item [MACRO] B<SSL_in_init>(a);
+=item int B<SSL_in_init>(SSL *ssl);
 
-=item [MACRO] B<SSL_is_init_finished>(a);
+=item int B<SSL_is_init_finished>(SSL *ssl);
 
 =item STACK *B<SSL_load_client_CA_file>(char *file);
 
@@ -407,77 +363,73 @@ They are documented in the following:
 
 =item SSL *B<SSL_new>(SSL_CTX *ctx);
 
-=item [MACRO] B<SSL_num_renegotiations>(ssl);
-
-=item int B<SSL_peek>(SSL *s, char *buf, int num);
+=item long B<SSL_num_renegotiations>(SSL *ssl);
 
-=item int B<SSL_pending>(SSL *s);
+=item int B<SSL_peek>(SSL *ssl, char *buf, int num);
 
-=item int B<SSL_read>(SSL *s, char *buf, int num);
+=item int B<SSL_pending>(SSL *ssl);
 
-=item [MACRO] B<SSL_remove_session>(a,b);
+=item int B<SSL_read>(SSL *ssl, char *buf, int num);
 
-=item int B<SSL_renegotiate>(SSL *s);
+=item int B<SSL_renegotiate>(SSL *ssl);
 
-=item char *B<SSL_rstate_string>(SSL *s);
+=item char *B<SSL_rstate_string>(SSL *ssl);
 
-=item char *B<SSL_rstate_string_long>(SSL *s);
+=item char *B<SSL_rstate_string_long>(SSL *ssl);
 
-=item [MACRO] B<SSL_session_reused>(ssl);
+=item long B<SSL_session_reused>(SSL *ssl);
 
-=item void B<SSL_set_accept_state>(SSL *s);
+=item void B<SSL_set_accept_state>(SSL *ssl);
 
-=item [MACRO] B<SSL_set_app_data>(s,arg);
+=item void B<SSL_set_app_data>(SSL *ssl, char *arg);
 
-=item void B<SSL_set_bio>(SSL *s, BIO *rbio, BIO *wbio);
+=item void B<SSL_set_bio>(SSL *ssl, BIO *rbio, BIO *wbio);
 
-=item int B<SSL_set_cipher_list>(SSL *s, char *str);
+=item int B<SSL_set_cipher_list>(SSL *ssl, char *str);
 
-=item void B<SSL_set_client_CA_list>(SSL *s, STACK *list);
+=item void B<SSL_set_client_CA_list>(SSL *ssl, STACK *list);
 
-=item void B<SSL_set_connect_state>(SSL *s);
+=item void B<SSL_set_connect_state>(SSL *ssl);
 
-=item int B<SSL_set_ex_data>(SSL *s, int idx, char *arg);
+=item int B<SSL_set_ex_data>(SSL *ssl, int idx, char *arg);
 
-=item int B<SSL_set_fd>(SSL *s, int fd);
+=item int B<SSL_set_fd>(SSL *ssl, int fd);
 
 =item void B<SSL_set_info_callback>(SSL *ssl, void (*cb);(void))
 
-=item [MACRO] B<SSL_set_options>(ssl,op);
-
-=item [MACRO] B<SSL_set_pref_cipher>(c,n);
+=item void B<SSL_set_options>(SSL *ssl, unsigned long op);
 
-=item void B<SSL_set_quiet_shutdown>(SSL *s, int mode);
+=item void B<SSL_set_quiet_shutdown>(SSL *ssl, int mode);
 
-=item void B<SSL_set_read_ahead>(SSL *s, int yes);
+=item void B<SSL_set_read_ahead>(SSL *ssl, int yes);
 
-=item int B<SSL_set_rfd>(SSL *s, int fd);
+=item int B<SSL_set_rfd>(SSL *ssl, int fd);
 
-=item int B<SSL_set_session>(SSL *s, SSL_SESSION *session);
+=item int B<SSL_set_session>(SSL *ssl, SSL_SESSION *session);
 
-=item void B<SSL_set_shutdown>(SSL *s, int mode);
+=item void B<SSL_set_shutdown>(SSL *ssl, int mode);
 
-=item int B<SSL_set_ssl_method>(SSL *s, SSL_METHOD *meth);
+=item int B<SSL_set_ssl_method>(SSL *ssl, SSL_METHOD *meth);
 
-=item [MACRO] B<SSL_set_time>(a,b);
+=item void B<SSL_set_time>(SSL *ssl, long t);
 
-=item [MACRO] B<SSL_set_timeout>(a,b);
+=item void B<SSL_set_timeout>(SSL *ssl, long t);
 
-=item void B<SSL_set_verify>(SSL *s, int mode, int (*callback);(void))
+=item void B<SSL_set_verify>(SSL *ssl, int mode, int (*callback);(void))
 
 =item void B<SSL_set_verify_result>(SSL *ssl, long arg);
 
-=item int B<SSL_set_wfd>(SSL *s, int fd);
+=item int B<SSL_set_wfd>(SSL *ssl, int fd);
 
-=item int B<SSL_shutdown>(SSL *s);
+=item int B<SSL_shutdown>(SSL *ssl);
 
 =item int B<SSL_state>(SSL *ssl);
 
-=item char *B<SSL_state_string>(SSL *s);
+=item char *B<SSL_state_string>(SSL *ssl);
 
-=item char *B<SSL_state_string_long>(SSL *s);
+=item char *B<SSL_state_string_long>(SSL *ssl);
 
-=item [MACRO] B<SSL_total_renegotiations>(ssl);
+=item long B<SSL_total_renegotiations>(SSL *ssl);
 
 =item int B<SSL_use_PrivateKey>(SSL *ssl, EVP_PKEY *pkey);
 
@@ -497,19 +449,19 @@ They are documented in the following:
 
 =item int B<SSL_use_certificate_file>(SSL *ssl, char *file, int type);
 
-=item int B<SSL_version>(SSL *s);
+=item int B<SSL_version>(SSL *ssl);
 
-=item [MACRO] B<SSL_want>(s);
+=item int B<SSL_want>(SSL *ssl);
 
-=item [MACRO] B<SSL_want_nothing>(s);
+=item int B<SSL_want_nothing>(SSL *ssl);
 
-=item [MACRO] B<SSL_want_read>(s);
+=item int B<SSL_want_read>(SSL *ssl);
 
-=item [MACRO] B<SSL_want_write>(s);
+=item int B<SSL_want_write>(SSL *ssl);
 
-=item [MACRO] B<SSL_want_x509_lookup>(s);
+=item int B<SSL_want_x509_lookup>(s);
 
-=item int B<SSL_write>(SSL *s, char *buf, int num);
+=item int B<SSL_write>(SSL *ssl, char *buf, int num);
 
 =item SSL_METHOD *B<SSLv2_client_method>(void);