Latest update.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 1995-2020 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
|
||||
@@ -16,6 +16,8 @@
|
||||
#include <openssl/conf.h>
|
||||
#include <openssl/conf_api.h>
|
||||
|
||||
DEFINE_STACK_OF(CONF_VALUE)
|
||||
|
||||
static void value_free_hash(const CONF_VALUE *a, LHASH_OF(CONF_VALUE) *conf);
|
||||
static void value_free_stack_doall(CONF_VALUE *a);
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 1995-2020 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
|
||||
@@ -27,6 +27,8 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
DEFINE_STACK_OF(BIO)
|
||||
|
||||
#ifndef S_ISDIR
|
||||
# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
|
||||
#endif
|
||||
@@ -418,6 +420,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
|
||||
OPENSSL_strlcpy(include_path, include_dir, newlen);
|
||||
OPENSSL_strlcat(include_path, "/", newlen);
|
||||
OPENSSL_strlcat(include_path, include, newlen);
|
||||
OPENSSL_free(include);
|
||||
} else {
|
||||
include_path = include;
|
||||
}
|
||||
@@ -427,15 +430,11 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
|
||||
next = process_include(include_path, &dirctx, &dirpath);
|
||||
if (include_path != dirpath) {
|
||||
/* dirpath will contain include in case of a directory */
|
||||
OPENSSL_free(include);
|
||||
if (include_path != include)
|
||||
OPENSSL_free(include_path);
|
||||
OPENSSL_free(include_path);
|
||||
}
|
||||
#else
|
||||
next = BIO_new_file(include_path, "r");
|
||||
OPENSSL_free(include);
|
||||
if (include_path != include)
|
||||
OPENSSL_free(include_path);
|
||||
OPENSSL_free(include_path);
|
||||
#endif
|
||||
|
||||
if (next != NULL) {
|
||||
|
||||
@@ -18,6 +18,10 @@
|
||||
#include <openssl/trace.h>
|
||||
#include <openssl/engine.h>
|
||||
|
||||
DEFINE_STACK_OF(CONF_VALUE)
|
||||
DEFINE_STACK_OF(CONF_MODULE)
|
||||
DEFINE_STACK_OF(CONF_IMODULE)
|
||||
|
||||
#define DSO_mod_init_name "OPENSSL_init"
|
||||
#define DSO_mod_finish_name "OPENSSL_finish"
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 2015-2020 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
|
||||
@@ -14,6 +14,8 @@
|
||||
#include "internal/sslconf.h"
|
||||
#include "conf_local.h"
|
||||
|
||||
DEFINE_STACK_OF(CONF_VALUE)
|
||||
|
||||
/*
|
||||
* SSL library configuration module placeholder. We load it here but defer
|
||||
* all decisions about its contents to libssl.
|
||||
|
||||
Reference in New Issue
Block a user