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

Consistency.

Browse Source
This commit is contained in:
Ben Laurie 2005-03-31 13:57:54 +00:00
parent 5d1430f390
commit 8bb826ee53
11 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/asn1/a_digest.c
View File

@ -72,9 +72,8 @@
#ifndef NO_ASN1_OLD #ifndef NO_ASN1_OLD
int ASN1_digest(int (*i2d)(void *, unsigned char **), int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data,
const EVP_MD *type, char *data, unsigned char *md, unsigned char *md, unsigned int *len)
unsigned int *len)
{ {
int i; int i;
unsigned char *str,*p; unsigned char *str,*p;

6
crypto/asn1/a_sign.c
View File

@ -126,9 +126,9 @@
#ifndef NO_ASN1_OLD #ifndef NO_ASN1_OLD
int ASN1_sign(int (*i2d)(void *, unsigned char **), X509_ALGOR *algor1, int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
X509_ALGOR *algor2, ASN1_BIT_STRING *signature, char *data, ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey,
EVP_PKEY *pkey, const EVP_MD *type) const EVP_MD *type)
{ {
EVP_MD_CTX ctx; EVP_MD_CTX ctx;
unsigned char *p,*buf_in=NULL,*buf_out=NULL; unsigned char *p,*buf_in=NULL,*buf_out=NULL;

3
crypto/asn1/a_verify.c
View File

@ -73,8 +73,7 @@
#ifndef NO_ASN1_OLD #ifndef NO_ASN1_OLD
int ASN1_verify(int (*i2d)(void *, unsigned char **), int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *a, ASN1_BIT_STRING *signature,
X509_ALGOR *a, ASN1_BIT_STRING *signature,
char *data, EVP_PKEY *pkey) char *data, EVP_PKEY *pkey)
{ {
EVP_MD_CTX ctx; EVP_MD_CTX ctx;

5
crypto/asn1/asn_pack.c
View File

@ -82,7 +82,7 @@ STACK *ASN1_seq_unpack(const unsigned char *buf, int len,
* OPENSSL_malloc'ed buffer * OPENSSL_malloc'ed buffer
*/ */
unsigned char *ASN1_seq_pack(STACK *safes, int (*i2d)(void *,unsigned char **), unsigned char *ASN1_seq_pack(STACK *safes, i2d_of_void *i2d,
unsigned char **buf, int *len) unsigned char **buf, int *len)
{ {
int safelen; int safelen;
@ -119,8 +119,7 @@ void *ASN1_unpack_string (ASN1_STRING *oct, d2i_of_void *d2i)
/* Pack an ASN1 object into an ASN1_STRING */ /* Pack an ASN1 object into an ASN1_STRING */
ASN1_STRING *ASN1_pack_string(void *obj, int (*i2d)(void *,unsigned char **), ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d, ASN1_STRING **oct)
ASN1_STRING **oct)
{ {
unsigned char *p; unsigned char *p;
ASN1_STRING *octmp; ASN1_STRING *octmp;

3
crypto/ocsp/ocsp.h
View File

@ -466,8 +466,7 @@ int OCSP_basic_sign(OCSP_BASICRESP *brsp,
X509 *signer, EVP_PKEY *key, const EVP_MD *dgst, X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
STACK_OF(X509) *certs, unsigned long flags); STACK_OF(X509) *certs, unsigned long flags);
ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
int (*i2d)(void *,unsigned char **),
void *data, STACK_OF(ASN1_OBJECT) *sk); void *data, STACK_OF(ASN1_OBJECT) *sk);
#define ASN1_STRING_encode_of(type,s,i2d,data,sk) \ #define ASN1_STRING_encode_of(type,s,i2d,data,sk) \
((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))ASN1_STRING_encode)(s,i2d,data,sk) ((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))ASN1_STRING_encode)(s,i2d,data,sk)

3
crypto/ocsp/ocsp_ext.c
View File

@ -265,8 +265,7 @@ int OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc)
/* also CRL Entry Extensions */ /* also CRL Entry Extensions */
ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
int (*i2d)(void *,unsigned char **),
void *data, STACK_OF(ASN1_OBJECT) *sk) void *data, STACK_OF(ASN1_OBJECT) *sk)
{ {
int i; int i;

14
crypto/pem/pem.h
View File

@ -529,12 +529,11 @@ int PEM_write_bio(BIO *bp,const char *name,char *hdr,unsigned char *data,
long len); long len);
int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm, const char *name, BIO *bp, int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm, const char *name, BIO *bp,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
void * PEM_ASN1_read_bio(void *(*d2i)(void **,const unsigned char **,long), void * PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp,
const char *name,BIO *bp,void **x, void **x, pem_password_cb *cb, void *u);
pem_password_cb *cb, void *u);
#define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \ #define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \
((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))PEM_ASN1_read_bio)(d2i,name,bp,x,cb,u) ((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))PEM_ASN1_read_bio)(d2i,name,bp,x,cb,u)
int PEM_ASN1_write_bio(int (*i2d)(void *,unsigned char **),const char *name,BIO *bp,char *x, int PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp,char *x,
const EVP_CIPHER *enc,unsigned char *kstr,int klen, const EVP_CIPHER *enc,unsigned char *kstr,int klen,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
#define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \ #define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \
@ -549,10 +548,9 @@ int PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc,
int PEM_read(FILE *fp, char **name, char **header, int PEM_read(FILE *fp, char **name, char **header,
unsigned char **data,long *len); unsigned char **data,long *len);
int PEM_write(FILE *fp,char *name,char *hdr,unsigned char *data,long len); int PEM_write(FILE *fp,char *name,char *hdr,unsigned char *data,long len);
void * PEM_ASN1_read(void *(*d2i)(void **,const unsigned char **,long), void * PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
const char *name,FILE *fp,void **x,pem_password_cb *cb, pem_password_cb *cb, void *u);
void *u); int PEM_ASN1_write(i2d_of_void *i2d,const char *name,FILE *fp,
int PEM_ASN1_write(int (*i2d)(void *,unsigned char **),const char *name,FILE *fp,
char *x,const EVP_CIPHER *enc,unsigned char *kstr, char *x,const EVP_CIPHER *enc,unsigned char *kstr,
int klen,pem_password_cb *callback, void *u); int klen,pem_password_cb *callback, void *u);
STACK_OF(X509_INFO) * PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, STACK_OF(X509_INFO) * PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,

