From 774b2fe700fc00d781f12f0c887bb017f3e5b96c Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Thu, 13 Nov 2008 09:48:47 +0000 Subject: [PATCH] Aftermath of a clashing size_t fix (now only format changes). --- apps/s_apps.h | 2 +- apps/s_cb.c | 2 +- engines/e_4758cca.c | 2 +- ssl/ssl_asn1.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/s_apps.h b/apps/s_apps.h index 08fbbc2229..61dbf8af67 100644 --- a/apps/s_apps.h +++ b/apps/s_apps.h @@ -162,7 +162,7 @@ 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_callback(BIO *bio, int cmd, const char *argp, - int argi, long argl, long ret); + int argi, long argl, long ret); #ifdef HEADER_SSL_H void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret); diff --git a/apps/s_cb.c b/apps/s_cb.c index 103893090a..41f789af48 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -260,7 +260,7 @@ int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key) } long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp, - int argi, long argl, long ret) + int argi, long argl, long ret) { BIO *out; diff --git a/engines/e_4758cca.c b/engines/e_4758cca.c index 9f6572e677..443182bd31 100644 --- a/engines/e_4758cca.c +++ b/engines/e_4758cca.c @@ -108,7 +108,7 @@ static int getModulusAndExponent(const unsigned char *token, long *exponentLengt /* RAND number functions */ /*-----------------------*/ -static int cca_get_random_bytes(unsigned char*, int ); +static int cca_get_random_bytes(unsigned char*, int); static int cca_random_status(void); #ifndef OPENSSL_NO_RSA diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c index 8c4840219b..d8889189e6 100644 --- a/ssl/ssl_asn1.c +++ b/ssl/ssl_asn1.c @@ -338,7 +338,7 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp) } SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, - long length) + long length) { int version,ssl_version=0,i; long id; -- GitLab