oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

BN_is_negative is no longer a macro in OpenSSL master

Browse Source
This commit is contained in:
Viktor Dukhovni
2015-03-04 19:49:40 -05:00
committed by Viktor Dukhovni
parent 529f17bbec
commit 08c628b240
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cf/crypto.m4
View File

@@ -63,6 +63,20 @@ m4_define([test_body], [
DES_cbc_encrypt(0, 0, 0, schedule, 0, 0); DES_cbc_encrypt(0, 0, 0, schedule, 0, 0);
RC4(0, 0, 0, 0);]) RC4(0, 0, 0, 0);])
m4_define([bn_headers], [
#include <stdlib.h>
#include <openssl/bn.h>
])
m4_define([bn_body], [
BIGNUM *bn = BN_new();
BN_set_word(bn, 1);
if (BN_is_negative(bn))
exit(EXIT_FAILURE);
BN_set_negative(bn, 1);
if (!BN_is_negative(bn))
exit(EXIT_FAILURE);
exit(EXIT_SUCCESS);
])
AC_DEFUN([KRB_CRYPTO],[ AC_DEFUN([KRB_CRYPTO],[
crypto_lib=unknown crypto_lib=unknown
@@ -96,6 +110,9 @@ if test "$crypto_lib" = "unknown" -a "$with_openssl" != "no"; then
AC_LINK_IFELSE([AC_LANG_PROGRAM([test_headers],[test_body])], [ AC_LINK_IFELSE([AC_LANG_PROGRAM([test_headers],[test_body])], [
crypto_lib=libcrypto openssl=yes crypto_lib=libcrypto openssl=yes
AC_MSG_RESULT([libcrypto]) AC_MSG_RESULT([libcrypto])
AC_RUN_IFELSE([AC_LANG_PROGRAM([bn_headers],[bn_body])], [
AC_DEFINE([HAVE_BN_IS_NEGATIVE], 1, [define if OpenSSL provides BN_is_negative])
])
]) ])
if test "$crypto_lib" = libcrypto ; then if test "$crypto_lib" = libcrypto ; then
break; break;

2
include/crypto-headers.h
View File

@@ -29,7 +29,7 @@
#include <openssl/ecdh.h> #include <openssl/ecdh.h>
#include <openssl/dh.h> #include <openssl/dh.h>
#include <openssl/bn.h> #include <openssl/bn.h>
#ifndef BN_is_negative #ifndef HAVE_BN_IS_NEGATIVE
#define BN_set_negative(bn, flag) ((bn)->neg=(flag)?1:0) #define BN_set_negative(bn, flag) ((bn)->neg=(flag)?1:0)
#define BN_is_negative(bn) ((bn)->neg != 0) #define BN_is_negative(bn) ((bn)->neg != 0)
#endif #endif