projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo.
[oweals/openssl.git]
/
apps
/
s_apps.h
diff --git
a/apps/s_apps.h
b/apps/s_apps.h
index f4c85aa81f50020c097df9f121e9529e6797815c..886a95a2b8ceb061c365b3b751ab153da8d7a4e7 100644
(file)
--- 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"
#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);
#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
#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);
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_c
b
(BIO *bio, int cmd, const char *argp,
+long MS_CALLBACK bio_dump_c
allback
(BIO *bio, int cmd, const char *argp,
int argi, long argl, long ret);
#ifdef HEADER_SSL_H
int argi, long argl, long ret);
#ifdef HEADER_SSL_H