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

Simplicate and add lightness.

Browse Source
This commit is contained in:
Ben Laurie 2005-03-31 10:55:55 +00:00
parent db3cb0e97a
commit 45d10efc35
6 changed files with 39 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/asn1/a_d2i_fp.c
View File

@ -66,9 +66,7 @@ static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb);
#ifndef NO_OLD_ASN1
#ifndef OPENSSL_NO_FP_API
void *ASN1_d2i_fp(void *(*xnew)(void),
void *(*d2i)(void **,const unsigned char **,long), FILE *in,
void **x)
void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x)
{
BIO *b;
void *ret;
@ -85,9 +83,7 @@ void *ASN1_d2i_fp(void *(*xnew)(void),
}
#endif
char *ASN1_d2i_bio(void *(*xnew)(void),
void *(*d2i)(void **,const unsigned char **,long), BIO *in,
void **x)
void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x)
{
BUF_MEM *b = NULL;
const unsigned char *p;

14
crypto/asn1/a_dup.c
View File

@ -62,23 +62,23 @@
#ifndef NO_OLD_ASN1
void *ASN1_dup(int (*i2d)(char *,void *),
char *(*d2i)(void *,unsigned char **,long), char *x)
void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x)
{
unsigned char *b,*p;
long i;
const unsigned char *p2;
int i;
char *ret;
if (x == NULL) return(NULL);
i=(long)i2d(x,NULL);
b=(unsigned char *)OPENSSL_malloc((unsigned int)i+10);
i=i2d(x,NULL);
b=OPENSSL_malloc(i+10);
if (b == NULL)
{ ASN1err(ASN1_F_ASN1_DUP,ERR_R_MALLOC_FAILURE); return(NULL); }
p= b;
i=i2d(x,&p);
p= b;
ret=d2i(NULL,&p,i);
p2= b;
ret=d2i(NULL,&p2,i);
OPENSSL_free(b);
return(ret);
}

6
crypto/asn1/a_i2d_fp.c
View File

