From ef7fa87854b1bb71e05884356e4129e200a58529 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 25 Feb 2011 17:23:54 +0000 Subject: Now that all PRNG modules fit nicely into a single source file, simplify the PRNG abstraction, flattening the implementations into crypto/krb and removing the indirection through function pointers. Move the guts of the NSS PRNG implementation into the nss subdir so that crypto/krb doesn't need to be built with CRYPTO_IMPL_CFLAGS. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24661 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/krb/crypto_libinit.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/lib/crypto/krb/crypto_libinit.c') diff --git a/src/lib/crypto/krb/crypto_libinit.c b/src/lib/crypto/krb/crypto_libinit.c index b94a01cc0..f97713501 100644 --- a/src/lib/crypto/krb/crypto_libinit.c +++ b/src/lib/crypto/krb/crypto_libinit.c @@ -1,13 +1,11 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ #include #include "k5-int.h" +#include "prng.h" MAKE_INIT_FUNCTION(cryptoint_initialize_library); MAKE_FINI_FUNCTION(cryptoint_cleanup_library); -extern int krb5int_prng_init(void); -extern void krb5int_prng_cleanup (void); - /* * Initialize the crypto library. */ @@ -15,7 +13,7 @@ extern void krb5int_prng_cleanup (void); int cryptoint_initialize_library (void) { int err; - err = krb5int_prng_init(); + err = k5_prng_init(); if (err) return err; return krb5int_crypto_impl_init(); @@ -34,6 +32,6 @@ void cryptoint_cleanup_library (void) { if (!INITIALIZER_RAN(cryptoint_initialize_library)) return; - krb5int_prng_cleanup(); + k5_prng_cleanup(); krb5int_crypto_impl_cleanup(); } -- cgit