| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337 | 
							- /*
 
-  * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
 
-  *
 
-  * Licensed under the OpenSSL license (the "License").  You may not use
 
-  * this file except in compliance with the License.  You can obtain a copy
 
-  * in the file LICENSE in the source distribution or at
 
-  * https://www.openssl.org/source/license.html
 
-  */
 
- #include <stdio.h>
 
- #include "internal/cryptlib.h"
 
- #include <openssl/buffer.h>
 
- #include <openssl/objects.h>
 
- #include <openssl/evp.h>
 
- #include <openssl/x509.h>
 
- #include <openssl/pem.h>
 
- #include <openssl/rsa.h>
 
- #include <openssl/dsa.h>
 
- #ifndef OPENSSL_NO_STDIO
 
- STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,
 
-                                         pem_password_cb *cb, void *u)
 
- {
 
-     BIO *b;
 
-     STACK_OF(X509_INFO) *ret;
 
-     if ((b = BIO_new(BIO_s_file())) == NULL) {
 
-         PEMerr(PEM_F_PEM_X509_INFO_READ, ERR_R_BUF_LIB);
 
-         return 0;
 
-     }
 
-     BIO_set_fp(b, fp, BIO_NOCLOSE);
 
-     ret = PEM_X509_INFO_read_bio(b, sk, cb, u);
 
-     BIO_free(b);
 
-     return ret;
 
- }
 
- #endif
 
- STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk,
 
-                                             pem_password_cb *cb, void *u)
 
