OpenSSL upgraded to 1.1.1

1 files changed, 36 insertions, 275 deletions

diff --git a/include/openssl/pem.h b/include/openssl/pem.h
index 8b0fc65818..c6f334e9cc 100644
--- a/include/openssl/pem.h
+++ b/include/openssl/pem.h
@@ -1,74 +1,21 @@
-/* crypto/pem/pem.h */

-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)

- * All rights reserved.

- *

- * This package is an SSL implementation written

- * by Eric Young (eay@cryptsoft.com).

- * The implementation was written so as to conform with Netscapes SSL.

- *

- * This library is free for commercial and non-commercial use as long as

- * the following conditions are aheared to.  The following conditions

- * apply to all code found in this distribution, be it the RC4, RSA,

- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation

- * included with this distribution is covered by the same copyright terms

- * except that the holder is Tim Hudson (tjh@cryptsoft.com).

- *

- * Copyright remains Eric Young's, and as such any Copyright notices in

- * the code are not to be removed.

- * If this package is used in a product, Eric Young should be given attribution

- * as the author of the parts of the library used.

- * This can be in the form of a textual message at program startup or

- * in documentation (online or textual) provided with the package.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the copyright

- *    notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- *    notice, this list of conditions and the following disclaimer in the

- *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software

- *    must display the following acknowledgement:

- *    "This product includes cryptographic software written by

- *     Eric Young (eay@cryptsoft.com)"

- *    The word 'cryptographic' can be left out if the rouines from the library

- *    being used are not cryptographic related :-).

- * 4. If you include any Windows specific code (or a derivative thereof) from

- *    the apps directory (application code) you must include an acknowledgement:

- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"

- *

- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND

- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE

- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

- * SUCH DAMAGE.

+/*

+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.

  *

- * The licence and distribution terms for any publically available version or

- * derivative of this code cannot be changed.  i.e. this code cannot simply be

- * copied and put under another distribution licence

- * [including the GNU Public Licence.]

+ * 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

  */

 

 #ifndef HEADER_PEM_H

 # define HEADER_PEM_H

 

 # include <openssl/e_os2.h>

-# ifndef OPENSSL_NO_BIO

-#  include <openssl/bio.h>

-# endif

-# ifndef OPENSSL_NO_STACK

-#  include <openssl/stack.h>

-# endif

+# include <openssl/bio.h>

+# include <openssl/safestack.h>

 # include <openssl/evp.h>

 # include <openssl/x509.h>

-# include <openssl/pem2.h>

