Merge OpenSSL 0.9.7-stable-20020605,

correctly autogenerate obj_mac.h

1 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/libcrypto/asn1/a_bitstr.c b/src/lib/libcrypto/asn1/a_bitstr.c
index c36817c1ee..ed0bdfbde1 100644
--- a/src/lib/libcrypto/asn1/a_bitstr.c
+++ b/src/lib/libcrypto/asn1/a_bitstr.c
@@ -71,8 +71,6 @@ int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
         if (a == NULL) return(0);
 
         len=a->length;
-        ret=1+len;
-        if (pp == NULL) return(ret);
 
         if (len > 0)
                 {
@@ -100,6 +98,10 @@ int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
                 }
         else
                 bits=0;
+
+        ret=1+len;
+        if (pp == NULL) return(ret);
+
         p= *pp;
 
         *(p++)=(unsigned char)bits;