diff options
| author | simon <simon@FreeBSD.org> | 2010-03-13 19:22:41 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2010-03-13 19:22:41 +0000 |
| commit | 0d816bbd980d8201a2ad23ccd05f7bde16565282 (patch) | |
| tree | 909a7c21b7df72ae8c08b80b468a4dd75b3820be /crypto/openssl/crypto/pem | |
| parent | 7fd3bd147ec574621124307eca10ead5353e34ba (diff) | |
| parent | cdb6eef1f013e22a10ab5f5829dcdc3b5e32d385 (diff) | |
| download | FreeBSD-src-0d816bbd980d8201a2ad23ccd05f7bde16565282.zip FreeBSD-src-0d816bbd980d8201a2ad23ccd05f7bde16565282.tar.gz | |
Merge OpenSSL 0.9.8m into head.
This also "reverts" some FreeBSD local changes so we should now
be back to using entirely stock OpenSSL. The local changes were
simple $FreeBSD$ lines additions, which were required in the CVS
days, and the patch for FreeBSD-SA-09:15.ssl which has been
superseded with OpenSSL 0.9.8m's RFC5746 'TLS renegotiation
extension' support.
MFC after: 3 weeks
Diffstat (limited to 'crypto/openssl/crypto/pem')
| -rw-r--r-- | crypto/openssl/crypto/pem/pem_seal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/pem/pem_seal.c b/crypto/openssl/crypto/pem/pem_seal.c index 4e554e5..59690b5 100644 --- a/crypto/openssl/crypto/pem/pem_seal.c +++ b/crypto/openssl/crypto/pem/pem_seal.c @@ -100,7 +100,7 @@ int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type, EVP_CIPHER_CTX_init(&ctx->cipher); ret=EVP_SealInit(&ctx->cipher,type,ek,ekl,iv,pubk,npubk); - if (!ret) goto err; + if (ret <= 0) goto err; /* base64 encode the keys */ for (i=0; i<npubk; i++) |
