mirror of
https://github.com/moonlight-stream/moonlight-qt.git
synced 2026-06-17 06:01:12 +00:00
Upgrade macOS OpenSSL library to 1.1
This commit is contained in:
Cameron Gutman
@@ -1,59 +1,10 @@
|
||||
/* crypto/pkcs7/pkcs7.h */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
/*
|
||||
* Copyright 1995-2016 The OpenSSL Project Authors. 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.
|
||||
*
|
||||
* 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_PKCS7_H
|
||||
@@ -70,12 +21,6 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
# ifdef OPENSSL_SYS_WIN32
|
||||
/* Under Win32 thes are defined in wincrypt.h */
|
||||
# undef PKCS7_ISSUER_AND_SERIAL
|
||||
# undef PKCS7_SIGNER_INFO
|
||||
# endif
|
||||
|
||||
/*-
|
||||
Encryption_ID DES-CBC
|
||||
Digest_ID MD5
|
||||
@@ -100,8 +45,7 @@ typedef struct pkcs7_signer_info_st {
|
||||
EVP_PKEY *pkey;
|
||||
} PKCS7_SIGNER_INFO;
|
||||
|
||||
DECLARE_STACK_OF(PKCS7_SIGNER_INFO)
|
||||
DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO)
|
||||
DEFINE_STACK_OF(PKCS7_SIGNER_INFO)
|
||||
|
||||
typedef struct pkcs7_recip_info_st {
|
||||
ASN1_INTEGER *version; /* version 0 */
|
||||
@@ -111,8 +55,7 @@ typedef struct pkcs7_recip_info_st {
|
||||
X509 *cert; /* get the pub-key from this */
|
||||
} PKCS7_RECIP_INFO;
|
||||
|
||||
DECLARE_STACK_OF(PKCS7_RECIP_INFO)
|
||||
DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO)
|
||||
DEFINE_STACK_OF(PKCS7_RECIP_INFO)
|
||||
|
||||
typedef struct pkcs7_signed_st {
|
||||
ASN1_INTEGER *version; /* version 1 */
|
||||
@@ -199,9 +142,7 @@ typedef struct pkcs7_st {
|
||||
} d;
|
||||
} PKCS7;
|
||||
|
||||
DECLARE_STACK_OF(PKCS7)
|
||||
DECLARE_ASN1_SET_OF(PKCS7)
|
||||
DECLARE_PKCS12_STACK_OF(PKCS7)
|
||||
DEFINE_STACK_OF(PKCS7)
|
||||
|
||||
# define PKCS7_OP_SET_DETACHED_SIGNATURE 1
|
||||
# define PKCS7_OP_GET_DETACHED_SIGNATURE 2
|
||||
@@ -242,6 +183,7 @@ DECLARE_PKCS12_STACK_OF(PKCS7)
|
||||
# define PKCS7_NOCRL 0x2000
|
||||
# define PKCS7_PARTIAL 0x4000
|
||||
# define PKCS7_REUSE_DIGEST 0x8000
|
||||
# define PKCS7_NO_DUAL_CONTENT 0x10000
|
||||
|
||||
/* Flags: for compatibility with older code */
|
||||
|
||||
@@ -255,12 +197,15 @@ DECLARE_PKCS12_STACK_OF(PKCS7)
|
||||
# define SMIME_BINARY PKCS7_BINARY
|
||||
# define SMIME_NOATTR PKCS7_NOATTR
|
||||
|
||||
/* CRLF ASCII canonicalisation */
|
||||
# define SMIME_ASCIICRLF 0x80000
|
||||
|
||||
DECLARE_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
|
||||
|
||||
int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,
|
||||
const EVP_MD *type, unsigned char *md,
|
||||
unsigned int *len);
|
||||
# ifndef OPENSSL_NO_FP_API
|
||||
# ifndef OPENSSL_NO_STDIO
|
||||
PKCS7 *d2i_PKCS7_fp(FILE *fp, PKCS7 **p7);
|
||||
int i2d_PKCS7_fp(FILE *fp, PKCS7 *p7);
|
||||
# endif
|
||||
@@ -372,15 +317,13 @@ BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7);
|
||||
* 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_PKCS7_strings(void);
|
||||
|
||||
int ERR_load_PKCS7_strings(void);
|
||||
|
||||
/* Error codes for the PKCS7 functions. */
|
||||
|
||||
/* Function codes. */
|
||||
# define PKCS7_F_B64_READ_PKCS7 120
|
||||
# define PKCS7_F_B64_WRITE_PKCS7 121
|
||||
# define PKCS7_F_DO_PKCS7_SIGNED_ATTRIB 136
|
||||
# define PKCS7_F_I2D_PKCS7_BIO_STREAM 140
|
||||
# define PKCS7_F_PKCS7_ADD0_ATTRIB_SIGNING_TIME 135
|
||||
# define PKCS7_F_PKCS7_ADD_ATTRIB_SMIMECAP 118
|
||||
# define PKCS7_F_PKCS7_ADD_CERTIFICATE 100
|
||||
@@ -394,7 +337,6 @@ void ERR_load_PKCS7_strings(void);
|
||||
# define PKCS7_F_PKCS7_DATADECODE 112
|
||||
# define PKCS7_F_PKCS7_DATAFINAL 128
|
||||
# define PKCS7_F_PKCS7_DATAINIT 105
|
||||
# define PKCS7_F_PKCS7_DATASIGN 106
|
||||
# define PKCS7_F_PKCS7_DATAVERIFY 107
|
||||
# define PKCS7_F_PKCS7_DECRYPT 114
|
||||
# define PKCS7_F_PKCS7_DECRYPT_RINFO 133
|
||||
@@ -415,8 +357,6 @@ void ERR_load_PKCS7_strings(void);
|
||||
# define PKCS7_F_PKCS7_SIGN_ADD_SIGNER 137
|
||||
# define PKCS7_F_PKCS7_SIMPLE_SMIMECAP 119
|
||||
# define PKCS7_F_PKCS7_VERIFY 117
|
||||
# define PKCS7_F_SMIME_READ_PKCS7 122
|
||||
# define PKCS7_F_SMIME_TEXT 123
|
||||
|
||||
/* Reason codes. */
|
||||
# define PKCS7_R_CERTIFICATE_VERIFY_ERROR 117
|
||||
@@ -424,46 +364,29 @@ void ERR_load_PKCS7_strings(void);
|
||||
# define PKCS7_R_CIPHER_NOT_INITIALIZED 116
|
||||
# define PKCS7_R_CONTENT_AND_DATA_PRESENT 118
|
||||
# define PKCS7_R_CTRL_ERROR 152
|
||||
# define PKCS7_R_DECODE_ERROR 130
|
||||
# define PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH 100
|
||||
# define PKCS7_R_DECRYPT_ERROR 119
|
||||
# define PKCS7_R_DIGEST_FAILURE 101
|
||||
# define PKCS7_R_ENCRYPTION_CTRL_FAILURE 149
|
||||
# define PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE 150
|
||||
# define PKCS7_R_ERROR_ADDING_RECIPIENT 120
|
||||
# define PKCS7_R_ERROR_SETTING_CIPHER 121
|
||||
# define PKCS7_R_INVALID_MIME_TYPE 131
|
||||
# define PKCS7_R_INVALID_NULL_POINTER 143
|
||||
# define PKCS7_R_INVALID_SIGNED_DATA_TYPE 155
|
||||
# define PKCS7_R_MIME_NO_CONTENT_TYPE 132
|
||||
# define PKCS7_R_MIME_PARSE_ERROR 133
|
||||
# define PKCS7_R_MIME_SIG_PARSE_ERROR 134
|
||||
# define PKCS7_R_MISSING_CERIPEND_INFO 103
|
||||
# define PKCS7_R_NO_CONTENT 122
|
||||
# define PKCS7_R_NO_CONTENT_TYPE 135
|
||||
# define PKCS7_R_NO_DEFAULT_DIGEST 151
|
||||
# define PKCS7_R_NO_MATCHING_DIGEST_TYPE_FOUND 154
|
||||
# define PKCS7_R_NO_MULTIPART_BODY_FAILURE 136
|
||||
# define PKCS7_R_NO_MULTIPART_BOUNDARY 137
|
||||
# define PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE 115
|
||||
# define PKCS7_R_NO_RECIPIENT_MATCHES_KEY 146
|
||||
# define PKCS7_R_NO_SIGNATURES_ON_DATA 123
|
||||
# define PKCS7_R_NO_SIGNERS 142
|
||||
# define PKCS7_R_NO_SIG_CONTENT_TYPE 138
|
||||
# define PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE 104
|
||||
# define PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR 124
|
||||
# define PKCS7_R_PKCS7_ADD_SIGNER_ERROR 153
|
||||
# define PKCS7_R_PKCS7_DATAFINAL 126
|
||||
# define PKCS7_R_PKCS7_DATAFINAL_ERROR 125
|
||||
# define PKCS7_R_PKCS7_DATASIGN 145
|
||||
# define PKCS7_R_PKCS7_PARSE_ERROR 139
|
||||
# define PKCS7_R_PKCS7_SIG_PARSE_ERROR 140
|
||||
# define PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE 127
|
||||
# define PKCS7_R_SIGNATURE_FAILURE 105
|
||||
# define PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND 128
|
||||
# define PKCS7_R_SIGNING_CTRL_FAILURE 147
|
||||
# define PKCS7_R_SIGNING_NOT_SUPPORTED_FOR_THIS_KEY_TYPE 148
|
||||
# define PKCS7_R_SIG_INVALID_MIME_TYPE 141
|
||||
# define PKCS7_R_SMIME_TEXT_ERROR 129
|
||||
# define PKCS7_R_UNABLE_TO_FIND_CERTIFICATE 106
|
||||
# define PKCS7_R_UNABLE_TO_FIND_MEM_BIO 107
|
||||
@@ -475,7 +398,7 @@ void ERR_load_PKCS7_strings(void);
|
||||
# define PKCS7_R_WRONG_CONTENT_TYPE 113
|
||||
# define PKCS7_R_WRONG_PKCS7_TYPE 114
|
||||
|
||||
#ifdef __cplusplus
|
||||
# ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user