* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: os.c,v 1.60 2002/07/10 01:13:42 marka Exp $ */
+/* $Id: os.c,v 1.61 2002/12/13 02:37:33 marka Exp $ */
#include <config.h>
#include <stdarg.h>
ns_os_chroot(const char *root) {
char strbuf[ISC_STRERRORSIZE];
if (root != NULL) {
+ isc_uint32_t dummy;
+
+ isc_random_get(&dummy);
+
if (chroot(root) < 0) {
isc__strerror(errno, strbuf, sizeof(strbuf));
ns_main_earlyfatal("chroot(): %s", strbuf);
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# $Id: Makefile.in,v 1.134 2002/12/13 02:11:12 marka Exp $
+# $Id: Makefile.in,v 1.135 2002/12/13 02:37:34 marka Exp $
srcdir = @srcdir@
VPATH = @srcdir@
# Alphabetically
-DSTOBJS = sec/dst/dst_api.@O@ \
- sec/dst/dst_lib.@O@ sec/dst/dst_parse.@O@ \
- sec/dst/dst_result.@O@ sec/dst/gssapi_link.@O@ \
- sec/dst/gssapictx.@O@ sec/dst/hmac_link.@O@ \
- sec/dst/key.@O@ sec/dst/openssl_link.@O@ \
- sec/dst/openssldh_link.@O@ sec/dst/openssldsa_link.@O@ \
- sec/dst/opensslrsa_link.@O@
+DSTOBJS = sec/dst/dst_api.@O@ sec/dst/dst_lib.@O@ sec/dst/dst_parse.@O@ \
+ sec/dst/dst_result.@O@ sec/dst/hmac_link.@O@ sec/dst/key.@O@
+
+OPENSSLOBJS = sec/dst/openssl_link.@O@ sec/dst/openssldh_link.@O@ \
+ sec/dst/openssldsa_link.@O@ sec/dst/opensslrsa_link.@O@
+
+GSSAPIOBJS = sec/dst/gssapi_link.@O@ sec/dst/gssapictx.@O@
# Alphabetically
OBJS = acl.@O@ adb.@O@ byaddr.@O@ \
stats.@O@ tcpmsg.@O@ time.@O@ timer.@O@ tkey.@O@ \
tsig.@O@ ttl.@O@ validator.@O@ \
version.@O@ view.@O@ xfrin.@O@ zone.@O@ zonekey.@O@ zt.@O@ \
- ${OTHEROBJS} ${DSTOBJS}
+ ${OTHEROBJS} ${DSTOBJS} ${OPENSSLOBJS} ${GSSAPIOBJS}
# Alphabetically
SRCS = acl.c adb.c byaddr.c \
-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
${OBJS} ${LIBS}
+libdstcypto.@SA@: ${OPENSSLOBJS}
+ ${AR} ${ARFLAGS} $@ ${OPENSSLOBJS}
+ ${RANLIB} $@
+
+libdstcypto.la: ${OPENSSLOBJS}
+ ${LIBTOOL} --mode=link \
+ ${CC} ${ALL_CFLAGS} -o $@ -rpath ${libdir} \
+ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+ ${OPENSSLOBJS} ${LIBS}
+
+libdstgssapi.@SA@: ${GSSAPIOBJS}
+ ${AR} ${ARFLAGS} $@ ${GSSAPIOBJS}
+ ${RANLIB} $@
+
+libdstgssapi.la: ${GSSAPIOBJS}
+ ${LIBTOOL} --mode=link \
+ ${CC} ${ALL_CFLAGS} -o $@ -rpath ${libdir} \
+ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+ ${GSSAPIOBJS} ${LIBS}
+
timestamp: libdns.@A@
touch timestamp
/*
* Principal Author: Brian Wellington
- * $Id: dst_api.c,v 1.104 2002/11/12 22:22:32 explorer Exp $
+ * $Id: dst_api.c,v 1.105 2002/12/13 02:37:34 marka Exp $
*/
#include <config.h>
goto out; \
} while (0)
+#define RETERR2(x) \
+ do { \
+ result = (x); \
+ if (result != ISC_R_SUCCESS && \
+ result != ISC_R_NOTIMPLEMENTED) \
+ goto out; \
+ } while (0)
+
#define CHECKALG(alg) \
do { \
isc_result_t _r; \
REQUIRE(dst_initialized == ISC_FALSE);
dst__memory_pool = NULL;
-
-#ifdef OPENSSL
- UNUSED(mctx);
- /*
- * When using --with-openssl, there seems to be no good way of not
- * leaking memory due to the openssl error handling mechanism.
- * Avoid assertions by using a local memory context and not checking
- * for leaks on exit.
- */
- result = isc_mem_create(0, 0, &dst__memory_pool);
- if (result != ISC_R_SUCCESS)
- return (result);
- isc_mem_setdestroycheck(dst__memory_pool, ISC_FALSE);
-#else
isc_mem_attach(mctx, &dst__memory_pool);
-#endif
isc_entropy_attach(ectx, &dst_entropy_pool);
dst_entropy_flags = eflags;
memset(dst_t_func, 0, sizeof(dst_t_func));
RETERR(dst__hmacmd5_init(&dst_t_func[DST_ALG_HMACMD5]));
-#ifdef OPENSSL
- RETERR(dst__openssl_init());
- RETERR(dst__opensslrsa_init(&dst_t_func[DST_ALG_RSAMD5]));
- RETERR(dst__opensslrsa_init(&dst_t_func[DST_ALG_RSASHA1]));
- RETERR(dst__openssldsa_init(&dst_t_func[DST_ALG_DSA]));
- RETERR(dst__openssldh_init(&dst_t_func[DST_ALG_DH]));
-#endif
-#ifdef GSSAPI
- RETERR(dst__gssapi_init(&dst_t_func[DST_ALG_GSSAPI]));
-#endif
+ RETERR2(dst__openssl_init());
+ RETERR2(dst__opensslrsa_init(&dst_t_func[DST_ALG_RSAMD5]));
+ RETERR2(dst__opensslrsa_init(&dst_t_func[DST_ALG_RSASHA1]));
+ RETERR2(dst__openssldsa_init(&dst_t_func[DST_ALG_DSA]));
+ RETERR2(dst__openssldh_init(&dst_t_func[DST_ALG_DH]));
+ RETERR2(dst__gssapi_init(&dst_t_func[DST_ALG_GSSAPI]));
dst_initialized = ISC_TRUE;
return (ISC_R_SUCCESS);
for (i = 0; i < DST_MAX_ALGS; i++)
if (dst_t_func[i] != NULL && dst_t_func[i]->cleanup != NULL)
dst_t_func[i]->cleanup();
-#ifdef OPENSSL
dst__openssl_destroy();
-#endif
if (dst__memory_pool != NULL)
isc_mem_detach(&dst__memory_pool);
if (dst_entropy_pool != NULL)
isc_entropy_detach(&dst_entropy_pool);
-
}
isc_boolean_t
*/
/*
- * $Id: gssapi_link.c,v 1.10 2002/02/27 22:11:57 bwelling Exp $
+ * $Id: gssapi_link.c,v 1.11 2002/12/13 02:37:34 marka Exp $
*/
#ifdef GSSAPI
}
#else
-int gssapi_link_unneeded = 1;
+
+#include <config.h>
+#include <stdlib.h>
+#include <isc/util.h>
+#include "dst_internal.h"
+
+isc_result_t
+dst__gssapi_init(dst_func_t **funcp) {
+ REQUIRE(funcp != NULL);
+ UNUSED(funcp);
+ return (ISC_R_NOTIMPLEMENTED);
+}
+
#endif
/*
* Principal Author: Brian Wellington
- * $Id: openssl_link.c,v 1.51 2002/10/31 04:35:02 marka Exp $
+ * $Id: openssl_link.c,v 1.52 2002/12/13 02:37:35 marka Exp $
*/
#ifdef OPENSSL
static ENGINE *e;
#endif
+static isc_mem_t *openssl__memory_pool = NULL;
static int
entropy_get(unsigned char *buf, int num) {
static void *
mem_alloc(size_t size) {
- INSIST(dst__memory_pool != NULL);
- return (isc_mem_allocate(dst__memory_pool, size));
+ INSIST(openssl__memory_pool != NULL);
+ return (isc_mem_allocate(openssl__memory_pool, size));
}
static void
mem_free(void *ptr) {
- INSIST(dst__memory_pool != NULL);
+ INSIST(openssl__memory_pool != NULL);
if (ptr != NULL)
- isc_mem_free(dst__memory_pool, ptr);
+ isc_mem_free(openssl__memory_pool, ptr);
}
static void *
mem_realloc(void *ptr, size_t size) {
void *p;
- INSIST(dst__memory_pool != NULL);
+ INSIST(openssl__memory_pool != NULL);
p = NULL;
if (size > 0) {
p = mem_alloc(size);
}
isc_result_t
-dst__openssl_init() {
+dst__openssl_init(void) {
isc_result_t result;
+ result = isc_mem_create(0, 0, &openssl__memory_pool);
+ if (result != ISC_R_SUCCESS)
+ return (result);
+ isc_mem_setdestroycheck(openssl__memory_pool, ISC_FALSE);
+
CRYPTO_set_mem_functions(mem_alloc, mem_realloc, mem_free);
nlocks = CRYPTO_num_locks();
locks = mem_alloc(sizeof(isc_mutex_t) * nlocks);
}
void
-dst__openssl_destroy() {
+dst__openssl_destroy(void) {
ERR_clear_error();
#ifdef USE_ENGINE
if (e != NULL)
}
if (rm != NULL)
mem_free(rm);
+ if (openssl__memory_pool != NULL)
+ isc_mem_detach(&openssl__memory_pool);
}
isc_result_t
#else /* OPENSSL */
#include <isc/util.h>
+#include "dst_internal.h"
+#include "dst_openssl.h"
+
+isc_result_t
+dst__openssl_init(void) {
+ return (ISC_R_NOTIMPLEMENTED);
+}
-EMPTY_TRANSLATION_UNIT
+void
+dst__openssl_destroy(void) {
+ /* empty */
+}
+
+isc_result_t
+dst__openssl_toresult(isc_result_t fallback) {
+ UNUSED(fallback);
+ return (ISC_R_NOTIMPLEMENTED);
+}
#endif /* OPENSSL */
/*
* Principal Author: Brian Wellington
- * $Id: openssldh_link.c,v 1.48 2002/03/19 04:30:55 marka Exp $
+ * $Id: openssldh_link.c,v 1.49 2002/12/13 02:37:35 marka Exp $
*/
#ifdef OPENSSL
#else /* OPENSSL */
+#include <config.h>
#include <isc/util.h>
+#include <stdlib.h> /* NULL */
+#include "dst_internal.h"
-EMPTY_TRANSLATION_UNIT
+isc_result_t
+dst__openssldh_init(dst_func_t **funcp) {
+ REQUIRE(funcp != NULL);
+ UNUSED(funcp);
+
+ return (ISC_R_NOTIMPLEMENTED);
+}
#endif /* OPENSSL */
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: openssldsa_link.c,v 1.11 2002/03/19 04:30:56 marka Exp $ */
+/* $Id: openssldsa_link.c,v 1.12 2002/12/13 02:37:35 marka Exp $ */
#ifdef OPENSSL
#else /* OPENSSL */
+#include <config.h>
+#include <stdlib.h>
#include <isc/util.h>
+#include "dst_internal.h"
-EMPTY_TRANSLATION_UNIT
+isc_result_t
+dst__openssldsa_init(dst_func_t **funcp) {
+ REQUIRE(funcp != NULL);
+ UNUSED(funcp);
+
+ return (ISC_R_NOTIMPLEMENTED);
+}
#endif /* OPENSSL */
/*
* Principal Author: Brian Wellington
- * $Id: opensslrsa_link.c,v 1.23 2002/03/19 04:30:57 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.24 2002/12/13 02:37:35 marka Exp $
*/
#ifdef OPENSSL
#else /* OPENSSL */
+#include <config.h>
+#include <stdlib.h>
#include <isc/util.h>
+#include "dst_internal.h"
-EMPTY_TRANSLATION_UNIT
+isc_result_t
+dst__opensslrsa_init(dst_func_t **funcp) {
+ REQUIRE(funcp != NULL);
+ UNUSED(funcp);
+
+ return (ISC_R_NOTIMPLEMENTED);
+}
#endif /* OPENSSL */
projects / thirdparty / bind9.git / commitdiff
