[BACK]Return to pkcs12.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / openssl

Diff for /src/usr.bin/openssl/pkcs12.c between version 1.25 and 1.26

version 1.25, 2023/03/06 14:32:06 version 1.26, 2023/11/19 09:29:11
Line 1010 
Line 1010 
 static int  static int
 alg_print(BIO *x, const X509_ALGOR *alg)  alg_print(BIO *x, const X509_ALGOR *alg)
 {  {
         PBEPARAM *pbe;          PBEPARAM *pbe = NULL;
         const unsigned char *p;          const ASN1_OBJECT *aobj;
           int param_type;
           const void *param;
   
         p = alg->parameter->value.sequence->data;          X509_ALGOR_get0(&aobj, &param_type, &param, alg);
         pbe = d2i_PBEPARAM(NULL, &p, alg->parameter->value.sequence->length);          if (param_type == V_ASN1_SEQUENCE)
                   pbe = ASN1_item_unpack(param, &PBEPARAM_it);
         if (pbe == NULL)          if (pbe == NULL)
                 return 1;                  return 1;
         BIO_printf(bio_err, "%s, Iteration %ld\n",          BIO_printf(bio_err, "%s, Iteration %ld\n",
             OBJ_nid2ln(OBJ_obj2nid(alg->algorithm)),              OBJ_nid2ln(OBJ_obj2nid(aobj)),
             ASN1_INTEGER_get(pbe->iter));              ASN1_INTEGER_get(pbe->iter));
         PBEPARAM_free(pbe);          PBEPARAM_free(pbe);
         return 1;          return 1;
Legend:
Removed from v.1.25  
changed lines
  Added in v.1.26