+# include <openssl/pemerr.h>

 

 #ifdef  __cplusplus

 extern "C" {

@@ -76,44 +23,8 @@ extern "C" {
 

 # define PEM_BUFSIZE             1024

 

-# define PEM_OBJ_UNDEF           0

-# define PEM_OBJ_X509            1

-# define PEM_OBJ_X509_REQ        2

-# define PEM_OBJ_CRL             3

-# define PEM_OBJ_SSL_SESSION     4

-# define PEM_OBJ_PRIV_KEY        10

-# define PEM_OBJ_PRIV_RSA        11

-# define PEM_OBJ_PRIV_DSA        12

-# define PEM_OBJ_PRIV_DH         13

-# define PEM_OBJ_PUB_RSA         14

-# define PEM_OBJ_PUB_DSA         15

-# define PEM_OBJ_PUB_DH          16

-# define PEM_OBJ_DHPARAMS        17

-# define PEM_OBJ_DSAPARAMS       18

-# define PEM_OBJ_PRIV_RSA_PUBLIC 19

-# define PEM_OBJ_PRIV_ECDSA      20

-# define PEM_OBJ_PUB_ECDSA       21

-# define PEM_OBJ_ECPARAMETERS    22

-

-# define PEM_ERROR               30

-# define PEM_DEK_DES_CBC         40

-# define PEM_DEK_IDEA_CBC        45

-# define PEM_DEK_DES_EDE         50

-# define PEM_DEK_DES_ECB         60

-# define PEM_DEK_RSA             70

-# define PEM_DEK_RSA_MD2         80

-# define PEM_DEK_RSA_MD5         90

-

-# define PEM_MD_MD2              NID_md2

-# define PEM_MD_MD5              NID_md5

-# define PEM_MD_SHA              NID_sha

-# define PEM_MD_MD2_RSA          NID_md2WithRSAEncryption

-# define PEM_MD_MD5_RSA          NID_md5WithRSAEncryption

-# define PEM_MD_SHA_RSA          NID_sha1WithRSAEncryption

-

 # define PEM_STRING_X509_OLD     "X509 CERTIFICATE"

 # define PEM_STRING_X509         "CERTIFICATE"

-# define PEM_STRING_X509_PAIR    "CERTIFICATE PAIR"

 # define PEM_STRING_X509_TRUSTED "TRUSTED CERTIFICATE"

 # define PEM_STRING_X509_REQ_OLD "NEW CERTIFICATE REQUEST"

 # define PEM_STRING_X509_REQ     "CERTIFICATE REQUEST"

@@ -138,78 +49,18 @@ extern "C" {
 # define PEM_STRING_PARAMETERS   "PARAMETERS"

 # define PEM_STRING_CMS          "CMS"

 

-  /*

-   * Note that this structure is initialised by PEM_SealInit and cleaned up

-   * by PEM_SealFinal (at least for now)

-   */

-typedef struct PEM_Encode_Seal_st {

-    EVP_ENCODE_CTX encode;

-    EVP_MD_CTX md;

-    EVP_CIPHER_CTX cipher;

-} PEM_ENCODE_SEAL_CTX;

-

-/* enc_type is one off */

 # define PEM_TYPE_ENCRYPTED      10

 # define PEM_TYPE_MIC_ONLY       20

 # define PEM_TYPE_MIC_CLEAR      30

 # define PEM_TYPE_CLEAR          40

 

-typedef struct pem_recip_st {

-    char *name;

-    X509_NAME *dn;

-    int cipher;

-    int key_enc;

-    /*      char iv[8]; unused and wrong size */

-} PEM_USER;

-

-typedef struct pem_ctx_st {

-    int type;                   /* what type of object */

-    struct {

-        int version;

-        int mode;

-    } proc_type;

-

-    char *domain;

-

-    struct {

-        int cipher;

-        /*-

-        unused, and wrong size

-        unsigned char iv[8]; */

-    } DEK_info;

-

-    PEM_USER *originator;

-

-    int num_recipient;

-    PEM_USER **recipient;

-/*-

-    XXX(ben): don#t think this is used!

-        STACK *x509_chain;      / * certificate chain */

-    EVP_MD *md;                 /* signature type */

-

-    int md_enc;                 /* is the md encrypted or not? */

-    int md_len;                 /* length of md_data */

-    char *md_data;              /* message digest, could be pkey encrypted */

-

-    EVP_CIPHER *dec;            /* date encryption cipher */

-    int key_len;                /* key length */

-    unsigned char *key;         /* key */

-  /*-

-    unused, and wrong size

-    unsigned char iv[8]; */

-

-    int data_enc;               /* is the data encrypted */

-    int data_len;

-    unsigned char *data;

-} PEM_CTX;

-

 /*

  * These macros make the PEM_read/PEM_write functions easier to maintain and

  * write. Now they are all implemented with either: IMPLEMENT_PEM_rw(...) or

  * IMPLEMENT_PEM_rw_cb(...)

  */

 

-# ifdef OPENSSL_NO_FP_API

+# ifdef OPENSSL_NO_STDIO

 

 #  define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/

 #  define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/

@@ -320,10 +171,11 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
 

 /* These are the same except they are for the declarations */

 

-# if defined(OPENSSL_NO_FP_API)

+# if defined(OPENSSL_NO_STDIO)

 

 #  define DECLARE_PEM_read_fp(name, type) /**/

 #  define DECLARE_PEM_write_fp(name, type) /**/

+#  define DECLARE_PEM_write_fp_const(name, type) /**/

 #  define DECLARE_PEM_write_cb_fp(name, type) /**/

 # else

 

@@ -342,7 +194,6 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
 

 # endif

 

-# ifndef OPENSSL_NO_BIO

 #  define DECLARE_PEM_read_bio(name, type) \

         type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u);

 

@@ -356,13 +207,6 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
         int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \

              unsigned char *kstr, int klen, pem_password_cb *cb, void *u);

 

-# else

-

-#  define DECLARE_PEM_read_bio(name, type) /**/

-#  define DECLARE_PEM_write_bio(name, type) /**/

-#  define DECLARE_PEM_write_bio_const(name, type) /**/

-#  define DECLARE_PEM_write_cb_bio(name, type) /**/

-# endif

 # define DECLARE_PEM_write(name, type) \

         DECLARE_PEM_write_bio(name, type) \

         DECLARE_PEM_write_fp(name, type)

@@ -384,21 +228,22 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
 # define DECLARE_PEM_rw_cb(name, type) \

         DECLARE_PEM_read(name, type) \

         DECLARE_PEM_write_cb(name, type)

-# if 1

-/* "userdata": new with OpenSSL 0.9.4 */

 typedef int pem_password_cb (char *buf, int size, int rwflag, void *userdata);

-# else

-/* OpenSSL 0.9.3, 0.9.3a */

-typedef int pem_password_cb (char *buf, int size, int rwflag);

-# endif

 

 int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher);

 int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *len,

                   pem_password_cb *callback, void *u);

 

