projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep the NIST AES vectors that were there previously.
[oweals/openssl.git]
/
crypto
/
evp
/
p_lib.c
diff --git
a/crypto/evp/p_lib.c
b/crypto/evp/p_lib.c
index 94c4047a5e165dd626bd5f1b138338b4b7c4250c..215b94292aae4428aeb3cda5a97c7aaa59aecf1a 100644
(file)
--- a/
crypto/evp/p_lib.c
+++ b/
crypto/evp/p_lib.c
@@
-64,14
+64,15
@@
#include <openssl/x509.h>
static void EVP_PKEY_free_it(EVP_PKEY *x);
#include <openssl/x509.h>
static void EVP_PKEY_free_it(EVP_PKEY *x);
+
int EVP_PKEY_bits(EVP_PKEY *pkey)
{
int EVP_PKEY_bits(EVP_PKEY *pkey)
{
-#ifndef NO_RSA
+#ifndef
OPENSSL_
NO_RSA
if (pkey->type == EVP_PKEY_RSA)
return(BN_num_bits(pkey->pkey.rsa->n));
else
#endif
if (pkey->type == EVP_PKEY_RSA)
return(BN_num_bits(pkey->pkey.rsa->n));
else
#endif
-#ifndef NO_DSA
+#ifndef
OPENSSL_
NO_DSA
if (pkey->type == EVP_PKEY_DSA)
return(BN_num_bits(pkey->pkey.dsa->p));
#endif
if (pkey->type == EVP_PKEY_DSA)
return(BN_num_bits(pkey->pkey.dsa->p));
#endif
@@
-82,12
+83,12
@@
int EVP_PKEY_size(EVP_PKEY *pkey)
{
if (pkey == NULL)
return(0);
{
if (pkey == NULL)
return(0);
-#ifndef NO_RSA
+#ifndef
OPENSSL_
NO_RSA
if (pkey->type == EVP_PKEY_RSA)
return(RSA_size(pkey->pkey.rsa));
else
#endif
if (pkey->type == EVP_PKEY_RSA)
return(RSA_size(pkey->pkey.rsa));
else
#endif
-#ifndef NO_DSA
+#ifndef
OPENSSL_
NO_DSA
if (pkey->type == EVP_PKEY_DSA)
return(DSA_size(pkey->pkey.dsa));
#endif
if (pkey->type == EVP_PKEY_DSA)
return(DSA_size(pkey->pkey.dsa));
#endif
@@
-96,10
+97,10
@@
int EVP_PKEY_size(EVP_PKEY *pkey)
int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
{
int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
{
-#ifndef NO_DSA
+#ifndef
OPENSSL_
NO_DSA
if (pkey->type == EVP_PKEY_DSA)
{
if (pkey->type == EVP_PKEY_DSA)
{
- int ret=pkey->save_parameters
=mode
;
+ int ret=pkey->save_parameters;
if (mode >= 0)
pkey->save_parameters=mode;
if (mode >= 0)
pkey->save_parameters=mode;
@@
-119,10
+120,10
@@
int EVP_PKEY_copy_parameters(EVP_PKEY *to, EVP_PKEY *from)
if (EVP_PKEY_missing_parameters(from))
{
if (EVP_PKEY_missing_parameters(from))
{
- EVPerr(EVP_F_EVP_PKEY_COPY_PARAMETERS,EVP_R_MISSING_PAR
MA
TERS);
+ EVPerr(EVP_F_EVP_PKEY_COPY_PARAMETERS,EVP_R_MISSING_PAR
AME
TERS);
goto err;
}
goto err;
}
-#ifndef NO_DSA
+#ifndef
OPENSSL_
NO_DSA
if (to->type == EVP_PKEY_DSA)
{
BIGNUM *a;
if (to->type == EVP_PKEY_DSA)
{
BIGNUM *a;
@@
-147,7
+148,7
@@
err:
int EVP_PKEY_missing_parameters(EVP_PKEY *pkey)
{
int EVP_PKEY_missing_parameters(EVP_PKEY *pkey)
{
-#ifndef NO_DSA
+#ifndef
OPENSSL_
NO_DSA
if (pkey->type == EVP_PKEY_DSA)
{
DSA *dsa;
if (pkey->type == EVP_PKEY_DSA)
{
DSA *dsa;
@@
-162,7
+163,7
@@
int EVP_PKEY_missing_parameters(EVP_PKEY *pkey)
int EVP_PKEY_cmp_parameters(EVP_PKEY *a, EVP_PKEY *b)
{
int EVP_PKEY_cmp_parameters(EVP_PKEY *a, EVP_PKEY *b)
{
-#ifndef NO_DSA
+#ifndef
OPENSSL_
NO_DSA
if ((a->type == EVP_PKEY_DSA) && (b->type == EVP_PKEY_DSA))
{
if ( BN_cmp(a->pkey.dsa->p,b->pkey.dsa->p) ||
if ((a->type == EVP_PKEY_DSA) && (b->type == EVP_PKEY_DSA))
{
if ( BN_cmp(a->pkey.dsa->p,b->pkey.dsa->p) ||
@@
-180,7
+181,7
@@
EVP_PKEY *EVP_PKEY_new(void)
{
EVP_PKEY *ret;
{
EVP_PKEY *ret;
- ret=(EVP_PKEY *)
M
alloc(sizeof(EVP_PKEY));
+ ret=(EVP_PKEY *)
OPENSSL_m
alloc(sizeof(EVP_PKEY));
if (ret == NULL)
{
EVPerr(EVP_F_EVP_PKEY_NEW,ERR_R_MALLOC_FAILURE);
if (ret == NULL)
{
EVPerr(EVP_F_EVP_PKEY_NEW,ERR_R_MALLOC_FAILURE);
@@
-202,63
+203,66
@@
int EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key)
pkey->type=EVP_PKEY_type(type);
pkey->save_type=type;
pkey->pkey.ptr=key;
pkey->type=EVP_PKEY_type(type);
pkey->save_type=type;
pkey->pkey.ptr=key;
- return(
1
);
+ return(
key != NULL
);
}
}
-#ifndef NO_RSA
-int EVP_PKEY_
rset
_RSA(EVP_PKEY *pkey, RSA *key)
+#ifndef
OPENSSL_
NO_RSA
+int EVP_PKEY_
set1
_RSA(EVP_PKEY *pkey, RSA *key)
{
int ret = EVP_PKEY_assign_RSA(pkey, key);
{
int ret = EVP_PKEY_assign_RSA(pkey, key);
- if(ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_RSA);
+ if(ret)
+ RSA_up_ref(key);
return ret;
}
return ret;
}
-RSA *EVP_PKEY_
rget
_RSA(EVP_PKEY *pkey)
+RSA *EVP_PKEY_
get1
_RSA(EVP_PKEY *pkey)
{
if(pkey->type != EVP_PKEY_RSA) {
{
if(pkey->type != EVP_PKEY_RSA) {
- EVPerr(EVP_F_EVP_PKEY_
RGET
_RSA, EVP_R_EXPECTING_AN_RSA_KEY);
+ EVPerr(EVP_F_EVP_PKEY_
GET1
_RSA, EVP_R_EXPECTING_AN_RSA_KEY);
return NULL;
}
return NULL;
}
-
CRYPTO_add(&pkey->pkey.rsa->references, 1, CRYPTO_LOCK_RSA
);
+
RSA_up_ref(pkey->pkey.rsa
);
return pkey->pkey.rsa;
}
#endif
return pkey->pkey.rsa;
}
#endif
-#ifndef NO_DSA
-int EVP_PKEY_
rset
_DSA(EVP_PKEY *pkey, DSA *key)
+#ifndef
OPENSSL_
NO_DSA
+int EVP_PKEY_
set1
_DSA(EVP_PKEY *pkey, DSA *key)
{
int ret = EVP_PKEY_assign_DSA(pkey, key);
{
int ret = EVP_PKEY_assign_DSA(pkey, key);
- if(ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_DSA);
+ if(ret)
+ DSA_up_ref(key);
return ret;
}
return ret;
}
-DSA *EVP_PKEY_
rget
_DSA(EVP_PKEY *pkey)
+DSA *EVP_PKEY_
get1
_DSA(EVP_PKEY *pkey)
{
if(pkey->type != EVP_PKEY_DSA) {
{
if(pkey->type != EVP_PKEY_DSA) {
- EVPerr(EVP_F_EVP_PKEY_
RGET
_DSA, EVP_R_EXPECTING_A_DSA_KEY);
+ EVPerr(EVP_F_EVP_PKEY_
GET1
_DSA, EVP_R_EXPECTING_A_DSA_KEY);
return NULL;
}
return NULL;
}
-
CRYPTO_add(&pkey->pkey.dsa->references, 1, CRYPTO_LOCK_DSA
);
+
DSA_up_ref(pkey->pkey.dsa
);
return pkey->pkey.dsa;
}
#endif
return pkey->pkey.dsa;
}
#endif
-#ifndef NO_DH
+#ifndef
OPENSSL_
NO_DH
-int EVP_PKEY_
rset
_DH(EVP_PKEY *pkey, DH *key)
+int EVP_PKEY_
set1
_DH(EVP_PKEY *pkey, DH *key)
{
int ret = EVP_PKEY_assign_DH(pkey, key);
{
int ret = EVP_PKEY_assign_DH(pkey, key);
- if(ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_DH);
+ if(ret)
+ DH_up_ref(key);
return ret;
}
return ret;
}
-DH *EVP_PKEY_
rget
_DH(EVP_PKEY *pkey)
+DH *EVP_PKEY_
get1
_DH(EVP_PKEY *pkey)
{
if(pkey->type != EVP_PKEY_DH) {
{
if(pkey->type != EVP_PKEY_DH) {
- EVPerr(EVP_F_EVP_PKEY_
RGET
_DH, EVP_R_EXPECTING_A_DH_KEY);
+ EVPerr(EVP_F_EVP_PKEY_
GET1
_DH, EVP_R_EXPECTING_A_DH_KEY);
return NULL;
}
return NULL;
}
-
CRYPTO_add(&pkey->pkey.dh->references, 1, CRYPTO_LOCK_DH
);
+
DH_up_ref(pkey->pkey.dh
);
return pkey->pkey.dh;
}
#endif
return pkey->pkey.dh;
}
#endif
@@
-302,20
+306,20
@@
void EVP_PKEY_free(EVP_PKEY *x)
}
#endif
EVP_PKEY_free_it(x);
}
#endif
EVP_PKEY_free_it(x);
-
Free((char *)
x);
+
OPENSSL_free(
x);
}
static void EVP_PKEY_free_it(EVP_PKEY *x)
{
switch (x->type)
{
}
static void EVP_PKEY_free_it(EVP_PKEY *x)
{
switch (x->type)
{
-#ifndef NO_RSA
+#ifndef
OPENSSL_
NO_RSA
case EVP_PKEY_RSA:
case EVP_PKEY_RSA2:
RSA_free(x->pkey.rsa);
break;
#endif
case EVP_PKEY_RSA:
case EVP_PKEY_RSA2:
RSA_free(x->pkey.rsa);
break;
#endif
-#ifndef NO_DSA
+#ifndef
OPENSSL_
NO_DSA
case EVP_PKEY_DSA:
case EVP_PKEY_DSA2:
case EVP_PKEY_DSA3:
case EVP_PKEY_DSA:
case EVP_PKEY_DSA2:
case EVP_PKEY_DSA3:
@@
-323,7
+327,7
@@
static void EVP_PKEY_free_it(EVP_PKEY *x)
DSA_free(x->pkey.dsa);
break;
#endif
DSA_free(x->pkey.dsa);
break;
#endif
-#ifndef NO_DH
+#ifndef
OPENSSL_
NO_DH
case EVP_PKEY_DH:
DH_free(x->pkey.dh);
break;
case EVP_PKEY_DH:
DH_free(x->pkey.dh);
break;