projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
free null cleanup finale
[oweals/openssl.git]
/
crypto
/
evp
/
pmeth_gn.c
diff --git
a/crypto/evp/pmeth_gn.c
b/crypto/evp/pmeth_gn.c
index 46057cfac26200378f7646b25b115d68886e6a87..78467c98f7b8d748b090d1133e89a3ccf920e7ad 100644
(file)
--- a/
crypto/evp/pmeth_gn.c
+++ b/
crypto/evp/pmeth_gn.c
@@
-63,7
+63,7
@@
#include <openssl/objects.h>
#include <openssl/evp.h>
#include "internal/bn_int.h"
#include <openssl/objects.h>
#include <openssl/evp.h>
#include "internal/bn_int.h"
-#include "
evp_locl
.h"
+#include "
internal/evp_int
.h"
int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx)
{
int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx)
{
@@
-202,14
+202,11
@@
EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
return NULL;
if (EVP_PKEY_keygen_init(mac_ctx) <= 0)
goto merr;
return NULL;
if (EVP_PKEY_keygen_init(mac_ctx) <= 0)
goto merr;
- if (EVP_PKEY_CTX_ctrl(mac_ctx, -1, EVP_PKEY_OP_KEYGEN,
- EVP_PKEY_CTRL_SET_MAC_KEY,
- keylen, (void *)key) <= 0)
+ if (EVP_PKEY_CTX_set_mac_key(mac_ctx, key, keylen) <= 0)
goto merr;
if (EVP_PKEY_keygen(mac_ctx, &mac_key) <= 0)
goto merr;
merr:
goto merr;
if (EVP_PKEY_keygen(mac_ctx, &mac_key) <= 0)
goto merr;
merr:
- if (mac_ctx)
- EVP_PKEY_CTX_free(mac_ctx);
+ EVP_PKEY_CTX_free(mac_ctx);
return mac_key;
}
return mac_key;
}