Update to OpenSSL 1.1.1c in preparation for Qt 5.12.4/5.13

This commit is contained in:
Cameron Gutman
2019-06-16 15:20:04 -07:00
parent 866e2f1762
commit 3785acea29
90 changed files with 6996 additions and 4454 deletions
+11 -6
View File
@@ -7,11 +7,14 @@
* https://www.openssl.org/source/license.html
*/
#include <stddef.h>
#ifndef HEADER_MODES_H
# define HEADER_MODES_H
#ifdef __cplusplus
# include <stddef.h>
# ifdef __cplusplus
extern "C" {
#endif
# endif
typedef void (*block128_f) (const unsigned char in[16],
unsigned char out[16], const void *key);
@@ -166,7 +169,7 @@ size_t CRYPTO_128_unwrap_pad(void *key, const unsigned char *icv,
unsigned char *out, const unsigned char *in,
size_t inlen, block128_f block);
#ifndef OPENSSL_NO_OCB
# ifndef OPENSSL_NO_OCB
typedef struct ocb128_context OCB128_CONTEXT;
typedef void (*ocb128_f) (const unsigned char *in, unsigned char *out,
@@ -196,8 +199,10 @@ int CRYPTO_ocb128_finish(OCB128_CONTEXT *ctx, const unsigned char *tag,
size_t len);
int CRYPTO_ocb128_tag(OCB128_CONTEXT *ctx, unsigned char *tag, size_t len);
void CRYPTO_ocb128_cleanup(OCB128_CONTEXT *ctx);
#endif /* OPENSSL_NO_OCB */
# endif /* OPENSSL_NO_OCB */
#ifdef __cplusplus
# ifdef __cplusplus
}
# endif
#endif