You've already forked linux-packaging-mono
Imported Upstream version 6.4.0.137
Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
parent
e9207cf623
commit
ef583813eb
8
external/boringssl/crypto/x509/by_dir.c
vendored
8
external/boringssl/crypto/x509/by_dir.c
vendored
@@ -68,6 +68,12 @@
|
||||
|
||||
#include "../internal.h"
|
||||
|
||||
#ifdef OPENSSL_WINDOWS
|
||||
#define LIST_SEPARATOR_CHAR ';'
|
||||
#else
|
||||
#define LIST_SEPARATOR_CHAR ':'
|
||||
#endif
|
||||
|
||||
typedef struct lookup_dir_hashes_st {
|
||||
unsigned long hash;
|
||||
int suffix;
|
||||
@@ -203,7 +209,7 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
|
||||
s = dir;
|
||||
p = s;
|
||||
do {
|
||||
if ((*p == ':') || (*p == '\0')) {
|
||||
if ((*p == LIST_SEPARATOR_CHAR) || (*p == '\0')) {
|
||||
BY_DIR_ENTRY *ent;
|
||||
ss = s;
|
||||
s = p + 1;
|
||||
|
10
external/boringssl/crypto/x509/x509_def.c
vendored
10
external/boringssl/crypto/x509/x509_def.c
vendored
@@ -59,7 +59,17 @@
|
||||
|
||||
/* TODO(fork): cleanup */
|
||||
|
||||
#ifdef OPENSSL_WINDOWS
|
||||
/* OpenSSL defaults on Windows. */
|
||||
#ifdef _WIN64
|
||||
#define OPENSSLDIR "C:\\Program Files\\Common Files\\SSL"
|
||||
#else
|
||||
#define OPENSSLDIR "C:\\Program Files (x86)\\Common Files\\SSL"
|
||||
#endif
|
||||
#else
|
||||
#define OPENSSLDIR "/etc/ssl"
|
||||
#endif
|
||||
|
||||
#define X509_CERT_AREA OPENSSLDIR
|
||||
#define X509_CERT_DIR OPENSSLDIR "/certs"
|
||||
#define X509_CERT_FILE OPENSSLDIR "/cert.pem"
|
||||
|
Reference in New Issue
Block a user