- {
 
-     X509_INFO *xi = NULL;
 
-     char *name = NULL, *header = NULL;
 
-     void *pp;
 
-     unsigned char *data = NULL;
 
-     const unsigned char *p;
 
-     long len, error = 0;
 
-     int ok = 0;
 
-     STACK_OF(X509_INFO) *ret = NULL;
 
-     unsigned int i, raw, ptype;
 
-     d2i_of_void *d2i = 0;
 
-     if (sk == NULL) {
 
-         if ((ret = sk_X509_INFO_new_null()) == NULL) {
 
-             PEMerr(PEM_F_PEM_X509_INFO_READ_BIO, ERR_R_MALLOC_FAILURE);
 
-             goto err;
 
-         }
 
-     } else
 
-         ret = sk;
 
-     if ((xi = X509_INFO_new()) == NULL)
 
-         goto err;
 
-     for (;;) {
 
-         raw = 0;
 
-         ptype = 0;
 
-         i = PEM_read_bio(bp, &name, &header, &data, &len);
 
-         if (i == 0) {
 
-             error = ERR_GET_REASON(ERR_peek_last_error());
 
-             if (error == PEM_R_NO_START_LINE) {
 
-                 ERR_clear_error();
 
-                 break;
 
-             }
 
-             goto err;
 
-         }
 
-  start:
 
-         if ((strcmp(name, PEM_STRING_X509) == 0) ||
 
-             (strcmp(name, PEM_STRING_X509_OLD) == 0)) {
 
-             d2i = (D2I_OF(void)) d2i_X509;
 
-             if (xi->x509 != NULL) {
 
-                 if (!sk_X509_INFO_push(ret, xi))
 
-                     goto err;
 
-                 if ((xi = X509_INFO_new()) == NULL)
 
-                     goto err;
 
-                 goto start;
 
-             }
 
-             pp = &(xi->x509);
 
-         } else if ((strcmp(name, PEM_STRING_X509_TRUSTED) == 0)) {
 
-             d2i = (D2I_OF(void)) d2i_X509_AUX;
 
-             if (xi->x509 != NULL) {
 
-                 if (!sk_X509_INFO_push(ret, xi))
 
-                     goto err;
 
-                 if ((xi = X509_INFO_new()) == NULL)
 
-                     goto err;
 
-                 goto start;
 
-             }
 
-             pp = &(xi->x509);
 
-         } else if (strcmp(name, PEM_STRING_X509_CRL) == 0) {
 
-             d2i = (D2I_OF(void)) d2i_X509_CRL;
 
-             if (xi->crl != NULL) {
 
-                 if (!sk_X509_INFO_push(ret, xi))
 
-                     goto err;
 
-                 if ((xi = X509_INFO_new()) == NULL)
 
-                     goto err;
 
-                 goto start;
 
-             }
 
-             pp = &(xi->crl);
 
-         } else
 
- #ifndef OPENSSL_NO_RSA
 
-         if (strcmp(name, PEM_STRING_RSA) == 0) {
 
-             d2i = (D2I_OF(void)) d2i_RSAPrivateKey;
 
-             if (xi->x_pkey != NULL) {
 
-                 if (!sk_X509_INFO_push(ret, xi))
 
-                     goto err;
 
-                 if ((xi = X509_INFO_new()) == NULL)
 
-                     goto err;
 
-                 goto start;
 
-             }
 
-             xi->enc_data = NULL;
 
-             xi->enc_len = 0;
 
-             xi->x_pkey = X509_PKEY_new();
 
-             if (xi->x_pkey == NULL)
 
-                 goto err;
 
-             ptype = EVP_PKEY_RSA;
 
-             pp = &xi->x_pkey->dec_pkey;
 
-             if ((int)strlen(header) > 10) /* assume encrypted */
 
-                 raw = 1;
 
-         } else
 
- #endif
 
- #ifndef OPENSSL_NO_DSA
 
-         if (strcmp(name, PEM_STRING_DSA) == 0) {
 
-             d2i = (D2I_OF(void)) d2i_DSAPrivateKey;
 
-             if (xi->x_pkey != NULL) {
 
-                 if (!sk_X509_INFO_push(ret, xi))
 
-                     goto err;
 
-                 if ((xi = X509_INFO_new()) == NULL)
 
-                     goto err;
 
-                 goto start;
 
-             }
 
-             xi->enc_data = NULL;
 
-             xi->enc_len = 0;
 
-             xi->x_pkey = X509_PKEY_new();
 
-             if (xi->x_pkey == NULL)
 
-                 goto err;
 
-             ptype = EVP_PKEY_DSA;
 
-             pp = &xi->x_pkey->dec_pkey;
 
-             if ((int)strlen(header) > 10) /* assume encrypted */
 
-                 raw = 1;
 
-         } else
 
- #endif
 
- #ifndef OPENSSL_NO_EC
 
-         if (strcmp(name, PEM_STRING_ECPRIVATEKEY) == 0) {
 
-             d2i = (D2I_OF(void)) d2i_ECPrivateKey;
 
-             if (xi->x_pkey != NULL) {
 
-                 if (!sk_X509_INFO_push(ret, xi))
 
-                     goto err;
 
-                 if ((xi = X509_INFO_new()) == NULL)
 
-                     goto err;
 
-                 goto start;
 
-             }
 
-             xi->enc_data = NULL;
 
-             xi->enc_len = 0;
 
-             xi->x_pkey = X509_PKEY_new();
 
-             if (xi->x_pkey == NULL)
 
-                 goto err;
 
-             ptype = EVP_PKEY_EC;
 
-             pp = &xi->x_pkey->dec_pkey;
 
-             if ((int)strlen(header) > 10) /* assume encrypted */
 
-                 raw = 1;
 
-         } else
 
- #endif
 
-         {
 
-             d2i = NULL;
 
-             pp = NULL;
 
-         }
 
-         if (d2i != NULL) {
 
-             if (!raw) {
 
-                 EVP_CIPHER_INFO cipher;
 
-                 if (!PEM_get_EVP_CIPHER_INFO(header, &cipher))
 
-                     goto err;
 
-                 if (!PEM_do_header(&cipher, data, &len, cb, u))
 
-                     goto err;
 
-                 p = data;
 
-                 if (ptype) {
 
-                     if (!d2i_PrivateKey(ptype, pp, &p, len)) {
 
-                         PEMerr(PEM_F_PEM_X509_INFO_READ_BIO, ERR_R_ASN1_LIB);
 
-                         goto err;
 
-                     }
 
-                 } else if (d2i(pp, &p, len) == NULL) {
 
-                     PEMerr(PEM_F_PEM_X509_INFO_READ_BIO, ERR_R_ASN1_LIB);
 
-                     goto err;
 
-                 }
 
-             } else {            /* encrypted RSA data */
 
-                 if (!PEM_get_EVP_CIPHER_INFO(header, &xi->enc_cipher))
 
-                     goto err;
 
-                 xi->enc_data = (char *)data;
 
-                 xi->enc_len = (int)len;
 
-                 data = NULL;
 
-             }
 
-         } else {
 
-             /* unknown */
 
-         }
 
-         OPENSSL_free(name);
 
-         name = NULL;
 
-         OPENSSL_free(header);
 
-         header = NULL;
 
-         OPENSSL_free(data);
 
-         data = NULL;
 
-     }
 
-     /*
 
-      * if the last one hasn't been pushed yet and there is anything in it
 
-      * then add it to the stack ...
 
-      */
 
-     if ((xi->x509 != NULL) || (xi->crl != NULL) ||
 
-         (xi->x_pkey != NULL) || (xi->enc_data != NULL)) {
 
-         if (!sk_X509_INFO_push(ret, xi))
 
-             goto err;
 
-         xi = NULL;
 
-     }
 
-     ok = 1;
 
-  err:
 
-     X509_INFO_free(xi);
 
-     if (!ok) {
 
-         for (i = 0; ((int)i) < sk_X509_INFO_num(ret); i++) {
 
-             xi = sk_X509_INFO_value(ret, i);
 
-             X509_INFO_free(xi);
 
-         }
 
-         if (ret != sk)
 
-             sk_X509_INFO_free(ret);
 
-         ret = NULL;
 
-     }
 
-     OPENSSL_free(name);
 
-     OPENSSL_free(header);
 
-     OPENSSL_free(data);
 
-     return ret;
 
- }
 
