Result of "make update"

[openssl.git] / apps / req.c

diff --git a/apps/req.c b/apps/req.c
index 79a7394088b414642b54d8657f8e771923e43037..eb338eeb1b2b2dd42c244132b40bfd4476353266 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -878,8 +878,8 @@ end:
        EVP_PKEY_free(pkey);
        X509_REQ_free(req);
        X509_free(x509ss);
-       if(passin) Free(passin);
-       if(passout) Free(passout);
+       if(passargin && passin) Free(passin);
+       if(passargout && passout) Free(passout);
        OBJ_cleanup();
 #ifndef NO_DSA
        if (dsa_params != NULL) DSA_free(dsa_params);
@@ -1103,7 +1103,7 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
                        for (i = 0; i < sk_CONF_VALUE_num(attr_sk); i++)
                                {
                                v=sk_CONF_VALUE_value(attr_sk,i);
-                               if(!X509_REQ_radd_attr_by_txt(req, v->name, MBSTRING_ASC,
+                               if(!X509_REQ_add1_attr_by_txt(req, v->name, MBSTRING_ASC,
                                        (unsigned char *)v->value, -1)) return 0;
                                }
                        }
@@ -1201,7 +1201,7 @@ start:
        buf[--i]='\0';
        if(!req_check_len(i, min, max)) goto start;
 
-       if(!X509_REQ_radd_attr_by_NID(req, nid, MBSTRING_ASC,
+       if(!X509_REQ_add1_attr_by_NID(req, nid, MBSTRING_ASC,
                                        (unsigned char *)buf, -1)) {
                BIO_printf(bio_err, "Error adding attribute\n");
                ERR_print_errors(bio_err);