-# ifndef OPENSSL_NO_BIO

 int PEM_read_bio(BIO *bp, char **name, char **header,

                  unsigned char **data, long *len);

+#   define PEM_FLAG_SECURE             0x1

+#   define PEM_FLAG_EAY_COMPATIBLE     0x2

+#   define PEM_FLAG_ONLY_B64           0x4

+int PEM_read_bio_ex(BIO *bp, char **name, char **header,

+                    unsigned char **data, long *len, unsigned int flags);

+int PEM_bytes_read_bio_secmem(unsigned char **pdata, long *plen, char **pnm,

+                              const char *name, BIO *bp, pem_password_cb *cb,

+                              void *u);

 int PEM_write_bio(BIO *bp, const char *name, const char *hdr,

                   const unsigned char *data, long len);

 int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm,

@@ -415,8 +260,8 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk,
 int PEM_X509_INFO_write_bio(BIO *bp, X509_INFO *xi, EVP_CIPHER *enc,

                             unsigned char *kstr, int klen,

                             pem_password_cb *cd, void *u);

-# endif

 

+#ifndef OPENSSL_NO_STDIO

 int PEM_read(FILE *fp, char **name, char **header,

              unsigned char **data, long *len);

 int PEM_write(FILE *fp, const char *name, const char *hdr,

@@ -428,21 +273,15 @@ int PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp,
                    int klen, pem_password_cb *callback, void *u);

 STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,

                                         pem_password_cb *cb, void *u);

+#endif

 

-int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type,

-                 EVP_MD *md_type, unsigned char **ek, int *ekl,

-                 unsigned char *iv, EVP_PKEY **pubk, int npubk);

-void PEM_SealUpdate(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *out, int *outl,

-                    unsigned char *in, int inl);

-int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,

-                  unsigned char *out, int *outl, EVP_PKEY *priv);

-

-void PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type);

-void PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *d, unsigned int cnt);

+int PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type);

+int PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *d, unsigned int cnt);

 int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,

                   unsigned int *siglen, EVP_PKEY *pkey);

 

-int PEM_def_callback(char *buf, int num, int w, void *key);

+/* The default pem_password_cb that's used internally */

