1 files changed, 10 insertions, 17 deletions

diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c
index 5a421fc4b6..cfc89a9921 100644
--- a/src/lib/libcrypto/pem/pem_lib.c
+++ b/src/lib/libcrypto/pem/pem_lib.c
@@ -394,8 +394,7 @@ int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp,
                         goto err;
                 /* The 'iv' is used as the iv and as a salt.  It is
                  * NOT taken from the BytesToKey function */
-                if (!EVP_BytesToKey(enc,EVP_md5(),iv,kstr,klen,1,key,NULL))
-                        goto err;
+                EVP_BytesToKey(enc,EVP_md5(),iv,kstr,klen,1,key,NULL);
 
                 if (kstr == (unsigned char *)buf) OPENSSL_cleanse(buf,PEM_BUFSIZE);
 
@@ -407,15 +406,12 @@ int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp,
                 /* k=strlen(buf); */
 
                 EVP_CIPHER_CTX_init(&ctx);
-                ret = 1;
-                if (!EVP_EncryptInit_ex(&ctx,enc,NULL,key,iv)
-                        || !EVP_EncryptUpdate(&ctx,data,&j,data,i)
-                        || !EVP_EncryptFinal_ex(&ctx,&(data[j]),&i))
-                        ret = 0;
+                EVP_EncryptInit_ex(&ctx,enc,NULL,key,iv);
+                EVP_EncryptUpdate(&ctx,data,&j,data,i);
+                EVP_EncryptFinal_ex(&ctx,&(data[j]),&i);
                 EVP_CIPHER_CTX_cleanup(&ctx);
-                if (ret == 0)
-                        goto err;
                 i+=j;
+                ret=1;
                 }
         else
                 {
@@ -463,17 +459,14 @@ int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
         ebcdic2ascii(buf, buf, klen);
 #endif
 
-        if (!EVP_BytesToKey(cipher->cipher,EVP_md5(),&(cipher->iv[0]),
-                (unsigned char *)buf,klen,1,key,NULL))
-                return 0;
+        EVP_BytesToKey(cipher->cipher,EVP_md5(),&(cipher->iv[0]),
+                (unsigned char *)buf,klen,1,key,NULL);
 
         j=(int)len;
         EVP_CIPHER_CTX_init(&ctx);
-        o = EVP_DecryptInit_ex(&ctx,cipher->cipher,NULL, key,&(cipher->iv[0]));
-        if (o)
-                o = EVP_DecryptUpdate(&ctx,data,&i,data,j);
-        if (o)
-                o = EVP_DecryptFinal_ex(&ctx,&(data[i]),&j);
+        EVP_DecryptInit_ex(&ctx,cipher->cipher,NULL, key,&(cipher->iv[0]));
+        EVP_DecryptUpdate(&ctx,data,&i,data,j);
+        o=EVP_DecryptFinal_ex(&ctx,&(data[i]),&j);
         EVP_CIPHER_CTX_cleanup(&ctx);
         OPENSSL_cleanse((char *)buf,sizeof(buf));
         OPENSSL_cleanse((char *)key,sizeof(key));