- /* A TJH addition */
 
- int PEM_X509_INFO_write_bio(BIO *bp, X509_INFO *xi, EVP_CIPHER *enc,
 
-                             unsigned char *kstr, int klen,
 
-                             pem_password_cb *cb, void *u)
 
- {
 
-     int i, ret = 0;
 
-     unsigned char *data = NULL;
 
-     const char *objstr = NULL;
 
-     char buf[PEM_BUFSIZE];
 
-     unsigned char *iv = NULL;
 
-     if (enc != NULL) {
 
-         objstr = OBJ_nid2sn(EVP_CIPHER_nid(enc));
 
-         if (objstr == NULL
 
-                    /*
 
-                     * Check "Proc-Type: 4,Encrypted\nDEK-Info: objstr,hex-iv\n"
 
-                     * fits into buf
 
-                     */
 
-                 || (strlen(objstr) + 23 + 2 * EVP_CIPHER_iv_length(enc) + 13)
 
-                    > sizeof(buf)) {
 
-             PEMerr(PEM_F_PEM_X509_INFO_WRITE_BIO, PEM_R_UNSUPPORTED_CIPHER);
 
-             goto err;
 
-         }
 
-     }
 
-     /*
 
-      * now for the fun part ... if we have a private key then we have to be
 
-      * able to handle a not-yet-decrypted key being written out correctly ...
 
-      * if it is decrypted or it is non-encrypted then we use the base code
 
-      */
 
-     if (xi->x_pkey != NULL) {
 
-         if ((xi->enc_data != NULL) && (xi->enc_len > 0)) {
 
-             if (enc == NULL) {
 
-                 PEMerr(PEM_F_PEM_X509_INFO_WRITE_BIO, PEM_R_CIPHER_IS_NULL);
 
-                 goto err;
 
-             }
 
-             /* copy from weirdo names into more normal things */
 
-             iv = xi->enc_cipher.iv;
 
-             data = (unsigned char *)xi->enc_data;
 
-             i = xi->enc_len;
 
-             /*
 
-              * we take the encryption data from the internal stuff rather
 
-              * than what the user has passed us ... as we have to match
 
-              * exactly for some strange reason
 
-              */
 
-             objstr = OBJ_nid2sn(EVP_CIPHER_nid(xi->enc_cipher.cipher));
 
-             if (objstr == NULL) {
 
-                 PEMerr(PEM_F_PEM_X509_INFO_WRITE_BIO,
 
-                        PEM_R_UNSUPPORTED_CIPHER);
 
-                 goto err;
 
-             }
 
-             /* Create the right magic header stuff */
 
-             buf[0] = '\0';
 
-             PEM_proc_type(buf, PEM_TYPE_ENCRYPTED);
 
-             PEM_dek_info(buf, objstr, EVP_CIPHER_iv_length(enc),
 
-                          (char *)iv);
 
-             /* use the normal code to write things out */
 
-             i = PEM_write_bio(bp, PEM_STRING_RSA, buf, data, i);
 
-             if (i <= 0)
 
-                 goto err;
 
-         } else {
 
-             /* Add DSA/DH */
 
- #ifndef OPENSSL_NO_RSA
 
-             /* normal optionally encrypted stuff */
 
-             if (PEM_write_bio_RSAPrivateKey(bp,
 
-                                             EVP_PKEY_get0_RSA(xi->x_pkey->dec_pkey),
 
-                                             enc, kstr, klen, cb, u) <= 0)
 
-                 goto err;
 
- #endif
 
-         }
 
-     }
 
-     /* if we have a certificate then write it out now */
 
-     if ((xi->x509 != NULL) && (PEM_write_bio_X509(bp, xi->x509) <= 0))
 
-         goto err;
 
-     /*
 
-      * we are ignoring anything else that is loaded into the X509_INFO
 
-      * structure for the moment ... as I don't need it so I'm not coding it
 
-      * here and Eric can do it when this makes it into the base library --tjh
 
-      */
 
-     ret = 1;
 
-  err:
 
-     OPENSSL_cleanse(buf, PEM_BUFSIZE);
 
-     return ret;
 
- }
 
 
  |