1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

Next step in mod_ssl integration:

Add missing files to build environment.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89006 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ralf S. Engelschall
2001-05-05 10:12:08 +00:00
parent fa3c8387ec
commit f176ba44b1
32 changed files with 140 additions and 4 deletions

View File

@@ -50,9 +50,34 @@ dnl # start of module specific part
APACHE_MODPATH_INIT(ssl)
dnl # list of module object files
ssl_objs="mod_ssl.lo"
ssl_objs="$ssl_objs ssl_engine_config.lo"
ssl_objs="dnl
mod_ssl.lo dnl
ssl_engine_compat.lo dnl
ssl_engine_config.lo dnl
ssl_engine_dh.lo dnl
ssl_engine_ds.lo dnl
ssl_engine_ext.lo dnl
ssl_engine_init.lo dnl
ssl_engine_io.lo dnl
ssl_engine_kernel.lo dnl
ssl_engine_log.lo dnl
ssl_engine_mutex.lo dnl
ssl_engine_pphrase.lo dnl
ssl_engine_rand.lo dnl
ssl_engine_vars.lo dnl
ssl_expr.lo dnl
ssl_expr_eval.lo dnl
ssl_expr_parse.lo dnl
ssl_expr_scan.lo dnl
ssl_scache.lo dnl
ssl_scache_dbm.lo dnl
ssl_scache_shmcb.lo dnl
ssl_scache_shmht.lo dnl
ssl_util.lo dnl
ssl_util_sdbm.lo dnl
ssl_util_ssl.lo dnl
ssl_util_table.lo dnl
"
dnl # hook module into the Autoconf mechanism (--enable-ssl option)
APACHE_MODULE(ssl, [SSL/TLS support (mod_ssl)], $ssl_objs, , no, [

View File

@@ -65,6 +65,7 @@
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
@@ -506,4 +507,6 @@ void ssl_compat_variables(request_rec *r)
return;
}
#endif /* XXX */
#endif /* SSL_COMPAT */

View File

@@ -62,6 +62,8 @@
#include "mod_ssl.h"
#if 0 /* XXX */
/* ----BEGIN GENERATED SECTION-------- */
/*
@@ -251,3 +253,6 @@ unlink("dh1024.pem");
=pod
*/
#endif /* XXX */

View File

@@ -63,6 +63,7 @@
-- Unknown */
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
@@ -192,3 +193,5 @@ void ssl_ds_table_kill(ssl_ds_table *t)
return;
}
#endif /* XXX */

View File

@@ -61,6 +61,7 @@
-- Unknown */
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
@@ -804,3 +805,5 @@ static void ssl_ext_ms_display(request_rec *r, int no_table_report, int short_re
return;
}
#endif /* XXX */

View File

@@ -61,6 +61,7 @@
-- Unknown */
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
@@ -1042,3 +1043,5 @@ void ssl_init_ModuleKill(void *data)
return;
}
#endif /* XXX */

View File

@@ -62,6 +62,8 @@
-- Unknown */
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
** I/O Request Body Sucking and Re-Injection
@@ -724,3 +726,5 @@ long ssl_io_data_cb(BIO *bio, int cmd, const char *argp, int argi, long argl, lo
return rc;
}
#endif /* XXX */

View File

@@ -63,6 +63,7 @@
-- Unknown */
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
@@ -1857,3 +1858,5 @@ void ssl_callback_LogTracingState(SSL *ssl, int where, int rc)
return;
}
#endif /* XXX */

View File

@@ -62,6 +62,7 @@
-- Ralf S. Engelschall */
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
@@ -322,3 +323,5 @@ void ssl_die(void)
exit(1);
}
#endif /* XXX */

View File

@@ -62,6 +62,7 @@
-- Unknown */
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
@@ -393,3 +394,5 @@ BOOL ssl_mutex_sem_release(void)
return TRUE;
}
#endif /* XXX */

View File

@@ -63,6 +63,7 @@
-- Clifford Stoll */
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
@@ -541,3 +542,5 @@ int ssl_pphrase_Handle_CB(char *buf, int bufsize, int verify)
return (len);
}
#endif /* XXX */

View File

@@ -62,6 +62,7 @@
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
@@ -211,3 +212,5 @@ static int ssl_rand_choosenum(int l, int h)
return i;
}
#endif /* XXX */

View File

@@ -62,6 +62,7 @@
-- Unknown */
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
@@ -611,3 +612,6 @@ static char *ssl_var_lookup_ssl_version(pool *p, char *var)
return result;
}
#endif /* XXX */

View File

@@ -62,6 +62,7 @@
-- Unknown */
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
@@ -115,3 +116,5 @@ int ssl_expr_exec(request_rec *r, ssl_expr *expr)
return (rc ? 1 : 0);
}
#endif /* XXX */

View File

@@ -61,6 +61,8 @@
#ifndef SSL_EXPR_H
#define SSL_EXPR_H
#if 0 /* XXX */
#ifndef FALSE
#define FALSE 0
#endif
@@ -133,4 +135,6 @@ extern char *ssl_expr_get_error(void);
extern ssl_expr *ssl_expr_make(ssl_expr_node_op, void *, void *);
extern BOOL ssl_expr_eval(request_rec *, ssl_expr *);
#endif /* XXX */
#endif /* SSL_EXPR_H */

View File

@@ -61,6 +61,7 @@
-- Unknown */
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
@@ -278,3 +279,5 @@ static int ssl_expr_eval_strcmplex(char *cpNum1, char *cpNum2)
return 0;
}
#endif /* XXX */

View File

