Move DSA test in ca.c inside #ifdef and make pubkey BIT STRING always have

[oweals/openssl.git] / crypto / evp / evp_lib.c

diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index 69784eb5554019757912c64b9f1d95d7b223de3d..729fc8f4e6ab669411e5672051eae3ddd9778c54 100644 (file)
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -97,7 +97,10 @@ ASN1_TYPE *type;
                {
                l=EVP_CIPHER_CTX_iv_length(c);
                i=ASN1_TYPE_get_octetstring(type,c->oiv,l);
-               memcpy(c->iv,c->oiv,l);
+               if (i != l)
+                       return(-1);
+               else if (i > 0)
+                       memcpy(c->iv,c->oiv,l);
                }
        return(i);
        }