diff options
| author | marha <marha@users.sourceforge.net> | 2015-06-15 20:18:50 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-06-15 20:18:50 +0200 |
| commit | 5fe210ff514aa4b3149ea7561862776d7b8849e7 (patch) | |
| tree | e03de3521d40e559090e665d6dc46cd03c0d877c /openssl/crypto/dh | |
| parent | 843964ee791452b197e41dacb0146f5b456ffaa5 (diff) | |
| download | vcxsrv-5fe210ff514aa4b3149ea7561862776d7b8849e7.tar.gz vcxsrv-5fe210ff514aa4b3149ea7561862776d7b8849e7.tar.bz2 vcxsrv-5fe210ff514aa4b3149ea7561862776d7b8849e7.zip | |
Update to openssl-1.0.2c
Diffstat (limited to 'openssl/crypto/dh')
| -rw-r--r-- | openssl/crypto/dh/Makefile | 2 | ||||
| -rw-r--r-- | openssl/crypto/dh/dh_ameth.c | 2 | ||||
| -rw-r--r-- | openssl/crypto/dh/dh_pmeth.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/openssl/crypto/dh/Makefile b/openssl/crypto/dh/Makefile index f44790782..46fa5ac57 100644 --- a/openssl/crypto/dh/Makefile +++ b/openssl/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/openssl/crypto/dh/dh_ameth.c b/openssl/crypto/dh/dh_ameth.c index c6bfc2d3f..ac72468bd 100644 --- a/openssl/crypto/dh/dh_ameth.c +++ b/openssl/crypto/dh/dh_ameth.c @@ -160,7 +160,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; } diff --git a/openssl/crypto/dh/dh_pmeth.c b/openssl/crypto/dh/dh_pmeth.c index b3a31472a..b58e3fa86 100644 --- a/openssl/crypto/dh/dh_pmeth.c +++ b/openssl/crypto/dh/dh_pmeth.c @@ -462,7 +462,7 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, ret = 0; Zlen = DH_size(dh); Z = OPENSSL_malloc(Zlen); - if(!Z) { + if (!Z) { goto err; } if (DH_compute_key_padded(Z, dhpub, dh) <= 0) |