summaryrefslogtreecommitdiffstats
path: root/crypto/asn1/a_object.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2000-08-22 12:54:21 +0000
committerDr. Stephen Henson <steve@openssl.org>2000-08-22 12:54:21 +0000
commit469938cb4012472d3d99ed7ead258aef3a5bc029 (patch)
tree429467bb525a63d80e4a16efc419f57fee82a58b /crypto/asn1/a_object.c
parenteaa28181898b8ca0b54552a3290789bb17444c8a (diff)
Fixes to d2i_ASN1_OBJECT, ASN1_INTEGER_to_BN and a_strex.c
Diffstat (limited to 'crypto/asn1/a_object.c')
-rw-r--r--crypto/asn1/a_object.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c
index 3873b98902..20caa2d3bd 100644
--- 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 objsize;
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);
@@ -77,7 +78,7 @@ int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp)
p+=a->length;
*pp=p;
- return(a->length);
+ return(objsize);
}
int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)