15
crypto/pem/pem_info.c
View File

@ -87,14 +87,15 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_p
STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u) STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u)
{ {
X509_INFO *xi=NULL; X509_INFO *xi=NULL;
char *name=NULL,*header=NULL,**pp; char *name=NULL,*header=NULL;
void *pp;
unsigned char *data=NULL; unsigned char *data=NULL;
const unsigned char *p; const unsigned char *p;
long len,error=0; long len,error=0;
int ok=0; int ok=0;
STACK_OF(X509_INFO) *ret=NULL; STACK_OF(X509_INFO) *ret=NULL;
unsigned int i,raw; unsigned int i,raw;
char *(*d2i)(void *,const unsigned char **,long); d2i_of_void *d2i;
if (sk == NULL) if (sk == NULL)
{ {
@ -133,7 +134,7 @@ start:
if ((xi=X509_INFO_new()) == NULL) goto err; if ((xi=X509_INFO_new()) == NULL) goto err;
goto start; goto start;
} }
pp=(char **)&(xi->x509); pp=&(xi->x509);
} }
else if ((strcmp(name,PEM_STRING_X509_TRUSTED) == 0)) else if ((strcmp(name,PEM_STRING_X509_TRUSTED) == 0))
{ {
@ -144,7 +145,7 @@ start:
if ((xi=X509_INFO_new()) == NULL) goto err; if ((xi=X509_INFO_new()) == NULL) goto err;
goto start; goto start;
} }
pp=(char **)&(xi->x509); pp=&(xi->x509);
} }
else if (strcmp(name,PEM_STRING_X509_CRL) == 0) else if (strcmp(name,PEM_STRING_X509_CRL) == 0)
{ {
@ -155,7 +156,7 @@ start:
if ((xi=X509_INFO_new()) == NULL) goto err; if ((xi=X509_INFO_new()) == NULL) goto err;
goto start; goto start;
} }
pp=(char **)&(xi->crl); pp=&(xi->crl);
} }
else else
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
@ -176,7 +177,7 @@ start:
if ((xi->x_pkey->dec_pkey=EVP_PKEY_new()) == NULL) if ((xi->x_pkey->dec_pkey=EVP_PKEY_new()) == NULL)
goto err; goto err;
xi->x_pkey->dec_pkey->type=EVP_PKEY_RSA; xi->x_pkey->dec_pkey->type=EVP_PKEY_RSA;
pp=(char **)&(xi->x_pkey->dec_pkey->pkey.rsa); pp=&(xi->x_pkey->dec_pkey->pkey.rsa);
if ((int)strlen(header) > 10) /* assume encrypted */ if ((int)strlen(header) > 10) /* assume encrypted */
raw=1; raw=1;
} }
@ -224,7 +225,7 @@ start:
if ((xi->x_pkey->dec_pkey=EVP_PKEY_new()) == NULL) if ((xi->x_pkey->dec_pkey=EVP_PKEY_new()) == NULL)
goto err; goto err;
xi->x_pkey->dec_pkey->type=EVP_PKEY_EC; xi->x_pkey->dec_pkey->type=EVP_PKEY_EC;
pp=(char **)&(xi->x_pkey->dec_pkey->pkey.eckey); pp=&(xi->x_pkey->dec_pkey->pkey.eckey);
if ((int)strlen(header) > 10) /* assume encrypted */ if ((int)strlen(header) > 10) /* assume encrypted */
raw=1; raw=1;
} }