@ -64,8 +64,7 @@
#ifndef NO_OLD_ASN1
#ifndef OPENSSL_NO_FP_API
int ASN1_i2d_fp(int (*i2d)(void *, unsigned char **), FILE *out,
void *x)
int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, void *x)
{
BIO *b;
int ret;
@ -82,8 +81,7 @@ int ASN1_i2d_fp(int (*i2d)(void *, unsigned char **), FILE *out,
}
#endif
int ASN1_i2d_bio(int (*i2d)(void *, unsigned char **), BIO *out,
unsigned char *x)
int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x)
{
char *b;
unsigned char *p;

14
crypto/asn1/a_set.c
View File

@ -85,8 +85,8 @@ static int SetBlobCmp(const void *elem1, const void *elem2 )
}
/* int is_set: if TRUE, then sort the contents (i.e. it isn't a SEQUENCE) */
int i2d_ASN1_SET(STACK *a, unsigned char **pp, int (*func)(void *,unsigned char **), int ex_tag,
int ex_class, int is_set)
int i2d_ASN1_SET(STACK *a, unsigned char **pp, i2d_of_void *i2d, int ex_tag,
int ex_class, int is_set)
{
int ret=0,r;
int i;
@ -97,7 +97,7 @@ int i2d_ASN1_SET(STACK *a, unsigned char **pp, int (*func)(void *,unsigned char
if (a == NULL) return(0);
for (i=sk_num(a)-1; i>=0; i--)
ret+=func(sk_value(a,i),NULL);
ret+=i2d(sk_value(a,i),NULL);
r=ASN1_object_size(1,ret,ex_tag);
if (pp == NULL) return(r);
@ -111,7 +111,7 @@ int i2d_ASN1_SET(STACK *a, unsigned char **pp, int (*func)(void *,unsigned char
if(!is_set || (sk_num(a) < 2))
{
for (i=0; i<sk_num(a); i++)
func(sk_value(a,i),&p);
i2d(sk_value(a,i),&p);
*pp=p;
return(r);
@ -129,7 +129,7 @@ int i2d_ASN1_SET(STACK *a, unsigned char **pp, int (*func)(void *,unsigned char
for (i=0; i<sk_num(a); i++)
{
rgSetBlob[i].pbData = p; /* catch each set encode blob */
func(sk_value(a,i),&p);
i2d(sk_value(a,i),&p);
rgSetBlob[i].cbData = p - rgSetBlob[i].pbData; /* Length of this
SetBlob
*/
@ -163,8 +163,8 @@ SetBlob
}
STACK *d2i_ASN1_SET(STACK **a, const unsigned char **pp, long length,
char *(*d2i)(void **,const unsigned char **,long),
void (*free_func)(void *), int ex_tag, int ex_class)
d2i_of_void *d2i, void (*free_func)(void *), int ex_tag,
int ex_class)
{
ASN1_const_CTX c;
STACK *ret=NULL;

47
crypto/asn1/asn1.h
View File

@ -321,6 +321,12 @@ typedef struct ASN1_VALUE_st ASN1_VALUE;
#define I2D_OF(type) int (*)(type *,unsigned char **)
#define I2D_OF_const(type) int (*)(const type *,unsigned char **)
#define TYPEDEF_D2I_OF(type) typedef type *d2i_of_##type(type **,const unsigned char **,long)
#define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(type *,unsigned char **)
#define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type)
TYPEDEF_D2I2D_OF(void);
/* The following macros and typedefs allow an ASN1_ITEM
* to be embedded in a structure and referenced. Since
* the ASN1_ITEM pointers need to be globally accessible
@ -512,8 +518,8 @@ DECLARE_ASN1_SET_OF(ASN1_TYPE)
typedef struct asn1_method_st
{
int (*i2d)(void *, unsigned char **);
void *(*d2i)(void **,const unsigned char **,long);
i2d_of_void *i2d;
d2i_of_void *d2i;
void *(*create)(void);
void (*destroy)(void *);
} ASN1_METHOD;
@ -836,11 +842,9 @@ int ASN1_TIME_check(ASN1_TIME *t);
ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out);
int i2d_ASN1_SET(STACK *a, unsigned char **pp,
int (*func)(void *,unsigned char **), int ex_tag, int ex_class,
int is_set);
i2d_of_void *i2d, int ex_tag, int ex_class, int is_set);
STACK * d2i_ASN1_SET(STACK **a, const unsigned char **pp, long length,
char *(*func)(void **,const unsigned char **,long),
void (*free_func)(void *),
d2i_of_void *d2i, void (*free_func)(void *),
int ex_tag, int ex_class);
#ifndef OPENSSL_NO_BIO
@ -895,8 +899,7 @@ int ASN1_put_eoc(unsigned char **pp);
int ASN1_object_size(int constructed, int length, int tag);
/* Used to implement other functions */
void *ASN1_dup(int (*i2d)(char *,void *),
char *(*d2i)(void *,unsigned char **,long), char *x);
void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x);
#define ASN1_dup_of(type,i2d,d2i,x) \
((type *(*)(I2D_OF(type),D2I_OF(type),type *))ASN1_dup)(i2d,d2i,x)
#define ASN1_dup_of_const(type,i2d,d2i,x) \
@ -905,14 +908,11 @@ void *ASN1_dup(int (*i2d)(char *,void *),
void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
#ifndef OPENSSL_NO_FP_API
void *ASN1_d2i_fp(void *(*xnew)(void),
void *(*d2i)(void **,const unsigned char **,long), FILE *in,
void **x);
void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
#define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
((type *(*)(type *(*)(void),D2I_OF(type),FILE *,type **))ASN1_d2i_fp)(xnew,d2i,in,x)
void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
int ASN1_i2d_fp(int (*i2d)(void *, unsigned char **),FILE *out,
void *x);
int ASN1_i2d_fp(i2d_of_void *i2d,FILE *out,void *x);
#define ASN1_i2d_fp_of(type,i2d,out,x) \
((int (*)(I2D_OF(type),FILE *,type *))ASN1_i2d_fp)(i2d,out,x)
#define ASN1_i2d_fp_of_const(type,i2d,out,x) \
@ -924,17 +924,11 @@ int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);
int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in);
#ifndef OPENSSL_NO_BIO
char *ASN1_d2i_bio(void *(*xnew)(void),
void *(*d2i)(void **,const unsigned char **,long), BIO *in,
void **x);
void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);
#define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
((type *(*)(type *(*)(void),D2I_OF(type),BIO *,type **))ASN1_d2i_bio)(xnew,d2i,in,x)
char *ASN1_d2i_bio(void *(*xnew)(void),
void *(*d2i)(void **,const unsigned char **,long), BIO *in,
void **x);
void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);
int ASN1_i2d_bio(int (*i2d)(void *, unsigned char **),BIO *out,
unsigned char *x);
int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x);
#define ASN1_i2d_bio_of(type,i2d,out,x) \
((int (*)(I2D_OF(type),BIO *,type *))ASN1_i2d_bio)(i2d,out,x)
#define ASN1_i2d_bio_of_const(type,i2d,out,x) \
@ -974,15 +968,12 @@ int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a,long *num,
unsigned char *data, int max_len);
STACK *ASN1_seq_unpack(const unsigned char *buf, int len,
char *(*d2i)(void **,const unsigned char **,long),
void (*free_func)(void *));
unsigned char *ASN1_seq_pack(STACK *safes,
int (*i2d)(void *, unsigned char **),
d2i_of_void *d2i, void (*free_func)(void *));
unsigned char *ASN1_seq_pack(STACK *safes, i2d_of_void *i2d,
unsigned char **buf, int *len );
void *ASN1_unpack_string(ASN1_STRING *oct,
void *(*d2i)(void *,const unsigned char **,long));
void *ASN1_unpack_string(ASN1_STRING *oct, d2i_of_void *d2i);
void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);
ASN1_STRING *ASN1_pack_string(void *obj, int (*i2d)(void *, unsigned char **),
ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
ASN1_OCTET_STRING **oct);
#define ASN1_pack_string_of(type,obj,i2d,oct) \
((ASN1_STRING *(*)(type *,I2D_OF(type),ASN1_OCTET_STRING **))ASN1_pack_string)(obj,i2d,oct)

6
crypto/asn1/asn_pack.c
View File

@ -67,8 +67,7 @@
/* Turn an ASN1 encoded SEQUENCE OF into a STACK of structures */
STACK *ASN1_seq_unpack(const unsigned char *buf, int len,
char *(*d2i)(void **,const unsigned char **,long),
void (*free_func)(void *))
d2i_of_void *d2i,void (*free_func)(void *))
{
STACK *sk;
const unsigned char *pbuf;
@ -107,8 +106,7 @@ unsigned char *ASN1_seq_pack(STACK *safes, int (*i2d)(void *,unsigned char **),
/* Extract an ASN1 object from an ASN1_STRING */
void *ASN1_unpack_string (ASN1_STRING *oct,
void *(*d2i)(void *,const unsigned char **,long))
void *ASN1_unpack_string (ASN1_STRING *oct, d2i_of_void *d2i)
{
const unsigned char *p;
char *ret;