projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve make depend.
[oweals/openssl.git]
/
crypto
/
evp
/
pmeth_fn.c
diff --git
a/crypto/evp/pmeth_fn.c
b/crypto/evp/pmeth_fn.c
index 829b5f04095711bc5e4b5def6fe89a201f2f92f9..d86110b4e77a12c3da5380c84ebeb6b304fd5f4e 100644
(file)
--- a/
crypto/evp/pmeth_fn.c
+++ b/
crypto/evp/pmeth_fn.c
@@
-59,7
+59,7
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include "cryptlib.h"
+#include "
internal/
cryptlib.h"
#include <openssl/objects.h>
#include <openssl/evp.h>
#include "internal/evp_int.h"
#include <openssl/objects.h>
#include <openssl/evp.h>
#include "internal/evp_int.h"
@@
-315,8
+315,7
@@
int EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer)
return -1;
}
return -1;
}
- if (ctx->peerkey)
- EVP_PKEY_free(ctx->peerkey);
+ EVP_PKEY_free(ctx->peerkey);
ctx->peerkey = peer;
ret = ctx->pmeth->ctrl(ctx, EVP_PKEY_CTRL_PEER_KEY, 1, peer);
ctx->peerkey = peer;
ret = ctx->pmeth->ctrl(ctx, EVP_PKEY_CTRL_PEER_KEY, 1, peer);