+int PEM_def_callback(char *buf, int num, int rwflag, void *userdata);

 void PEM_proc_type(char *buf, int type);

 void PEM_dek_info(char *buf, const char *type, int len, char *str);

 

@@ -450,7 +289,6 @@ void PEM_dek_info(char *buf, const char *type, int len, char *str);
 

 DECLARE_PEM_rw(X509, X509)

 DECLARE_PEM_rw(X509_AUX, X509)

-DECLARE_PEM_rw(X509_CERT_PAIR, X509_CERT_PAIR)

 DECLARE_PEM_rw(X509_REQ, X509_REQ)

 DECLARE_PEM_write(X509_REQ_NEW, X509_REQ)

 DECLARE_PEM_rw(X509_CRL, X509_CRL)

@@ -480,6 +318,11 @@ DECLARE_PEM_write_const(DHxparams, DH)
 DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY)

 DECLARE_PEM_rw(PUBKEY, EVP_PKEY)

 

+int PEM_write_bio_PrivateKey_traditional(BIO *bp, EVP_PKEY *x,

+                                         const EVP_CIPHER *enc,

+                                         unsigned char *kstr, int klen,

+                                         pem_password_cb *cb, void *u);

+

 int PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, EVP_PKEY *x, int nid,

                                       char *kstr, int klen,

                                       pem_password_cb *cb, void *u);

@@ -494,6 +337,7 @@ int i2d_PKCS8PrivateKey_nid_bio(BIO *bp, EVP_PKEY *x, int nid,
 EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,

                                   void *u);

 

+# ifndef OPENSSL_NO_STDIO

 int i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,

                            char *kstr, int klen,

                            pem_password_cb *cb, void *u);

@@ -510,107 +354,24 @@ EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
 int PEM_write_PKCS8PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,

                               char *kstr, int klen, pem_password_cb *cd,

                               void *u);

-

+# endif

 EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x);

 int PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x);

 

+# ifndef OPENSSL_NO_DSA

 EVP_PKEY *b2i_PrivateKey(const unsigned char **in, long length);

 EVP_PKEY *b2i_PublicKey(const unsigned char **in, long length);

 EVP_PKEY *b2i_PrivateKey_bio(BIO *in);

 EVP_PKEY *b2i_PublicKey_bio(BIO *in);

 int i2b_PrivateKey_bio(BIO *out, EVP_PKEY *pk);

 int i2b_PublicKey_bio(BIO *out, EVP_PKEY *pk);

-# ifndef OPENSSL_NO_RC4

+#  ifndef OPENSSL_NO_RC4

 EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u);

 int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel,

                 pem_password_cb *cb, void *u);

+#  endif

 # endif

 

-/* BEGIN ERROR CODES */

-/*

- * The following lines are auto generated by the script mkerr.pl. Any changes

- * made after this point may be overwritten when the script is next run.

- */

-

-void ERR_load_PEM_strings(void);

-

-/* Error codes for the PEM functions. */

-

-/* Function codes. */

-# define PEM_F_B2I_DSS                                    127

-# define PEM_F_B2I_PVK_BIO                                128

-# define PEM_F_B2I_RSA                                    129

-# define PEM_F_CHECK_BITLEN_DSA                           130

-# define PEM_F_CHECK_BITLEN_RSA                           131

-# define PEM_F_D2I_PKCS8PRIVATEKEY_BIO                    120

-# define PEM_F_D2I_PKCS8PRIVATEKEY_FP                     121

-# define PEM_F_DO_B2I                                     132

-# define PEM_F_DO_B2I_BIO                                 133

-# define PEM_F_DO_BLOB_HEADER                             134

-# define PEM_F_DO_PK8PKEY                                 126

-# define PEM_F_DO_PK8PKEY_FP                              125

-# define PEM_F_DO_PVK_BODY                                135

-# define PEM_F_DO_PVK_HEADER                              136

-# define PEM_F_I2B_PVK                                    137

