projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add PSS parameter restrictions.
[openssl.git]
/
crypto
/
ex_data.c
diff --git
a/crypto/ex_data.c
b/crypto/ex_data.c
index d9807d585916572892856bdc7c26e67774cb8999..bb1af0b3b1f62fe5040dc8a16c4bea0192a11b0a 100644
(file)
--- a/
crypto/ex_data.c
+++ b/
crypto/ex_data.c
@@
-38,6
+38,7
@@
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_lock_new();
return ex_data_lock != NULL;
}
ex_data_lock = CRYPTO_THREAD_lock_new();
return ex_data_lock != NULL;
}
@@
-119,7
+120,7
@@
static void dummy_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad, int idx,
{
}
{
}
-static int dummy_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from,
+static int dummy_dup(CRYPTO_EX_DATA *to,
const
CRYPTO_EX_DATA *from,
void *from_d, int idx,
long argl, void *argp)
{
void *from_d, int idx,
long argl, void *argp)
{
@@
-250,7
+251,7
@@
int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
* for each index in the class used by this variable
*/
int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
* for each index in the class used by this variable
*/
int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
- CRYPTO_EX_DATA *from)
+
const
CRYPTO_EX_DATA *from)
{
int mx, j, i;
char *ptr;
{
int mx, j, i;
char *ptr;