diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-06-11 17:56:16 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-06-11 17:56:16 +0000 |
| commit | a9745f9a849725cad34f84351bed202839aade59 (patch) | |
| tree | 686ec4279139441a2f9d947dceec492e54ff569c /crypto/dh | |
| parent | 3d2030852da420b820a661e7b19bb757487e2599 (diff) | |
| download | src-a9745f9a849725cad34f84351bed202839aade59.tar.gz src-a9745f9a849725cad34f84351bed202839aade59.zip | |
Import OpenSSL 1.0.1n.vendor/openssl/1.0.1n
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=284278
svn path=/vendor-crypto/openssl/1.0.1n/; revision=284279; tag=vendor/openssl/1.0.1n
Diffstat (limited to 'crypto/dh')
| -rw-r--r-- | crypto/dh/Makefile | 2 | ||||
| -rw-r--r-- | crypto/dh/dh_ameth.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/crypto/dh/Makefile b/crypto/dh/Makefile index f23b4f7fde84..6d574f407d39 100644 --- a/crypto/dh/Makefile +++ b/crypto/dh/Makefile @@ -63,6 +63,8 @@ tests: lint: lint -DLINT $(INCLUDES) $(SRC)>fluff +update: depend + depend: @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c index 1dec10983581..873eb2e22de8 100644 --- a/crypto/dh/dh_ameth.c +++ b/crypto/dh/dh_ameth.c @@ -135,7 +135,7 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) dh = pkey->pkey.dh; str = ASN1_STRING_new(); - if(!str) { + if (!str) { DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE); goto err; } |