[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.16 and 1.17

version 1.16, 2021/10/31 16:47:27 version 1.17, 2022/03/28 10:56:26
Line 88 
Line 88 
     const char *name);      const char *name);
 void hex_prin(BIO *out, unsigned char *buf, int len);  void hex_prin(BIO *out, unsigned char *buf, int len);
 int alg_print(BIO *x, const X509_ALGOR *alg);  int alg_print(BIO *x, const X509_ALGOR *alg);
 int cert_load(BIO *in, STACK_OF(X509) *sk);  
 static int set_pbe(BIO *err, int *ppbe, const char *str);  static int set_pbe(BIO *err, int *ppbe, const char *str);
   
 static struct {  static struct {
Line 1004 
Line 1003 
             ASN1_INTEGER_get(pbe->iter));              ASN1_INTEGER_get(pbe->iter));
         PBEPARAM_free(pbe);          PBEPARAM_free(pbe);
         return 1;          return 1;
 }  
   
 /* Load all certificates from a given file */  
   
 int  
 cert_load(BIO *in, STACK_OF(X509) *sk)  
 {  
         int ret;  
         X509 *cert;  
         ret = 0;  
         while ((cert = PEM_read_bio_X509(in, NULL, NULL, NULL))) {  
                 ret = 1;  
                 sk_X509_push(sk, cert);  
         }  
         if (ret)  
                 ERR_clear_error();  
         return ret;  
 }  }
   
 /* Generalised attribute print: handle PKCS#8 and bag attributes */  /* Generalised attribute print: handle PKCS#8 and bag attributes */
Legend:
Removed from v.1.16  
changed lines
  Added in v.1.17