projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bsaes-armv7.pl: remove partial register operations in CTR subroutine.
[openssl.git]
/
crypto
/
asn1
/
a_dup.c
diff --git
a/crypto/asn1/a_dup.c
b/crypto/asn1/a_dup.c
index 8679263378ca59acc470c2c4db1c208fa83d6e18..d98992548ab1b413efefa15021b7b845106dd090 100644
(file)
--- a/
crypto/asn1/a_dup.c
+++ b/
crypto/asn1/a_dup.c
@@
-62,23
+62,23
@@
#ifndef NO_OLD_ASN1
#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, void *x)
{
unsigned char *b,*p;
{
unsigned char *b,*p;
- long i;
+ const unsigned char *p2;
+ int i;
char *ret;
if (x == NULL) return(NULL);
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);
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);
+ p
2
= b;
+ ret=d2i(NULL,&p
2
,i);
OPENSSL_free(b);
return(ret);
}
OPENSSL_free(b);
return(ret);
}
@@
-101,7
+101,7
@@
void *ASN1_item_dup(const ASN1_ITEM *it, void *x)
i=ASN1_item_i2d(x,&b,it);
if (b == NULL)
i=ASN1_item_i2d(x,&b,it);
if (b == NULL)
- { ASN1err(ASN1_F_ASN1_DUP,ERR_R_MALLOC_FAILURE); return(NULL); }
+ { ASN1err(ASN1_F_ASN1_
ITEM_
DUP,ERR_R_MALLOC_FAILURE); return(NULL); }
p= b;
ret=ASN1_item_d2i(NULL,&p,i, it);
OPENSSL_free(b);
p= b;
ret=ASN1_item_d2i(NULL,&p,i, it);
OPENSSL_free(b);