@@ -1,3 +1,4 @@
#if 0 /* XXX */
#ifndef lint
static char const
ssl_expr_yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28 2000/01/17 02:04:06 bde Exp $";
@@ -603,3 +604,4 @@ ssl_expr_yyabort:
ssl_expr_yyaccept:
return (0);
}
#endif /* XXX */

View File

@@ -1,3 +1,4 @@
#if 0 /* XXX */
#ifndef YYERRCODE
#define YYERRCODE 256
#endif
@@ -27,3 +28,4 @@ typedef union {
ssl_expr *exVal;
} YYSTYPE;
extern YYSTYPE ssl_expr_yylval;
#endif /* XXX */

View File

@@ -67,6 +67,8 @@
%{
#include "mod_ssl.h"
#if 0 /* XXX */
%}
%union {
@@ -181,3 +183,7 @@ int yyerror(char *s)
return 2;
}
%{
#endif /* XXX */
%}

View File

@@ -1,3 +1,4 @@
#if 0 /* XXX */
#define yy_create_buffer ssl_expr_yy_create_buffer
#define yy_delete_buffer ssl_expr_yy_delete_buffer
#define yy_scan_buffer ssl_expr_yy_scan_buffer
@@ -1999,4 +2000,4 @@ int yyinput(char *buf, int max_size)
ssl_expr_info.inputptr += n;
return n;
}
#endif /* XXX */

View File

@@ -68,6 +68,7 @@
%{
#include "mod_ssl.h"
#if 0 /* XXX */
#include "ssl_expr_parse.h"
@@ -256,3 +257,7 @@ int yyinput(char *buf, int max_size)
return n;
}
%{
#endif /* XXX */
%}

View File

@@ -63,6 +63,8 @@
-- Unknown */
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
** Session Cache: Common Abstraction Layer
@@ -200,3 +202,5 @@ void ssl_scache_expire(server_rec *s)
return;
}
#endif /* XXX */

View File

@@ -59,6 +59,8 @@
#include "mod_ssl.h"
#if 0 /* XXX */
void ssl_scache_dbm_init(server_rec *s, pool *p)
{
SSLModConfigRec *mc = myModConfig();
@@ -436,3 +438,5 @@ void ssl_scache_dbm_status(server_rec *s, pool *p, void (*func)(char *, void *),
return;
}
#endif /* XXX */

View File

@@ -59,6 +59,8 @@
#include "mod_ssl.h"
#if 0 /* XXX */
/*
* This shared memory based SSL session cache implementation was
* originally written by Geoff Thorpe <geoff@eu.c2.net> for C2Net Europe
@@ -1339,3 +1341,5 @@ end:
return to_return;
}
#endif /* XXX */

View File

@@ -59,6 +59,8 @@
#include "mod_ssl.h"
#if 0 /* XXX */
/*
* Wrapper functions for table library which resemble malloc(3) & Co
* but use the variants from the MM shared memory library.
@@ -343,3 +345,5 @@ void ssl_scache_shmht_status(server_rec *s, pool *p, void (*func)(char *, void *
return;
}
#endif /* XXX */

View File

@@ -63,6 +63,7 @@
-- Calvin */
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
@@ -389,3 +390,5 @@ void ssl_util_thread_setup(void)
return;
}
#endif /* XXX */

View File

@@ -68,6 +68,8 @@
#include "mod_ssl.h"
#if 0 /* XXX */
#ifdef SSL_USE_SDBM
#include <stdio.h>
@@ -922,3 +924,6 @@ char *pag;
}
#endif /* SSL_USE_SDBM */
#endif /* XXX */

View File

@@ -67,6 +67,8 @@
#ifndef SSL_UTIL_SDBM_H
#define SSL_UTIL_SDBM_H
#if 0 /* XXX */
#define DUFF /* go ahead and use the loop-unrolled version */
#include <stdio.h>
@@ -186,4 +188,7 @@ extern int duppair proto((char *, datum));
#define debug(x)
#endif
#endif /* XXX */
#endif /* SSL_UTIL_SDBM_H */

View File

@@ -59,6 +59,7 @@
#include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________
**
@@ -540,3 +541,5 @@ char *SSL_SESSION_id2sz(unsigned char *id, int idlen)
return str;
}
#endif /* XXX */

View File

@@ -60,6 +60,8 @@
#ifndef SSL_UTIL_SSL_H
#define SSL_UTIL_SSL_H
#if 0 /* XXX */
/*
* Determine SSL library version number
*/
@@ -110,4 +112,6 @@ BOOL SSL_load_CrtAndKeyInfo_path(pool *, STACK_OF(X509_INFO) *, char *);
int SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, int (*)());
char *SSL_SESSION_id2sz(unsigned char *, int);
#endif /* XXX */
#endif /* SSL_UTIL_SSL_H */

View File

@@ -87,6 +87,8 @@
* o added support for MM library via ta_{malloc,calloc,realloc,free}
*/
#if 0 /* XXX */
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
@@ -2864,3 +2866,6 @@ int table_entry_info(table_t * table_p, table_entry_t * entry_p,
*data_size_p = entry_p->te_data_size;
return TABLE_ERROR_NONE;
}
#endif /* XXX */

View File

@@ -83,6 +83,8 @@
#ifndef SSL_UTIL_TABLE_H
#define SSL_UTIL_TABLE_H
#if 0 /* XXX */
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@@ -184,4 +186,6 @@ extern int table_entry_info(table_t *table_p, table_entry_t *entry_p
}
#endif /* __cplusplus */
#endif /* XXX */
#endif /* ! SSL_UTIL_TABLE_H */