Delete a lot of #if 0 code in libressl.

There are a few instances where #if 1 is removed but the code remains.

Based on the following OpenSSL commits.  Some of the commits weren't
strictly deletions so they are going to be split up into separate commits.

6f91b017bbb7140f816721141ac156d1b828a6b3
3d47c1d331fdc7574d2275cda1a630ccdb624b08
dfb56425b68314b2b57e17c82c1df42e7a015132
c8fa2356a00cbaada8963f739e5570298311a060
f16a64d11f55c01f56baa62ebf1dec7f8fe718cb
9ccc00ef6ea65567622e40c49aca43f2c6d79cdb
02a938c953b3e1ced71d9a832de1618f907eb96d
75d0ebef2aef7a2c77b27575b8da898e22f3ccd5
d6fbb194095312f4722c81c9362dbd0de66cb656
6f1a93ad111c7dfe36a09a976c4c009079b19ea1
1a5adcfb5edfe23908b350f8757df405b0f5f71f
8de24b792743d11e1d5a0dcd336a49368750c577
a2b18e657ea1a932d125154f4e13ab2258796d90
8e964419603d2478dfb391c66e7ccb2dcc9776b4
32dfde107636ac9bc62a5b3233fe2a54dbc27008

input + ok jsing@, miod@, tedu@

1 files changed, 2 insertions, 23 deletions

diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c
index d69aff8f41..252fab04d7 100644
--- a/src/lib/libcrypto/pkcs7/pk7_doit.c
+++ b/src/lib/libcrypto/pkcs7/pk7_doit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pk7_doit.c,v 1.30 2014/10/22 13:02:04 jsing Exp $ */
+/* $OpenBSD: pk7_doit.c,v 1.31 2015/02/07 13:19:15 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -482,15 +482,6 @@ PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
         }
 
         if (evp_cipher != NULL) {
-#if 0
-                unsigned char key[EVP_MAX_KEY_LENGTH];
-                unsigned char iv[EVP_MAX_IV_LENGTH];
-                unsigned char *p;
-                int keylen, ivlen;
-                int max;
-                X509_OBJECT ret;
-#endif
-
                 if ((etmp = BIO_new(BIO_f_cipher())) == NULL) {
                         PKCS7err(PKCS7_F_PKCS7_DATADECODE, ERR_R_BIO_LIB);
                         goto err;
@@ -594,20 +585,9 @@ PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
                 etmp = NULL;
         }
 
-#if 1
         if (PKCS7_is_detached(p7) || (in_bio != NULL)) {
                 bio = in_bio;
         } else {
-#if 0
-                bio = BIO_new(BIO_s_mem());
-                /* We need to set this so that when we have read all
-                 * the data, the encrypt BIO, if present, will read
-                 * EOF and encode the last few bytes */
-                BIO_set_mem_eof_return(bio, 0);
-
-                if (data_body != NULL && data_body->length > 0)
-                        BIO_write(bio, (char *)data_body->data, data_body->length);
-#else
                 if (data_body != NULL && data_body->length > 0)
                         bio = BIO_new_mem_buf(data_body->data, data_body->length);
                 else {
@@ -616,11 +596,10 @@ PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
                 }
                 if (bio == NULL)
                         goto err;
-#endif
         }
         BIO_push(out, bio);
         bio = NULL;
-#endif
+
         if (0) {
 err:
                 if (ek) {