#include <openssl/...>
suggested by ABE Yuji <cbo46560@pop12.odn.ne.jp> [w3m-dev 03998] problem about pkg-config check for OpenSSL * html.h: #include <openssl/...> * istream.c: ditto * istream.h: ditto * url.c: ditto From: Fumitoshi UKAI <ukai@debian.or.jp>
This commit is contained in:
12
ChangeLog
12
ChangeLog
@@ -1,3 +1,13 @@
|
|||||||
|
2003-10-21 Fumitoshi UKAI <ukai@debian.or.jp>
|
||||||
|
|
||||||
|
* #include <openssl/...>
|
||||||
|
suggested by ABE Yuji <cbo46560@pop12.odn.ne.jp>
|
||||||
|
[w3m-dev 03998] problem about pkg-config check for OpenSSL
|
||||||
|
* html.h: #include <openssl/...>
|
||||||
|
* istream.c: ditto
|
||||||
|
* istream.h: ditto
|
||||||
|
* url.c: ditto
|
||||||
|
|
||||||
2003-10-20 ABE Yuji <cbo46560@pop12.odn.ne.jp>
|
2003-10-20 ABE Yuji <cbo46560@pop12.odn.ne.jp>
|
||||||
|
|
||||||
* [w3m-dev 04002] Re: function and w3m-control
|
* [w3m-dev 04002] Re: function and w3m-control
|
||||||
@@ -8215,4 +8225,4 @@ a * [w3m-dev 03276] compile error on EWS4800
|
|||||||
* release-0-2-1
|
* release-0-2-1
|
||||||
* import w3m-0.2.1
|
* import w3m-0.2.1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.885 2003/10/19 16:17:12 ukai Exp $
|
$Id: ChangeLog,v 1.886 2003/10/20 16:41:56 ukai Exp $
|
||||||
|
|||||||
8
html.h
8
html.h
@@ -1,10 +1,10 @@
|
|||||||
/* $Id: html.h,v 1.24 2003/09/22 21:02:19 ukai Exp $ */
|
/* $Id: html.h,v 1.25 2003/10/20 16:41:56 ukai Exp $ */
|
||||||
#ifndef _HTML_H
|
#ifndef _HTML_H
|
||||||
#define _HTML_H
|
#define _HTML_H
|
||||||
#ifdef USE_SSL
|
#ifdef USE_SSL
|
||||||
#include <bio.h>
|
#include <openssl/bio.h>
|
||||||
#include <x509.h>
|
#include <openssl/x509.h>
|
||||||
#include <ssl.h>
|
#include <openssl/ssl.h>
|
||||||
#endif /* USE_SSL */
|
#endif /* USE_SSL */
|
||||||
|
|
||||||
#include "istream.h"
|
#include "istream.h"
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
/* $Id: istream.c,v 1.22 2003/09/26 17:59:51 ukai Exp $ */
|
/* $Id: istream.c,v 1.23 2003/10/20 16:41:56 ukai Exp $ */
|
||||||
#include "fm.h"
|
#include "fm.h"
|
||||||
#include "myctype.h"
|
#include "myctype.h"
|
||||||
#include "istream.h"
|
#include "istream.h"
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#ifdef USE_SSL
|
#ifdef USE_SSL
|
||||||
#include <x509v3.h>
|
#include <openssl/x509v3.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define uchar unsigned char
|
#define uchar unsigned char
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
/* $Id: istream.h,v 1.11 2003/07/22 17:33:16 ukai Exp $ */
|
/* $Id: istream.h,v 1.12 2003/10/20 16:41:56 ukai Exp $ */
|
||||||
#ifndef IO_STREAM_H
|
#ifndef IO_STREAM_H
|
||||||
#define IO_STREAM_H
|
#define IO_STREAM_H
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#ifdef USE_SSL
|
#ifdef USE_SSL
|
||||||
#include <bio.h>
|
#include <openssl/bio.h>
|
||||||
#include <x509.h>
|
#include <openssl/x509.h>
|
||||||
#include <ssl.h>
|
#include <openssl/ssl.h>
|
||||||
#endif
|
#endif
|
||||||
#include "Str.h"
|
#include "Str.h"
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|||||||
8
url.c
8
url.c
@@ -1,4 +1,4 @@
|
|||||||
/* $Id: url.c,v 1.84 2003/10/19 16:17:12 ukai Exp $ */
|
/* $Id: url.c,v 1.85 2003/10/20 16:41:56 ukai Exp $ */
|
||||||
#include "fm.h"
|
#include "fm.h"
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
@@ -22,9 +22,9 @@
|
|||||||
|
|
||||||
#ifdef USE_SSL
|
#ifdef USE_SSL
|
||||||
#ifndef SSLEAY_VERSION_NUMBER
|
#ifndef SSLEAY_VERSION_NUMBER
|
||||||
#include <crypto.h> /* SSLEAY_VERSION_NUMBER may be here */
|
#include <openssl/crypto.h> /* SSLEAY_VERSION_NUMBER may be here */
|
||||||
#endif
|
#endif
|
||||||
#include <err.h>
|
#include <openssl/err.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __WATT32__
|
#ifdef __WATT32__
|
||||||
@@ -248,7 +248,7 @@ free_ssl_ctx()
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if SSLEAY_VERSION_NUMBER >= 0x00905100
|
#if SSLEAY_VERSION_NUMBER >= 0x00905100
|
||||||
#include <rand.h>
|
#include <openssl/rand.h>
|
||||||
static void
|
static void
|
||||||
init_PRNG()
|
init_PRNG()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user