[openssl-commits] [openssl] master update

[Emilia Kasper]

The branch master has been updated
       via  5c2ee53f71ac51c67556cb2b3fb98f5b141efd8a (commit)
       via  ebc354a0858711150ee19c40c808dec9dd9bc5cd (commit)
      from  d86f2f26c8212342de45f3e7bda1e25ef8d9419a (commit)


- Log -----------------------------------------------------------------
commit 5c2ee53f71ac51c67556cb2b3fb98f5b141efd8a
Author: Emilia Kasper <emilia at openssl.org>
Date:   Tue Feb 28 11:37:22 2017 +0100

    Remove dead code in crypto/pkcs7
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

commit ebc354a0858711150ee19c40c808dec9dd9bc5cd
Author: Emilia Kasper <emilia at openssl.org>
Date:   Tue Feb 28 11:33:38 2017 +0100

    Remove methtest.c
    
    This file tests code that doesn't exist.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/pkcs7/pk7_dgst.c | 15 -------------
 crypto/pkcs7/pk7_enc.c  | 25 ----------------------
 test/methtest.c         | 57 -------------------------------------------------
 3 files changed, 97 deletions(-)
 delete mode 100644 crypto/pkcs7/pk7_dgst.c
 delete mode 100644 crypto/pkcs7/pk7_enc.c
 delete mode 100644 test/methtest.c

diff --git a/crypto/pkcs7/pk7_dgst.c b/crypto/pkcs7/pk7_dgst.c
deleted file mode 100644
index 965fb37..0000000
--- a/crypto/pkcs7/pk7_dgst.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#include <stdio.h>
-#include "internal/cryptlib.h"
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-#include <openssl/pkcs7.h>
diff --git a/crypto/pkcs7/pk7_enc.c b/crypto/pkcs7/pk7_enc.c
deleted file mode 100644
index 3c59f9c..0000000
--- a/crypto/pkcs7/pk7_enc.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#include <stdio.h>
-#include "internal/cryptlib.h"
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-#include <openssl/pkcs7.h>
-
-PKCS7_in_bio(PKCS7 *p7, BIO *in);
-PKCS7_out_bio(PKCS7 *p7, BIO *out);
-
-PKCS7_add_signer(PKCS7 *p7, X509 *cert, EVP_PKEY *key);
-PKCS7_cipher(PKCS7 *p7, EVP_CIPHER *cipher);
-
-PKCS7_Init(PKCS7 *p7);
-PKCS7_Update(PKCS7 *p7);
-PKCS7_Finish(PKCS7 *p7);
diff --git a/test/methtest.c b/test/methtest.c
deleted file mode 100644
index 11aa233..0000000
--- a/test/methtest.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/rsa.h>
-#include <openssl/x509.h>
-#include "meth.h"
-#include <openssl/err.h>
-
-int main(argc, argv)
-int argc;
-char *argv[];
-{
-    METHOD_CTX *top, *tmp1, *tmp2;
-
-    top = METH_new(x509_lookup()); /* get a top level context */
-    if (top == NULL)
-        goto err;
-
-    tmp1 = METH_new(x509_by_file());
-    if (top == NULL)
-        goto err;
-    METH_arg(tmp1, METH_TYPE_FILE, "cafile1");
-    METH_arg(tmp1, METH_TYPE_FILE, "cafile2");
-    METH_push(top, METH_X509_CA_BY_SUBJECT, tmp1);
-
-    tmp2 = METH_new(x509_by_dir());
-    METH_arg(tmp2, METH_TYPE_DIR, "/home/eay/.CAcerts");
-    METH_arg(tmp2, METH_TYPE_DIR, "/home/eay/SSLeay/certs");
-    METH_arg(tmp2, METH_TYPE_DIR, "/usr/local/ssl/certs");
-    METH_push(top, METH_X509_CA_BY_SUBJECT, tmp2);
-
-/*- tmp=METH_new(x509_by_issuer_dir);
-    METH_arg(tmp,METH_TYPE_DIR,"/home/eay/.mycerts");
-    METH_push(top,METH_X509_BY_ISSUER,tmp);
-
-    tmp=METH_new(x509_by_issuer_primary);
-    METH_arg(tmp,METH_TYPE_FILE,"/home/eay/.mycerts/primary.pem");
-    METH_push(top,METH_X509_BY_ISSUER,tmp);
-*/
-
-    METH_init(top);
-    METH_control(tmp1, METH_CONTROL_DUMP, stdout);
-    METH_control(tmp2, METH_CONTROL_DUMP, stdout);
-    EXIT(0);
- err:
-    ERR_print_errors_fp(stderr);
-    EXIT(1);
-    return (0);
-}