projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the algorithm implementations depend on the corresponding
[oweals/openssl.git]
/
crypto
/
asn1
/
a_object.c
diff --git
a/crypto/asn1/a_object.c
b/crypto/asn1/a_object.c
index 3873b98902e2abc0d3b310db9f9a2444e08ebe50..20caa2d3bde6a2f28ba4793b3d1e8399d7c4d237 100644
(file)
--- a/
crypto/asn1/a_object.c
+++ b/
crypto/asn1/a_object.c
@@
-65,11
+65,12
@@
int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp)
{
unsigned char *p;
int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp)
{
unsigned char *p;
+ int objsize;
if ((a == NULL) || (a->data == NULL)) return(0);
if ((a == NULL) || (a->data == NULL)) return(0);
- if (pp == NULL)
-
return(ASN1_object_size(0,a->length,V_ASN1_OBJECT))
;
+ objsize = ASN1_object_size(0,a->length,V_ASN1_OBJECT);
+
if (pp == NULL) return objsize
;
p= *pp;
ASN1_put_object(&p,0,a->length,V_ASN1_OBJECT,V_ASN1_UNIVERSAL);
p= *pp;
ASN1_put_object(&p,0,a->length,V_ASN1_OBJECT,V_ASN1_UNIVERSAL);
@@
-77,7
+78,7
@@
int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp)
p+=a->length;
*pp=p;
p+=a->length;
*pp=p;
- return(
a->length
);
+ return(
objsize
);
}
int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
}
int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)