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/pem | |
| parent | 3d2030852da420b820a661e7b19bb757487e2599 (diff) | |
Notes
Diffstat (limited to 'crypto/pem')
| -rw-r--r-- | crypto/pem/Makefile | 2 | ||||
| -rw-r--r-- | crypto/pem/pem_lib.c | 2 | ||||
| -rw-r--r-- | crypto/pem/pem_pk8.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/crypto/pem/Makefile b/crypto/pem/Makefile index 2cc7801529e0..7a930eeae774 100644 --- a/crypto/pem/Makefile +++ b/crypto/pem/Makefile @@ -64,6 +64,8 @@ tests: lint: lint -DLINT $(INCLUDES) $(SRC)>fluff +update: depend + depend: @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index febb53ed0eeb..55071616e203 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -435,7 +435,7 @@ int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp, int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen, pem_password_cb *callback, void *u) { - int i, j, o, klen; + int i = 0, j, o, klen; long len; EVP_CIPHER_CTX ctx; unsigned char key[EVP_MAX_KEY_LENGTH]; diff --git a/crypto/pem/pem_pk8.c b/crypto/pem/pem_pk8.c index b98c76c4a991..5747c7366e3d 100644 --- a/crypto/pem/pem_pk8.c +++ b/crypto/pem/pem_pk8.c @@ -138,6 +138,8 @@ static int do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid, if (kstr == buf) OPENSSL_cleanse(buf, klen); PKCS8_PRIV_KEY_INFO_free(p8inf); + if (p8 == NULL) + return 0; if (isder) ret = i2d_PKCS8_bio(bp, p8); else |