[BACK]Return to crypto_openssl.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / crypto / dist / ipsec-tools / src / racoon

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c between version 1.20 and 1.20.4.2

version 1.20, 2010/10/20 13:40:02 version 1.20.4.2, 2012/12/24 08:48:08
Line 44 
Line 44 
 /* get openssl/ssleay version number */  /* get openssl/ssleay version number */
 #include <openssl/opensslv.h>  #include <openssl/opensslv.h>
   
 #if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090602fL)  #if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090813fL)
 #error OpenSSL version 0.9.6 or later required.  #error OpenSSL version 0.9.8s or later required.
 #endif  #endif
   
 #include <openssl/pem.h>  #include <openssl/pem.h>
Line 91 
Line 91 
 #endif  #endif
 #include "plog.h"  #include "plog.h"
   
 /* 0.9.7 stuff? */  
 #if OPENSSL_VERSION_NUMBER < 0x0090700fL  
 typedef STACK_OF(GENERAL_NAME) GENERAL_NAMES;  
 #else  
 #define USE_NEW_DES_API  #define USE_NEW_DES_API
 #endif  
   
 #define OpenSSL_BUG()   do { plog(LLV_ERROR, LOCATION, NULL, "OpenSSL function failed\n"); } while(0)  #define OpenSSL_BUG()   do { plog(LLV_ERROR, LOCATION, NULL, "OpenSSL function failed\n"); } while(0)
   
Line 505  eay_check_x509cert(cert, CApath, CAfile,
Line 500  eay_check_x509cert(cert, CApath, CAfile,
         if (csc == NULL)          if (csc == NULL)
                 goto end;                  goto end;
         X509_STORE_CTX_init(csc, cert_ctx, x509, NULL);          X509_STORE_CTX_init(csc, cert_ctx, x509, NULL);
 #if OPENSSL_VERSION_NUMBER >= 0x00907000L  
         X509_STORE_CTX_set_flags (csc, X509_V_FLAG_CRL_CHECK);          X509_STORE_CTX_set_flags (csc, X509_V_FLAG_CRL_CHECK);
         X509_STORE_CTX_set_flags (csc, X509_V_FLAG_CRL_CHECK_ALL);          X509_STORE_CTX_set_flags (csc, X509_V_FLAG_CRL_CHECK_ALL);
 #endif  
         error = X509_verify_cert(csc);          error = X509_verify_cert(csc);
         X509_STORE_CTX_free(csc);          X509_STORE_CTX_free(csc);
   
Line 2501  eay_bn2v(var, bn)
Line 2494  eay_bn2v(var, bn)
         vchar_t **var;          vchar_t **var;
         BIGNUM *bn;          BIGNUM *bn;
 {  {
         *var = vmalloc(bn->top * BN_BYTES);          *var = vmalloc(BN_num_bytes(bn));
         if (*var == NULL)          if (*var == NULL)
                 return(-1);                  return(-1);
   

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.20.4.2

CVSweb <webmaster@jp.NetBSD.org>