[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: openssl/crypto/engine/ engine.h openssl/engines/ e_capi...
From:       "Dr. Stephen Henson" <steve () openssl ! org>
Date:       2011-01-30 1:30:48
Message-ID: 20110130013049.116BE1EAE95E () master ! openssl ! org
[Download RAW message or body]

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Dr. Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steve@openssl.org
  Module: openssl                          Date:   30-Jan-2011 02:30:48
  Branch: HEAD                             Handle: 2011013001304800

  Modified files:
    openssl/crypto/engine   engine.h
    openssl/engines         e_capi.c e_gmp.c e_padlock.c

  Log:
    stop warnings about no previous prototype when compiling shared
    engines

  Summary:
    Revision    Changes     Path
    1.85        +3  -0      openssl/crypto/engine/engine.h
    1.34        +2  -0      openssl/engines/e_capi.c
    1.8         +2  -0      openssl/engines/e_gmp.c
    1.10        +10 -0      openssl/engines/e_padlock.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/crypto/engine/engine.h
  ============================================================================
  $ cvs diff -u -r1.84 -r1.85 engine.h
  --- openssl/crypto/engine/engine.h	9 Feb 2010 14:17:14 -0000	1.84
  +++ openssl/crypto/engine/engine.h	30 Jan 2011 01:30:48 -0000	1.85
  @@ -678,6 +678,7 @@
    * can be fully instantiated with IMPLEMENT_DYNAMIC_CHECK_FN(). */
   typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version);
   #define IMPLEMENT_DYNAMIC_CHECK_FN() \
  +	OPENSSL_EXPORT unsigned long v_check(unsigned long v); \
   	OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \
   		if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \
   		return 0; }
  @@ -701,6 +702,8 @@
   				const dynamic_fns *fns);
   #define IMPLEMENT_DYNAMIC_BIND_FN(fn) \
   	OPENSSL_EXPORT \
  +	int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); \
  +	OPENSSL_EXPORT \
   	int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \
   		if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \
   		if(!CRYPTO_set_mem_functions(fns->mem_fns.malloc_cb, \
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/engines/e_capi.c
  ============================================================================
  $ cvs diff -u -r1.33 -r1.34 e_capi.c
  --- openssl/engines/e_capi.c	14 Dec 2010 20:39:17 -0000	1.33
  +++ openssl/engines/e_capi.c	30 Jan 2011 01:30:48 -0000	1.34
  @@ -1886,6 +1886,8 @@
   #include <openssl/engine.h>
   #ifndef OPENSSL_NO_DYNAMIC_ENGINE
   OPENSSL_EXPORT
  +int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns);
  +OPENSSL_EXPORT
   int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { return 0; }
   IMPLEMENT_DYNAMIC_CHECK_FN()
   #else
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/engines/e_gmp.c
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 e_gmp.c
  --- openssl/engines/e_gmp.c	26 Apr 2009 22:18:22 -0000	1.7
  +++ openssl/engines/e_gmp.c	30 Jan 2011 01:30:48 -0000	1.8
  @@ -471,6 +471,8 @@
   IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
   #else
   OPENSSL_EXPORT
  +int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns);
  +OPENSSL_EXPORT
   int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { return 0; }
   #endif
   #endif /* !OPENSSL_NO_DYNAMIC_ENGINE */
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/engines/e_padlock.c
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 e_padlock.c
  --- openssl/engines/e_padlock.c	12 May 2009 20:19:09 -0000	1.9
  +++ openssl/engines/e_padlock.c	30 Jan 2011 01:30:48 -0000	1.10
  @@ -107,10 +107,14 @@
        ) || \
        (defined(_MSC_VER) && defined(_M_IX86))
   #  define COMPILE_HW_PADLOCK
  +#  ifdef OPENSSL_NO_DYNAMIC_ENGINE
   static ENGINE *ENGINE_padlock (void);
  +#  endif
   # endif
   #endif
   
  +#ifdef OPENSSL_NO_DYNAMIC_ENGINE
  +
   void ENGINE_load_padlock (void)
   {
   /* On non-x86 CPUs it just returns. */
  @@ -123,6 +127,8 @@
   #endif
   }
   
  +#endif
  +
   #ifdef COMPILE_HW_PADLOCK
   /* We do these includes here to avoid header problems on platforms that
      do not have the VIA padlock anyway... */
  @@ -196,6 +202,7 @@
   	return 1;
   }
   
  +#ifdef OPENSSL_NO_DYNAMIC_ENGINE
   /* Constructor */
   static ENGINE *
   ENGINE_padlock(void)
  @@ -213,6 +220,7 @@
   
   	return eng;
   }
  +#endif
   
   /* Check availability of the engine */
   static int
  @@ -1322,6 +1330,8 @@
   #else  /* !COMPILE_HW_PADLOCK */
   #ifndef OPENSSL_NO_DYNAMIC_ENGINE
   OPENSSL_EXPORT
  +int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns);
  +OPENSSL_EXPORT
   int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { return 0; }
   IMPLEMENT_DYNAMIC_CHECK_FN()
   #endif
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]