From be50aea0c942a96ff24dd9fee728a3bbeb42bdf2 Mon Sep 17 00:00:00 2001 From: jsing Date: Thu, 22 May 2014 17:33:17 +0000 Subject: [PATCH] Stop including kssl_lcl.h and nuke it from orbit - it is a no-op now. ok beck@ miod@ --- lib/libssl/s3_clnt.c | 1 - lib/libssl/s3_lib.c | 1 - lib/libssl/s3_srvr.c | 1 - lib/libssl/src/ssl/kssl_lcl.h | 64 ----------------------------------- lib/libssl/src/ssl/s3_clnt.c | 1 - lib/libssl/src/ssl/s3_lib.c | 1 - lib/libssl/src/ssl/s3_srvr.c | 1 - lib/libssl/src/ssl/ssl_lib.c | 1 - lib/libssl/ssl_lib.c | 1 - 9 files changed, 72 deletions(-) delete mode 100644 lib/libssl/src/ssl/kssl_lcl.h diff --git a/lib/libssl/s3_clnt.c b/lib/libssl/s3_clnt.c index 67e4d069c7a..010f9e4e12f 100644 --- a/lib/libssl/s3_clnt.c +++ b/lib/libssl/s3_clnt.c @@ -150,7 +150,6 @@ #include #include "ssl_locl.h" -#include "kssl_lcl.h" #include #include #include diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c index 7cdd1e2d89c..b99d6c4dd9f 100644 --- a/lib/libssl/s3_lib.c +++ b/lib/libssl/s3_lib.c @@ -151,7 +151,6 @@ #include #include #include "ssl_locl.h" -#include "kssl_lcl.h" #ifndef OPENSSL_NO_TLSEXT #ifndef OPENSSL_NO_EC #include "../crypto/ec/ec_lcl.h" diff --git a/lib/libssl/s3_srvr.c b/lib/libssl/s3_srvr.c index decf35d50fe..ff86ec3f1a5 100644 --- a/lib/libssl/s3_srvr.c +++ b/lib/libssl/s3_srvr.c @@ -153,7 +153,6 @@ #include #include "ssl_locl.h" -#include "kssl_lcl.h" #include #include #include diff --git a/lib/libssl/src/ssl/kssl_lcl.h b/lib/libssl/src/ssl/kssl_lcl.h deleted file mode 100644 index 35e203b7d6a..00000000000 --- a/lib/libssl/src/ssl/kssl_lcl.h +++ /dev/null @@ -1,64 +0,0 @@ -/* ssl/kssl.h -*- mode: C; c-file-style: "eay" -*- */ -/* Written by Vern Staats for the OpenSSL project 2000. - * project 2000. - */ -/* ==================================================================== - * Copyright (c) 2000 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * licensing@OpenSSL.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - -#ifndef KSSL_LCL_H -#define KSSL_LCL_H - -#include - -#endif /* KSSL_LCL_H */ diff --git a/lib/libssl/src/ssl/s3_clnt.c b/lib/libssl/src/ssl/s3_clnt.c index 67e4d069c7a..010f9e4e12f 100644 --- a/lib/libssl/src/ssl/s3_clnt.c +++ b/lib/libssl/src/ssl/s3_clnt.c @@ -150,7 +150,6 @@ #include #include "ssl_locl.h" -#include "kssl_lcl.h" #include #include #include diff --git a/lib/libssl/src/ssl/s3_lib.c b/lib/libssl/src/ssl/s3_lib.c index 7cdd1e2d89c..b99d6c4dd9f 100644 --- a/lib/libssl/src/ssl/s3_lib.c +++ b/lib/libssl/src/ssl/s3_lib.c @@ -151,7 +151,6 @@ #include #include #include "ssl_locl.h" -#include "kssl_lcl.h" #ifndef OPENSSL_NO_TLSEXT #ifndef OPENSSL_NO_EC #include "../crypto/ec/ec_lcl.h" diff --git a/lib/libssl/src/ssl/s3_srvr.c b/lib/libssl/src/ssl/s3_srvr.c index decf35d50fe..ff86ec3f1a5 100644 --- a/lib/libssl/src/ssl/s3_srvr.c +++ b/lib/libssl/src/ssl/s3_srvr.c @@ -153,7 +153,6 @@ #include #include "ssl_locl.h" -#include "kssl_lcl.h" #include #include #include diff --git a/lib/libssl/src/ssl/ssl_lib.c b/lib/libssl/src/ssl/ssl_lib.c index d046480feb5..847fb79f6ec 100644 --- a/lib/libssl/src/ssl/ssl_lib.c +++ b/lib/libssl/src/ssl/ssl_lib.c @@ -144,7 +144,6 @@ #include #include "ssl_locl.h" -#include "kssl_lcl.h" #include #include #include diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index d046480feb5..847fb79f6ec 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -144,7 +144,6 @@ #include #include "ssl_locl.h" -#include "kssl_lcl.h" #include #include #include -- 2.20.1