Latest update.
This commit is contained in:
@@ -7,8 +7,8 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef HEADER_INTERNAL_BIO_H
|
||||
# define HEADER_INTERNAL_BIO_H
|
||||
#ifndef OSSL_INTERNAL_BIO_H
|
||||
# define OSSL_INTERNAL_BIO_H
|
||||
|
||||
#include <openssl/bio.h>
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef HEADER_INTERNAL_CONF_H
|
||||
# define HEADER_INTERNAL_CONF_H
|
||||
#ifndef OSSL_INTERNAL_CONF_H
|
||||
# define OSSL_INTERNAL_CONF_H
|
||||
|
||||
#include <openssl/conf.h>
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef HEADER_CONSTANT_TIME_LOCL_H
|
||||
# define HEADER_CONSTANT_TIME_LOCL_H
|
||||
#ifndef OSSL_INTERNAL_CONSTANT_TIME_H
|
||||
# define OSSL_INTERNAL_CONSTANT_TIME_H
|
||||
|
||||
# include <stdlib.h>
|
||||
# include <string.h>
|
||||
@@ -384,4 +384,4 @@ static ossl_inline void constant_time_lookup(void *out,
|
||||
*/
|
||||
void err_clear_last_constant_time(int clear);
|
||||
|
||||
#endif /* HEADER_CONSTANT_TIME_LOCL_H */
|
||||
#endif /* OSSL_INTERNAL_CONSTANT_TIME_H */
|
||||
@@ -7,8 +7,8 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef HEADER_CRYPTLIB_H
|
||||
# define HEADER_CRYPTLIB_H
|
||||
#ifndef OSSL_INTERNAL_CRYPTLIB_H
|
||||
# define OSSL_INTERNAL_CRYPTLIB_H
|
||||
|
||||
# include <stdlib.h>
|
||||
# include <string.h>
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef HEADER_INTERNAL_DANE_H
|
||||
#define HEADER_INTERNAL_DANE_H
|
||||
#ifndef OSSL_INTERNAL_DANE_H
|
||||
#define OSSL_INTERNAL_DANE_H
|
||||
|
||||
#include <openssl/safestack.h>
|
||||
|
||||
@@ -100,4 +100,4 @@ struct ssl_dane_st {
|
||||
#define DANETLS_HAS_DANE_TA(dane) ((dane)&&((dane)->umask & DANETLS_DANE_TA_MASK))
|
||||
#define DANETLS_HAS_DANE_EE(dane) ((dane)&&((dane)->umask & DANETLS_DANE_EE_MASK))
|
||||
|
||||
#endif /* HEADER_INTERNAL_DANE_H */
|
||||
#endif /* OSSL_INTERNAL_DANE_H */
|
||||
@@ -7,8 +7,8 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef HEADER_DSO_H
|
||||
# define HEADER_DSO_H
|
||||
#ifndef OSSL_INTERNAL_DSO_H
|
||||
# define OSSL_INTERNAL_DSO_H
|
||||
|
||||
# include <openssl/crypto.h>
|
||||
# include "internal/dsoerr.h"
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef HEADER_DSOERR_H
|
||||
# define HEADER_DSOERR_H
|
||||
#ifndef OSSL_INTERNAL_DSOERR_H
|
||||
# define OSSL_INTERNAL_DSOERR_H
|
||||
|
||||
# include <openssl/opensslconf.h>
|
||||
# include <openssl/symhacks.h>
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef INTERNAL_ERR_H
|
||||
# define INTERNAL_ERR_H
|
||||
#ifndef OSSL_INTERNAL_ERR_H
|
||||
# define OSSL_INTERNAL_ERR_H
|
||||
|
||||
void err_free_strings_int(void);
|
||||
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
/*
|
||||
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
|
||||
*
|
||||
* Licensed under the Apache License 2.0 (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
|
||||
*/
|
||||
|
||||
/* TODO(3.0) Move this header into provider when dependencies are removed */
|
||||
#ifndef HEADER_MD5_SHA1_H
|
||||
# define HEADER_MD5_SHA1_H
|
||||
|
||||
# include <openssl/opensslconf.h>
|
||||
|
||||
# ifndef OPENSSL_NO_MD5
|
||||
# include <openssl/e_os2.h>
|
||||
# include <stddef.h>
|
||||
# include <openssl/md5.h>
|
||||
# include <openssl/sha.h>
|
||||
|
||||
# define MD5_SHA1_DIGEST_LENGTH (MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH)
|
||||
# define MD5_SHA1_CBLOCK MD5_CBLOCK
|
||||
|
||||
typedef struct md5_sha1_st {
|
||||
MD5_CTX md5;
|
||||
SHA_CTX sha1;
|
||||
} MD5_SHA1_CTX;
|
||||
|
||||
int md5_sha1_init(MD5_SHA1_CTX *mctx);
|
||||
int md5_sha1_update(MD5_SHA1_CTX *mctx, const void *data, size_t count);
|
||||
int md5_sha1_final(unsigned char *md, MD5_SHA1_CTX *mctx);
|
||||
int md5_sha1_ctrl(MD5_SHA1_CTX *mctx, int cmd, int mslen, void *ms);
|
||||
|
||||
# endif /* OPENSSL_NO_MD5 */
|
||||
|
||||
#endif /* HEADER_MD5_SHA1_H */
|
||||
@@ -17,6 +17,8 @@ OSSL_NAMEMAP *ossl_namemap_new(void);
|
||||
void ossl_namemap_free(OSSL_NAMEMAP *namemap);
|
||||
|
||||
int ossl_namemap_add(OSSL_NAMEMAP *namemap, int number, const char *name);
|
||||
int ossl_namemap_add_n(OSSL_NAMEMAP *namemap, int number,
|
||||
const char *name, size_t name_len);
|
||||
|
||||
/*
|
||||
* The number<->name relationship is 1<->many
|
||||
@@ -24,6 +26,8 @@ int ossl_namemap_add(OSSL_NAMEMAP *namemap, int number, const char *name);
|
||||
* number->name mapping is an iterator.
|
||||
*/
|
||||
int ossl_namemap_name2num(const OSSL_NAMEMAP *namemap, const char *name);
|
||||
int ossl_namemap_name2num_n(const OSSL_NAMEMAP *namemap,
|
||||
const char *name, size_t name_len);
|
||||
const char *ossl_namemap_num2name(const OSSL_NAMEMAP *namemap, int number,
|
||||
size_t idx);
|
||||
void ossl_namemap_doall_names(const OSSL_NAMEMAP *namemap, int number,
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef HEADER_NELEM_H
|
||||
# define HEADER_NELEM_H
|
||||
#ifndef OSSL_INTERNAL_NELEM_H
|
||||
# define OSSL_INTERNAL_NELEM_H
|
||||
|
||||
# define OSSL_NELEM(x) (sizeof(x)/sizeof((x)[0]))
|
||||
#endif
|
||||
@@ -7,8 +7,8 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef HEADER_NUMBERS_H
|
||||
# define HEADER_NUMBERS_H
|
||||
#ifndef OSSL_INTERNAL_NUMBERS_H
|
||||
# define OSSL_INTERNAL_NUMBERS_H
|
||||
|
||||
# include <limits.h>
|
||||
|
||||
|
||||
@@ -36,8 +36,8 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef O_DIR_H
|
||||
# define O_DIR_H
|
||||
#ifndef OSSL_INTERNAL_O_DIR_H
|
||||
# define OSSL_INTERNAL_O_DIR_H
|
||||
|
||||
typedef struct OPENSSL_dir_context_st OPENSSL_DIR_CTX;
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef HEADER_PACKET_LOCL_H
|
||||
# define HEADER_PACKET_LOCL_H
|
||||
#ifndef OSSL_INTERNAL_PACKET_H
|
||||
# define OSSL_INTERNAL_PACKET_H
|
||||
|
||||
# include <string.h>
|
||||
# include <openssl/bn.h>
|
||||
@@ -881,4 +881,4 @@ int WPACKET_is_null_buf(WPACKET *pkt);
|
||||
/* Release resources in a WPACKET if a failure has occurred. */
|
||||
void WPACKET_cleanup(WPACKET *pkt);
|
||||
|
||||
#endif /* HEADER_PACKET_LOCL_H */
|
||||
#endif /* OSSL_INTERNAL_PACKET_H */
|
||||
@@ -9,7 +9,7 @@
|
||||
*/
|
||||
|
||||
#include <openssl/params.h>
|
||||
#include <openssl/ossl_typ.h>
|
||||
#include <openssl/types.h>
|
||||
|
||||
#define OSSL_PARAM_BLD_MAX 10
|
||||
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef HEADER_PROPERTY_H
|
||||
# define HEADER_PROPERTY_H
|
||||
#ifndef OSSL_INTERNAL_PROPERTY_H
|
||||
# define OSSL_INTERNAL_PROPERTY_H
|
||||
|
||||
#include "internal/cryptlib.h"
|
||||
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef HEADER_PROPERR_H
|
||||
# define HEADER_PROPERR_H
|
||||
#ifndef OSSL_INTERNAL_PROPERTYERR_H
|
||||
# define OSSL_INTERNAL_PROPERTYERR_H
|
||||
|
||||
# include <openssl/opensslconf.h>
|
||||
# include <openssl/symhacks.h>
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
* in the file LICENSE in the source distribution or at
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
#ifndef HEADER_INTERNAL_REFCOUNT_H
|
||||
# define HEADER_INTERNAL_REFCOUNT_H
|
||||
#ifndef OSSL_INTERNAL_REFCOUNT_H
|
||||
# define OSSL_INTERNAL_REFCOUNT_H
|
||||
|
||||
/* Used to checking reference counts, most while doing perl5 stuff :-) */
|
||||
# if defined(OPENSSL_NO_STDIO)
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
*/
|
||||
|
||||
/* TODO(3.0) Move this header into provider when dependencies are removed */
|
||||
#ifndef HEADER_INTERNAL_SHA3_H
|
||||
# define HEADER_INTERNAL_SHA3_H
|
||||
#ifndef OSSL_INTERNAL_SHA3_H
|
||||
# define OSSL_INTERNAL_SHA3_H
|
||||
|
||||
# include <openssl/e_os2.h>
|
||||
# include <stddef.h>
|
||||
@@ -49,4 +49,4 @@ int sha3_final(unsigned char *md, KECCAK1600_CTX *ctx);
|
||||
size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,
|
||||
size_t r);
|
||||
|
||||
#endif /* HEADER_INTERNAL_SHA3_H */
|
||||
#endif /* OSSL_INTERNAL_SHA3_H */
|
||||
@@ -9,8 +9,8 @@
|
||||
*/
|
||||
|
||||
/* TODO(3.0) Move this header into provider when dependencies are removed */
|
||||
#ifndef HEADER_SM3_H
|
||||
# define HEADER_SM3_H
|
||||
#ifndef OSSL_INTERNAL_SM3_H
|
||||
# define OSSL_INTERNAL_SM3_H
|
||||
|
||||
# include <openssl/opensslconf.h>
|
||||
|
||||
@@ -35,4 +35,4 @@ int sm3_init(SM3_CTX *c);
|
||||
int sm3_update(SM3_CTX *c, const void *data, size_t len);
|
||||
int sm3_final(unsigned char *md, SM3_CTX *c);
|
||||
|
||||
#endif /* HEADER_SM3_H */
|
||||
#endif /* OSSL_INTERNAL_SM3_H */
|
||||
@@ -8,8 +8,8 @@
|
||||
*/
|
||||
|
||||
|
||||
#ifndef HEADER_INTERNAL_SOCKETS
|
||||
# define HEADER_INTERNAL_SOCKETS
|
||||
#ifndef OSSL_INTERNAL_SOCKETS_H
|
||||
# define OSSL_INTERNAL_SOCKETS_H
|
||||
|
||||
# if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
|
||||
# define NO_SYS_PARAM_H
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef HEADER_SSLCONF_H
|
||||
# define HEADER_SSLCONF_H
|
||||
#ifndef OSSL_INTERNAL_SSLCONF_H
|
||||
# define OSSL_INTERNAL_SSLCONF_H
|
||||
|
||||
typedef struct ssl_conf_cmd_st SSL_CONF_CMD;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user