summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2014-05-22 17:33:17 +0000
committerjsing <>2014-05-22 17:33:17 +0000
commit7c930e6398438c779870392401030d84b985b97f (patch)
tree404248f38c481332efe086ee174e9812c9482dbb
parent2e5d530784973856089132db3a9012c518e0a739 (diff)
downloadopenbsd-7c930e6398438c779870392401030d84b985b97f.tar.gz
openbsd-7c930e6398438c779870392401030d84b985b97f.tar.bz2
openbsd-7c930e6398438c779870392401030d84b985b97f.zip
Stop including kssl_lcl.h and nuke it from orbit - it is a no-op now.
ok beck@ miod@
-rw-r--r--src/lib/libssl/s3_clnt.c1
-rw-r--r--src/lib/libssl/s3_lib.c1
-rw-r--r--src/lib/libssl/s3_srvr.c1
-rw-r--r--src/lib/libssl/src/ssl/kssl_lcl.h64
-rw-r--r--src/lib/libssl/src/ssl/s3_clnt.c1
-rw-r--r--src/lib/libssl/src/ssl/s3_lib.c1
-rw-r--r--src/lib/libssl/src/ssl/s3_srvr.c1
-rw-r--r--src/lib/libssl/src/ssl/ssl_lib.c1
-rw-r--r--src/lib/libssl/ssl_lib.c1
9 files changed, 0 insertions, 72 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index 67e4d069c7..010f9e4e12 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -150,7 +150,6 @@
150 150
151#include <stdio.h> 151#include <stdio.h>
152#include "ssl_locl.h" 152#include "ssl_locl.h"
153#include "kssl_lcl.h"
154#include <openssl/buffer.h> 153#include <openssl/buffer.h>
155#include <openssl/rand.h> 154#include <openssl/rand.h>
156#include <openssl/objects.h> 155#include <openssl/objects.h>
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 7cdd1e2d89..b99d6c4dd9 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -151,7 +151,6 @@
151#include <stdio.h> 151#include <stdio.h>
152#include <openssl/objects.h> 152#include <openssl/objects.h>
153#include "ssl_locl.h" 153#include "ssl_locl.h"
154#include "kssl_lcl.h"
155#ifndef OPENSSL_NO_TLSEXT 154#ifndef OPENSSL_NO_TLSEXT
156#ifndef OPENSSL_NO_EC 155#ifndef OPENSSL_NO_EC
157#include "../crypto/ec/ec_lcl.h" 156#include "../crypto/ec/ec_lcl.h"
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index decf35d50f..ff86ec3f1a 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -153,7 +153,6 @@
153 153
154#include <stdio.h> 154#include <stdio.h>
155#include "ssl_locl.h" 155#include "ssl_locl.h"
156#include "kssl_lcl.h"
157#include <openssl/buffer.h> 156#include <openssl/buffer.h>
158#include <openssl/rand.h> 157#include <openssl/rand.h>
159#include <openssl/objects.h> 158#include <openssl/objects.h>
diff --git a/src/lib/libssl/src/ssl/kssl_lcl.h b/src/lib/libssl/src/ssl/kssl_lcl.h
deleted file mode 100644
index 35e203b7d6..0000000000
--- a/src/lib/libssl/src/ssl/kssl_lcl.h
+++ /dev/null
@@ -1,64 +0,0 @@
1/* ssl/kssl.h -*- mode: C; c-file-style: "eay" -*- */
2/* Written by Vern Staats <staatsvr@asc.hpc.mil> for the OpenSSL project 2000.
3 * project 2000.
4 */
5/* ====================================================================
6 * Copyright (c) 2000 The OpenSSL Project. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:
11 *
12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer.
14 *
15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in
17 * the documentation and/or other materials provided with the
18 * distribution.
19 *
20 * 3. All advertising materials mentioning features or use of this
21 * software must display the following acknowledgment:
22 * "This product includes software developed by the OpenSSL Project
23 * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
24 *
25 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
26 * endorse or promote products derived from this software without
27 * prior written permission. For written permission, please contact
28 * licensing@OpenSSL.org.
29 *
30 * 5. Products derived from this software may not be called "OpenSSL"
31 * nor may "OpenSSL" appear in their names without prior written
32 * permission of the OpenSSL Project.
33 *
34 * 6. Redistributions of any form whatsoever must retain the following
35 * acknowledgment:
36 * "This product includes software developed by the OpenSSL Project
37 * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
38 *
39 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
40 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
41 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
42 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
43 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
44 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
45 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
46 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
47 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
48 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
49 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50 * OF THE POSSIBILITY OF SUCH DAMAGE.
51 * ====================================================================
52 *
53 * This product includes cryptographic software written by Eric Young
54 * (eay@cryptsoft.com). This product includes software written by Tim
55 * Hudson (tjh@cryptsoft.com).
56 *
57 */
58
59#ifndef KSSL_LCL_H
60#define KSSL_LCL_H
61
62#include <openssl/kssl.h>
63
64#endif /* KSSL_LCL_H */
diff --git a/src/lib/libssl/src/ssl/s3_clnt.c b/src/lib/libssl/src/ssl/s3_clnt.c
index 67e4d069c7..010f9e4e12 100644
--- a/src/lib/libssl/src/ssl/s3_clnt.c
+++ b/src/lib/libssl/src/ssl/s3_clnt.c
@@ -150,7 +150,6 @@
150 150
151#include <stdio.h> 151#include <stdio.h>
152#include "ssl_locl.h" 152#include "ssl_locl.h"
153#include "kssl_lcl.h"
154#include <openssl/buffer.h> 153#include <openssl/buffer.h>
155#include <openssl/rand.h> 154#include <openssl/rand.h>
156#include <openssl/objects.h> 155#include <openssl/objects.h>
diff --git a/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c
index 7cdd1e2d89..b99d6c4dd9 100644
--- a/src/lib/libssl/src/ssl/s3_lib.c
+++ b/src/lib/libssl/src/ssl/s3_lib.c
@@ -151,7 +151,6 @@
151#include <stdio.h> 151#include <stdio.h>
152#include <openssl/objects.h> 152#include <openssl/objects.h>
153#include "ssl_locl.h" 153#include "ssl_locl.h"
154#include "kssl_lcl.h"
155#ifndef OPENSSL_NO_TLSEXT 154#ifndef OPENSSL_NO_TLSEXT
156#ifndef OPENSSL_NO_EC 155#ifndef OPENSSL_NO_EC
157#include "../crypto/ec/ec_lcl.h" 156#include "../crypto/ec/ec_lcl.h"
diff --git a/src/lib/libssl/src/ssl/s3_srvr.c b/src/lib/libssl/src/ssl/s3_srvr.c
index decf35d50f..ff86ec3f1a 100644
--- a/src/lib/libssl/src/ssl/s3_srvr.c
+++ b/src/lib/libssl/src/ssl/s3_srvr.c
@@ -153,7 +153,6 @@
153 153
154#include <stdio.h> 154#include <stdio.h>
155#include "ssl_locl.h" 155#include "ssl_locl.h"
156#include "kssl_lcl.h"
157#include <openssl/buffer.h> 156#include <openssl/buffer.h>
158#include <openssl/rand.h> 157#include <openssl/rand.h>
159#include <openssl/objects.h> 158#include <openssl/objects.h>
diff --git a/src/lib/libssl/src/ssl/ssl_lib.c b/src/lib/libssl/src/ssl/ssl_lib.c
index d046480feb..847fb79f6e 100644
--- a/src/lib/libssl/src/ssl/ssl_lib.c
+++ b/src/lib/libssl/src/ssl/ssl_lib.c
@@ -144,7 +144,6 @@
144 144
145#include <stdio.h> 145#include <stdio.h>
146#include "ssl_locl.h" 146#include "ssl_locl.h"
147#include "kssl_lcl.h"
148#include <openssl/objects.h> 147#include <openssl/objects.h>
149#include <openssl/lhash.h> 148#include <openssl/lhash.h>
150#include <openssl/x509v3.h> 149#include <openssl/x509v3.h>
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index d046480feb..847fb79f6e 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -144,7 +144,6 @@
144 144
145#include <stdio.h> 145#include <stdio.h>
146#include "ssl_locl.h" 146#include "ssl_locl.h"
147#include "kssl_lcl.h"
148#include <openssl/objects.h> 147#include <openssl/objects.h>
149#include <openssl/lhash.h> 148#include <openssl/lhash.h>
150#include <openssl/x509v3.h> 149#include <openssl/x509v3.h>