Make pkcs8 work again.

[oweals/openssl.git] / crypto / asn1 / p5_pbev2.c

diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c
index 2f6a4c4518ed75068a3c3c3698f2b4a9ddb5ee6d..4ce06a94ab9d72dcc551f08a0c20de2c5857c849 100644 (file)
--- a/crypto/asn1/p5_pbev2.c
+++ b/crypto/asn1/p5_pbev2.c
@@ -178,12 +178,12 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
        ASN1_OBJECT *obj;
 
        alg_nid = EVP_CIPHER_type(cipher);
-       obj = OBJ_nid2obj(alg_nid);
-       if(!obj || !obj->data) {
+       if(alg_nid == NID_undef) {
                ASN1err(ASN1_F_PKCS5_PBE2_SET,
                                ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER);
                goto err;
        }
+       obj = OBJ_nid2obj(alg_nid);
 
        if(!(pbe2 = PBE2PARAM_new())) goto merr;