diff options
author | djm <> | 2012-10-13 21:23:50 +0000 |
---|---|---|
committer | djm <> | 2012-10-13 21:23:50 +0000 |
commit | d56dbc3c72494d4b68c03f5bcc3ae1f9df7b17df (patch) | |
tree | 10ebe51c3542099b0ab8325d8f322372375dc3b4 /src/lib/libcrypto/evp/pmeth_gn.c | |
parent | bc685bd401e5657f7fb51b4e1a62a7a5c5ea4098 (diff) | |
parent | 228cae30b117c2493f69ad3c195341cd6ec8d430 (diff) | |
download | openbsd-d56dbc3c72494d4b68c03f5bcc3ae1f9df7b17df.tar.gz openbsd-d56dbc3c72494d4b68c03f5bcc3ae1f9df7b17df.tar.bz2 openbsd-d56dbc3c72494d4b68c03f5bcc3ae1f9df7b17df.zip |
This commit was generated by cvs2git to track changes on a CVS vendor
branch.
Diffstat (limited to 'src/lib/libcrypto/evp/pmeth_gn.c')
-rw-r--r-- | src/lib/libcrypto/evp/pmeth_gn.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libcrypto/evp/pmeth_gn.c b/src/lib/libcrypto/evp/pmeth_gn.c index 5d74161a09..4651c81370 100644 --- a/src/lib/libcrypto/evp/pmeth_gn.c +++ b/src/lib/libcrypto/evp/pmeth_gn.c | |||
@@ -199,7 +199,7 @@ int EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx) | |||
199 | } | 199 | } |
200 | 200 | ||
201 | EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e, | 201 | EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e, |
202 | unsigned char *key, int keylen) | 202 | const unsigned char *key, int keylen) |
203 | { | 203 | { |
204 | EVP_PKEY_CTX *mac_ctx = NULL; | 204 | EVP_PKEY_CTX *mac_ctx = NULL; |
205 | EVP_PKEY *mac_key = NULL; | 205 | EVP_PKEY *mac_key = NULL; |
@@ -209,7 +209,8 @@ EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e, | |||
209 | if (EVP_PKEY_keygen_init(mac_ctx) <= 0) | 209 | if (EVP_PKEY_keygen_init(mac_ctx) <= 0) |
210 | goto merr; | 210 | goto merr; |
211 | if (EVP_PKEY_CTX_ctrl(mac_ctx, -1, EVP_PKEY_OP_KEYGEN, | 211 | if (EVP_PKEY_CTX_ctrl(mac_ctx, -1, EVP_PKEY_OP_KEYGEN, |
212 | EVP_PKEY_CTRL_SET_MAC_KEY, keylen, key) <= 0) | 212 | EVP_PKEY_CTRL_SET_MAC_KEY, |
213 | keylen, (void *)key) <= 0) | ||
213 | goto merr; | 214 | goto merr; |
214 | if (EVP_PKEY_keygen(mac_ctx, &mac_key) <= 0) | 215 | if (EVP_PKEY_keygen(mac_ctx, &mac_key) <= 0) |
215 | goto merr; | 216 | goto merr; |