-# define PEM_F_I2B_PVK_BIO                                138

-# define PEM_F_LOAD_IV                                    101

-# define PEM_F_PEM_ASN1_READ                              102

-# define PEM_F_PEM_ASN1_READ_BIO                          103

-# define PEM_F_PEM_ASN1_WRITE                             104

-# define PEM_F_PEM_ASN1_WRITE_BIO                         105

-# define PEM_F_PEM_DEF_CALLBACK                           100

-# define PEM_F_PEM_DO_HEADER                              106

-# define PEM_F_PEM_F_PEM_WRITE_PKCS8PRIVATEKEY            118

-# define PEM_F_PEM_GET_EVP_CIPHER_INFO                    107

-# define PEM_F_PEM_PK8PKEY                                119

-# define PEM_F_PEM_READ                                   108

-# define PEM_F_PEM_READ_BIO                               109

-# define PEM_F_PEM_READ_BIO_DHPARAMS                      141

-# define PEM_F_PEM_READ_BIO_PARAMETERS                    140

-# define PEM_F_PEM_READ_BIO_PRIVATEKEY                    123

-# define PEM_F_PEM_READ_DHPARAMS                          142

-# define PEM_F_PEM_READ_PRIVATEKEY                        124

-# define PEM_F_PEM_SEALFINAL                              110

-# define PEM_F_PEM_SEALINIT                               111

-# define PEM_F_PEM_SIGNFINAL                              112

-# define PEM_F_PEM_WRITE                                  113

-# define PEM_F_PEM_WRITE_BIO                              114

-# define PEM_F_PEM_WRITE_PRIVATEKEY                       139

-# define PEM_F_PEM_X509_INFO_READ                         115

-# define PEM_F_PEM_X509_INFO_READ_BIO                     116

-# define PEM_F_PEM_X509_INFO_WRITE_BIO                    117

-

-/* Reason codes. */

-# define PEM_R_BAD_BASE64_DECODE                          100

-# define PEM_R_BAD_DECRYPT                                101

-# define PEM_R_BAD_END_LINE                               102

-# define PEM_R_BAD_IV_CHARS                               103

-# define PEM_R_BAD_MAGIC_NUMBER                           116

-# define PEM_R_BAD_PASSWORD_READ                          104

-# define PEM_R_BAD_VERSION_NUMBER                         117

-# define PEM_R_BIO_WRITE_FAILURE                          118

-# define PEM_R_CIPHER_IS_NULL                             127

-# define PEM_R_ERROR_CONVERTING_PRIVATE_KEY               115

-# define PEM_R_EXPECTING_PRIVATE_KEY_BLOB                 119

-# define PEM_R_EXPECTING_PUBLIC_KEY_BLOB                  120

-# define PEM_R_HEADER_TOO_LONG                            128

-# define PEM_R_INCONSISTENT_HEADER                        121

-# define PEM_R_KEYBLOB_HEADER_PARSE_ERROR                 122

-# define PEM_R_KEYBLOB_TOO_SHORT                          123

-# define PEM_R_NOT_DEK_INFO                               105

-# define PEM_R_NOT_ENCRYPTED                              106

-# define PEM_R_NOT_PROC_TYPE                              107

-# define PEM_R_NO_START_LINE                              108

-# define PEM_R_PROBLEMS_GETTING_PASSWORD                  109

-# define PEM_R_PUBLIC_KEY_NO_RSA                          110

-# define PEM_R_PVK_DATA_TOO_SHORT                         124

-# define PEM_R_PVK_TOO_SHORT                              125

-# define PEM_R_READ_KEY                                   111

-# define PEM_R_SHORT_HEADER                               112

-# define PEM_R_UNSUPPORTED_CIPHER                         113

-# define PEM_R_UNSUPPORTED_ENCRYPTION                     114

-# define PEM_R_UNSUPPORTED_KEY_COMPONENTS                 126

-

 # ifdef  __cplusplus

 }

 # endif