projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix (most) WIN32 warnings and errors.
[openssl.git]
/
crypto
/
evp
/
p_lib.c
diff --git
a/crypto/evp/p_lib.c
b/crypto/evp/p_lib.c
index f18ac62a0fe98832bde6cfba94cfe2e2d0081f94..1a1e61a64e00425a6f6f83cb32b6dbb0ff4f8659 100644
(file)
--- a/
crypto/evp/p_lib.c
+++ b/
crypto/evp/p_lib.c
@@
-185,7
+185,7
@@
EVP_PKEY *EVP_PKEY_new(void)
return(ret);
}
return(ret);
}
-int EVP_PKEY_assign(EVP_PKEY *pkey, int type,
char
*key)
+int EVP_PKEY_assign(EVP_PKEY *pkey, int type,
void
*key)
{
const EVP_PKEY_ASN1_METHOD *ameth;
if (pkey == NULL) return(0);
{
const EVP_PKEY_ASN1_METHOD *ameth;
if (pkey == NULL) return(0);
@@
-199,6
+199,11
@@
int EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key)
return(key != NULL);
}
return(key != NULL);
}
+void *EVP_PKEY_get0(EVP_PKEY *pkey)
+ {
+ return pkey->pkey.ptr;
+ }
+
#ifndef OPENSSL_NO_RSA
int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key)
{
#ifndef OPENSSL_NO_RSA
int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key)
{