mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-17 14:32:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix store with opaque data

Browse Source 
When experimental-store is enabled, it does not compile due to the
change to opaque data structures.

Change CRYPTO_add() to EVP_PKEY_up_ref() as needed.

Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>

RT: #4263, GH: #579
This commit is contained in:
Todd Short 2016-01-21 14:26:53 -05:00 committed by Kurt Roeckx
parent 33a23fa6af
commit de42e71701
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crypto/store/str_lib.c
View File

@ -420,7 +420,7 @@ EVP_PKEY *STORE_generate_key(STORE *s, OPENSSL_ITEM attributes[],
STOREerr(STORE_F_STORE_GENERATE_KEY, STORE_R_FAILED_GENERATING_KEY);
return 0;
}
CRYPTO_add(&object->data.key->references, 1, CRYPTO_LOCK_EVP_PKEY);
EVP_PKEY_up_ref(object->data.key);
#ifdef REF_PRINT
REF_PRINT("EVP_PKEY", data);
#endif
@ -444,7 +444,7 @@ EVP_PKEY *STORE_get_private_key(STORE *s, OPENSSL_ITEM attributes[],
STOREerr(STORE_F_STORE_GET_PRIVATE_KEY, STORE_R_FAILED_GETTING_KEY);
return 0;
}
CRYPTO_add(&object->data.key->references, 1, CRYPTO_LOCK_EVP_PKEY);
EVP_PKEY_up_ref(object->data.key);
#ifdef REF_PRINT
REF_PRINT("EVP_PKEY", data);
#endif
@ -474,7 +474,7 @@ int STORE_store_private_key(STORE *s, EVP_PKEY *data,
return 0;
}
CRYPTO_add(&data->references, 1, CRYPTO_LOCK_EVP_PKEY);
EVP_PKEY_up_ref(data);
#ifdef REF_PRINT
REF_PRINT("EVP_PKEY", data);
#endif
@ -578,7 +578,7 @@ EVP_PKEY *STORE_list_private_key_next(STORE *s, void *handle)
STORE_R_FAILED_LISTING_KEYS);
return 0;
}
CRYPTO_add(&object->data.key->references, 1, CRYPTO_LOCK_EVP_PKEY);
EVP_PKEY_up_ref(object->data.key);
#ifdef REF_PRINT
REF_PRINT("EVP_PKEY", data);
#endif
@ -628,7 +628,7 @@ EVP_PKEY *STORE_get_public_key(STORE *s, OPENSSL_ITEM attributes[],
STOREerr(STORE_F_STORE_GET_PUBLIC_KEY, STORE_R_FAILED_GETTING_KEY);
return 0;
}
CRYPTO_add(&object->data.key->references, 1, CRYPTO_LOCK_EVP_PKEY);
EVP_PKEY_up_ref(object->data.key);
#ifdef REF_PRINT
REF_PRINT("EVP_PKEY", data);
#endif
@ -658,7 +658,7 @@ int STORE_store_public_key(STORE *s, EVP_PKEY *data,
return 0;
}
CRYPTO_add(&data->references, 1, CRYPTO_LOCK_EVP_PKEY);
EVP_PKEY_up_ref(data);
#ifdef REF_PRINT
REF_PRINT("EVP_PKEY", data);
#endif
@ -762,7 +762,7 @@ EVP_PKEY *STORE_list_public_key_next(STORE *s, void *handle)
STORE_R_FAILED_LISTING_KEYS);
return 0;
}
CRYPTO_add(&object->data.key->references, 1, CRYPTO_LOCK_EVP_PKEY);
EVP_PKEY_up_ref(object->data.key);
#ifdef REF_PRINT
REF_PRINT("EVP_PKEY", data);
#endif