9
crypto/pem/pem_lib.c
View File

@ -158,9 +158,8 @@ void PEM_dek_info(char *buf, const char *type, int len, char *str)
} }
#ifndef OPENSSL_NO_FP_API #ifndef OPENSSL_NO_FP_API
void *PEM_ASN1_read(void *(*d2i)(void **,const unsigned char **,long), void *PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
const char *name, FILE *fp,void **x,pem_password_cb *cb, pem_password_cb *cb, void *u)
void *u)
{ {
BIO *b; BIO *b;
void *ret; void *ret;
@ -261,7 +260,7 @@ err:
} }
#ifndef OPENSSL_NO_FP_API #ifndef OPENSSL_NO_FP_API
int PEM_ASN1_write(int (*i2d)(void *,unsigned char **), const char *name, FILE *fp, int PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp,
char *x, const EVP_CIPHER *enc, unsigned char *kstr, char *x, const EVP_CIPHER *enc, unsigned char *kstr,
int klen, pem_password_cb *callback, void *u) int klen, pem_password_cb *callback, void *u)
{ {
@ -280,7 +279,7 @@ int PEM_ASN1_write(int (*i2d)(void *,unsigned char **), const char *name, FILE *
} }
#endif #endif
int PEM_ASN1_write_bio(int (*i2d)(void *,unsigned char **), const char *name, BIO *bp, int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp,
char *x, const EVP_CIPHER *enc, unsigned char *kstr, char *x, const EVP_CIPHER *enc, unsigned char *kstr,
int klen, pem_password_cb *callback, void *u) int klen, pem_password_cb *callback, void *u)
{ {

3
crypto/pem/pem_oth.c
View File

@ -67,8 +67,7 @@
/* Handle 'other' PEMs: not private keys */ /* Handle 'other' PEMs: not private keys */
void *PEM_ASN1_read_bio(void *(*d2i)(void **,const unsigned char **,long), void *PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, void **x,
const char *name, BIO *bp, void **x,
pem_password_cb *cb, void *u) pem_password_cb *cb, void *u)
{ {
const unsigned char *p=NULL; const unsigned char *p=NULL;

9
crypto/x509/x509.h
View File

@ -966,14 +966,13 @@ X509_INFO * X509_INFO_new(void);
void X509_INFO_free(X509_INFO *a); void X509_INFO_free(X509_INFO *a);
char * X509_NAME_oneline(X509_NAME *a,char *buf,int size); char * X509_NAME_oneline(X509_NAME *a,char *buf,int size);
int ASN1_verify(int (*i2d)(void *, unsigned char **), X509_ALGOR *algor1, int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *algor1,
ASN1_BIT_STRING *signature,char *data,EVP_PKEY *pkey); ASN1_BIT_STRING *signature,char *data,EVP_PKEY *pkey);
int ASN1_digest(int (*i2d)(void *, unsigned char **), int ASN1_digest(i2d_of_void *i2d,const EVP_MD *type,char *data,
const EVP_MD *type,char *data,
unsigned char *md,unsigned int *len); unsigned char *md,unsigned int *len);
int ASN1_sign(int (*i2d)(void *, unsigned char **), X509_ALGOR *algor1, int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1,
X509_ALGOR *algor2, ASN1_BIT_STRING *signature, X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
char *data,EVP_PKEY *pkey, const EVP_MD *type); char *data,EVP_PKEY *pkey, const EVP_MD *type);