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

List:       openssl-cvs
Subject:    [CVS] OpenSSL: openssl/crypto/bn/ bn_mont.c openssl/crypto/rand/ md_ra...
From:       "Dr. Stephen Henson" <steve () openssl ! org>
Date:       2011-01-27 15:57:32
Message-ID: 20110127155732.216A11EAE891 () 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:   27-Jan-2011 16:57:31
  Branch: HEAD                             Handle: 2011012715573100

  Modified files:
    openssl/crypto/bn       bn_mont.c
    openssl/crypto/rand     md_rand.c
    openssl/fips            fips.h

  Log:
    Update source files to handle new FIPS_lock() location. Add FIPS_lock()
    definition. Remove stale function references from fips.h

  Summary:
    Revision    Changes     Path
    1.55        +4  -0      openssl/crypto/bn/bn_mont.c
    1.89        +4  -0      openssl/crypto/rand/md_rand.c
    1.5         +1  -10     openssl/fips/fips.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/crypto/bn/bn_mont.c
  ============================================================================
  $ cvs diff -u -r1.54 -r1.55 bn_mont.c
  --- openssl/crypto/bn/bn_mont.c	27 Jan 2011 15:22:21 -0000	1.54
  +++ openssl/crypto/bn/bn_mont.c	27 Jan 2011 15:57:31 -0000	1.55
  @@ -122,6 +122,10 @@
   #include "cryptlib.h"
   #include "bn_lcl.h"
   
  +#ifdef OPENSSL_FIPS
  +#include <openssl/fips.h>
  +#endif
  +
   #define MONT_WORD /* use the faster word-based algorithm */
   
   #ifdef MONT_WORD
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/crypto/rand/md_rand.c
  ============================================================================
  $ cvs diff -u -r1.88 -r1.89 md_rand.c
  --- openssl/crypto/rand/md_rand.c	27 Jan 2011 15:22:22 -0000	1.88
  +++ openssl/crypto/rand/md_rand.c	27 Jan 2011 15:57:31 -0000	1.89
  @@ -129,6 +129,10 @@
   #include <openssl/crypto.h>
   #include <openssl/err.h>
   
  +#ifdef OPENSSL_FIPS
  +#include <openssl/fips.h>
  +#endif
  +
   #ifdef BN_DEBUG
   # define PREDICT
   #endif
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/fips/fips.h
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 fips.h
  --- openssl/fips/fips.h	27 Jan 2011 15:22:23 -0000	1.4
  +++ openssl/fips/fips.h	27 Jan 2011 15:57:31 -0000	1.5
  @@ -108,16 +108,7 @@
   void fips_set_selftest_fail(void);
   int fips_check_rsa(struct rsa_st *rsa);
   
  -void FIPS_evp_md_ctx_init(EVP_MD_CTX *ctx);
  -EVP_MD_CTX *FIPS_evp_md_ctx_create(void);
  -int FIPS_evp_digestinit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl);
  -int FIPS_evp_digestupdate(EVP_MD_CTX *ctx, const void *data, size_t count);
  -int FIPS_evp_digestfinal(EVP_MD_CTX *ctx,
  -					unsigned char *md, unsigned int *size);
  -int FIPS_evp_digest(const void *data, size_t count,
  -		unsigned char *md, unsigned int *size, const EVP_MD *type, ENGINE *impl);
  -void FIPS_evp_md_ctx_destroy(EVP_MD_CTX *ctx);
  -int FIPS_evp_md_ctx_cleanup(EVP_MD_CTX *ctx);
  +void FIPS_lock(int mode, int type,const char *file,int line);
   
   void FIPS_set_locking_callback (void (*func)(int mode, int type,
   				const char *file,int line));
  @@ .
______________________________________________________________________
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]