Imported OpenSSL 1.1.1d
This commit is contained in:
@@ -87,29 +87,10 @@ static void tear_down(CT_TEST_FIXTURE *fixture)
|
||||
OPENSSL_free(fixture);
|
||||
}
|
||||
|
||||
static char *mk_file_path(const char *dir, const char *file)
|
||||
{
|
||||
# ifndef OPENSSL_SYS_VMS
|
||||
const char *sep = "/";
|
||||
# else
|
||||
const char *sep = "";
|
||||
# endif
|
||||
size_t len = strlen(dir) + strlen(sep) + strlen(file) + 1;
|
||||
char *full_file = OPENSSL_zalloc(len);
|
||||
|
||||
if (full_file != NULL) {
|
||||
OPENSSL_strlcpy(full_file, dir, len);
|
||||
OPENSSL_strlcat(full_file, sep, len);
|
||||
OPENSSL_strlcat(full_file, file, len);
|
||||
}
|
||||
|
||||
return full_file;
|
||||
}
|
||||
|
||||
static X509 *load_pem_cert(const char *dir, const char *file)
|
||||
{
|
||||
X509 *cert = NULL;
|
||||
char *file_path = mk_file_path(dir, file);
|
||||
char *file_path = test_mk_file_path(dir, file);
|
||||
|
||||
if (file_path != NULL) {
|
||||
BIO *cert_io = BIO_new_file(file_path, "r");
|
||||
@@ -127,7 +108,7 @@ static int read_text_file(const char *dir, const char *file,
|
||||
char *buffer, int buffer_length)
|
||||
{
|
||||
int len = -1;
|
||||
char *file_path = mk_file_path(dir, file);
|
||||
char *file_path = test_mk_file_path(dir, file);
|
||||
|
||||
if (file_path != NULL) {
|
||||
BIO *file_io = BIO_new_file(file_path, "r");
|
||||
|
||||
Reference in New Issue
Block a user