X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=apps%2Fs_apps.h;h=886a95a2b8ceb061c365b3b751ab153da8d7a4e7;hb=90890074b0bf983bfd0f59b7571aa334faaef989;hp=f4c85aa81f50020c097df9f121e9529e6797815c;hpb=4d8743f490a5f96fa26d41985ee12cb6b9815a4c;p=oweals%2Fopenssl.git diff --git a/apps/s_apps.h b/apps/s_apps.h index f4c85aa81f..886a95a2b8 100644 --- a/apps/s_apps.h +++ b/apps/s_apps.h @@ -148,19 +148,20 @@ typedef fd_mask fd_set; #define PORT_STR "4433" #define PROTOCOL "tcp" -int do_server(int port, int *ret, int (*cb) (), char *context); +int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context); #ifdef HEADER_X509_H int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx); #endif #ifdef HEADER_SSL_H int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file); +int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key); #endif -int init_client(int *sock, char *server, int port); +int init_client(int *sock, char *server, int port, int type); int should_retry(int i); int extract_port(char *str, short *port_ptr); int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p); -long MS_CALLBACK bio_dump_cb(BIO *bio, int cmd, const char *argp, +long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp, int argi, long argl, long ret); #ifdef HEADER_SSL_H