projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor fixes for Windows
[openssl.git]
/
crypto
/
ex_data.c
diff --git
a/crypto/ex_data.c
b/crypto/ex_data.c
index 30b16f945728a6c4de1601782987606ac77c7653..08dc7c40734decef18b7de84b996fd6e6123c5fc 100644
(file)
--- a/
crypto/ex_data.c
+++ b/
crypto/ex_data.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 1995-201
6
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-201
8
The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@
-9,7
+9,6
@@
#include "internal/cryptlib_int.h"
#include "internal/thread_once.h"
#include "internal/cryptlib_int.h"
#include "internal/thread_once.h"
-#include <openssl/lhash.h>
/*
* Each structure type (sometimes called a class), that supports
/*
* Each structure type (sometimes called a class), that supports
@@
-38,8
+37,9
@@
static CRYPTO_ONCE ex_data_init = CRYPTO_ONCE_STATIC_INIT;
DEFINE_RUN_ONCE_STATIC(do_ex_data_init)
{
DEFINE_RUN_ONCE_STATIC(do_ex_data_init)
{
- OPENSSL_init_crypto(0, NULL);
- ex_data_lock = CRYPTO_THREAD_glock_new("ex_data");
+ if (!OPENSSL_init_crypto(0, NULL))
+ return 0;
+ ex_data_lock = CRYPTO_THREAD_lock_new();
return ex_data_lock != NULL;
}
return ex_data_lock != NULL;
}