diff options
| author | Ben Laurie <ben@openssl.org> | 2005-03-31 09:26:39 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2005-03-31 09:26:39 +0000 |
| commit | 41a15c4f0f2535591ba9f258cf76119f86477c43 (patch) | |
| tree | 6aca3f255f97dc3e9bd18884beeddf7de26fa122 /apps | |
| parent | fea4280a8b1a37bfe1ae6ffaede58722ad71afa1 (diff) | |
Give everything prototypes (well, everything that's actually used).
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/progs.h | 2 | ||||
| -rw-r--r-- | apps/s_apps.h | 2 | ||||
| -rw-r--r-- | apps/s_socket.c | 2 | ||||
| -rw-r--r-- | apps/sess_id.c | 2 | ||||
| -rw-r--r-- | apps/x509.c | 3 |
5 files changed, 5 insertions, 6 deletions
diff --git a/apps/progs.h b/apps/progs.h index 131a721a39..d3ddf8286b 100644 --- a/apps/progs.h +++ b/apps/progs.h @@ -49,7 +49,7 @@ extern int ocsp_main(int argc,char *argv[]); typedef struct { int type; char *name; - int (*func)(); + int (*func)(int argc,char *argv[]); } FUNCTION; FUNCTION functions[] = { diff --git a/apps/s_apps.h b/apps/s_apps.h index 4e989b819c..ca5caacd04 100644 --- a/apps/s_apps.h +++ b/apps/s_apps.h @@ -148,7 +148,7 @@ 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 *ret, int (*cb) (char *hostname, int s, unsigned char *context), char *context); #ifdef HEADER_X509_H int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx); #endif diff --git a/apps/s_socket.c b/apps/s_socket.c index 45014fa14d..727425744c 100644 --- a/apps/s_socket.c +++ b/apps/s_socket.c @@ -270,7 +270,7 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port) return(1); } -int do_server(int port, int *ret, int (*cb)(), char *context) +int do_server(int port, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), char *context) { int sock; char *name; diff --git a/apps/sess_id.c b/apps/sess_id.c index d91d84d220..c379b0e373 100644 --- a/apps/sess_id.c +++ b/apps/sess_id.c @@ -241,7 +241,7 @@ bad: if (!noout && !cert) { if (outformat == FORMAT_ASN1) - i=(int)i2d_SSL_SESSION_bio(out,x); + i=i2d_SSL_SESSION_bio(out,x); else if (outformat == FORMAT_PEM) i=PEM_write_bio_SSL_SESSION(out,x); else { diff --git a/apps/x509.c b/apps/x509.c index 294fc69573..1dad6363de 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -1038,8 +1038,7 @@ bad: ah.data=(char *)x; ah.meth=X509_asn1_meth(); - /* no macro for this one yet */ - i=ASN1_i2d_bio(i2d_ASN1_HEADER,out,(unsigned char *)&ah); + i=ASN1_i2d_bio_of(ASN1_HEADER,i2d_ASN1_HEADER,out,&ah); } else { BIO_printf(bio_err,"bad output format specified for outfile\n"); |