Commit a581439b authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fixes for "make depend". Features which need a #define to be set to 

enable them, like FIPS and JPAKE need to have these set when building
dependencies.
parent a43337e8

crypto/jpake/jpake.h

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include <openssl/opensslconf.h>



#ifndef OPENSSL_EXPERIMENTAL_JPAKE

#error JPAKE is disabled

#endif



#ifdef  __cplusplus

extern "C" {
@@ -125,4 +127,3 @@ void ERR_load_JPAKE_strings(void); 
}

#endif

#endif
 
#endif

crypto/jpake/jpaketest.c

+1 −1
Original line number Diff line number Diff line 
#include <openssl/jpake.h>

#include <openssl/err.h>



#ifndef OPENSSL_EXPERIMENTAL_JPAKE
@@ -8,6 +7,7 @@ int main(int argc, char *argv[]) 
    return(0);

}

#else

#include <openssl/jpake.h>



static void showbn(const char *name, const BIGNUM *bn)

    {

crypto/opensslconf.h.in

+16 −0
Original line number Diff line number Diff line 
/* crypto/opensslconf.h.in */



#ifdef OPENSSL_DOING_MAKEDEPEND



/* Include any symbols here which have to be explicitly set to enable a

 * feature. For example OPENSSL_EXPERIMENTAL_FOO

 */



#ifndef OPENSSL_FIPS

#define OPENSSL_FIPS

#endif



#ifndef OPENSSL_EXPERIMENTAL_JPAKE

#define OPENSSL_EXPERIMENTAL_JPAKE

#endif



#endif



/* Generate 80386 code? */

#undef I386_ONLY