generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Work with -pedantic!

Browse Source
This commit is contained in:
Ben Laurie
1999-04-23 15:01:15 +00:00
parent 779cc0bca9
commit 61f5b6f338
78 changed files with 1040 additions and 880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/pkcs12.c
View File

@@ -78,9 +78,9 @@ EVP_CIPHER *enc;
#ifndef NOPROTO
int get_cert_chain(X509 *cert, STACK **chain);
int dump_certs_keys_p12(BIO *out, PKCS12 *p12, unsigned char *pass, int passlen, int options);
int dump_certs_pkeys_bags(BIO *out, STACK *bags, unsigned char *pass, int passlen, int options);
int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, unsigned char *pass, int passlen, int options);
int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass, int passlen, int options);
int dump_certs_pkeys_bags(BIO *out, STACK *bags, char *pass, int passlen, int options);
int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, char *pass, int passlen, int options);
int print_attribs(BIO *out, STACK *attrlst, char *name);
void hex_prin(BIO *out, unsigned char *buf, int len);
int alg_print(BIO *x, X509_ALGOR *alg);
@@ -274,7 +274,7 @@ if (export_cert) {
char *catmp;
int i, pmatch = 0;
unsigned char keyid[EVP_MAX_MD_SIZE];
int keyidlen;
unsigned int keyidlen;
/* Get private key so we can match it to a certificate */
key = PEM_read_bio_PrivateKey(inkey ? inkey : in, NULL, NULL);
if (!inkey) BIO_reset(in);
@@ -452,7 +452,7 @@ int dump_cert_text (BIO *out, X509 *x)
return 0;
}
int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, unsigned char *pass,
int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,
int passlen, int options)
{
STACK *asafes, *bags;
@@ -485,7 +485,7 @@ int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, unsigned char *pass,
return 1;
}
int dump_certs_pkeys_bags (BIO *out, STACK *bags, unsigned char *pass,
int dump_certs_pkeys_bags (BIO *out, STACK *bags, char *pass,
int passlen, int options)
{
int i;
@@ -497,7 +497,7 @@ int dump_certs_pkeys_bags (BIO *out, STACK *bags, unsigned char *pass,
return 1;
}
int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, unsigned char *pass,
int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
int passlen, int options)
{
EVP_PKEY *pkey;

14
apps/s_server.c
View File

@@ -76,8 +76,8 @@
#ifndef NOPROTO
static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export,int keylength);
static int sv_body(char *hostname, int s, char *context);
static int www_body(char *hostname, int s, char *context);
static int sv_body(char *hostname, int s, unsigned char *context);
static int www_body(char *hostname, int s, unsigned char *context);
static void close_accept_socket(void );
static void sv_usage(void);
static int init_ssl_connection(SSL *s);
@@ -556,7 +556,7 @@ static void print_stats(BIO *bio, SSL_CTX *ssl_ctx)
SSL_CTX_sess_get_cache_size(ssl_ctx));
}
static int sv_body(char *hostname, int s, char *context)
static int sv_body(char *hostname, int s, unsigned char *context)
{
char *buf=NULL;
fd_set readfds;
@@ -586,7 +586,8 @@ static int sv_body(char *hostname, int s, char *context)
if (con == NULL) {
con=(SSL *)SSL_new(ctx);
if(context)
SSL_set_session_id_context(con, context, strlen(context));
SSL_set_session_id_context(con, context,
strlen((char *)context));
}
SSL_clear(con);
@@ -871,7 +872,7 @@ static int load_CA(SSL_CTX *ctx, char *file)
}
#endif
static int www_body(char *hostname, int s, char *context)
static int www_body(char *hostname, int s, unsigned char *context)
{
char *buf=NULL;
int ret=1;
@@ -904,7 +905,8 @@ static int www_body(char *hostname, int s, char *context)
if (!BIO_set_write_buffer_size(io,bufsize)) goto err;
if ((con=(SSL *)SSL_new(ctx)) == NULL) goto err;
if(context) SSL_set_session_id_context(con, context, strlen(context));
if(context) SSL_set_session_id_context(con, context,
strlen((char *)context));
sbio=BIO_new_socket(s,BIO_NOCLOSE);
if (s_nbio_test)

4
apps/s_socket.c
View File

@@ -209,7 +209,7 @@ int init_client_ip(int *sock, unsigned char ip[4], int port)
int nbio_sock_error(int sock)
{
int j,i;
unsigned int size;
int size;
size=sizeof(int);
i=getsockopt(sock,SOL_SOCKET,SO_ERROR,(char *)&j,&size);
@@ -360,7 +360,7 @@ int do_accept(int acc_sock, int *sock, char **host)
int ret,i;
struct hostent *h1,*h2;
static struct sockaddr_in from;
unsigned int len;
int len;
/* struct linger ling; */
if (!sock_init()) return(0);