diff --git a/Configure b/Configure

index c98107a..c122709 100755

--- a/Configure

+++ b/Configure

@@ -609,6 +609,9 @@ my %table=(

 # with itself, Applink is never engaged and can as well be omitted.

 "mingw64", "gcc:-mno-cygwin -DL_ENDIAN -O3 -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE::-D_MT:MINGW64:-lws2_32 -lgdi32 -lcrypt32:SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:${x86_64_asm}:mingw64:win32:cygwin-shared:-D_WINDLL:-mno-cygwin:.dll.a",

+# UEFI

+"UEFI", "cc:-DL_ENDIAN -O:::UEFI::::",

+

 # UWIN 

 "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",

@@ -1088,7 +1091,7 @@ if (defined($disabled{"tls1"}))

 	}

 if (defined($disabled{"ec"}) || defined($disabled{"dsa"})

-    || defined($disabled{"dh"}))

+    || defined($disabled{"dh"}) || defined($disabled{"stdio"}))

 	{

 	$disabled{"gost"} = "forced";

 	}

diff --git a/apps/apps.c b/apps/apps.c

index b1dd970..8278c28 100644

--- a/apps/apps.c

+++ b/apps/apps.c

@@ -2374,6 +2374,8 @@ int args_verify(char ***pargs, int *pargc,

         flags |= X509_V_FLAG_PARTIAL_CHAIN;

     else if (!strcmp(arg, "-no_alt_chains"))

         flags |= X509_V_FLAG_NO_ALT_CHAINS;

+    else if (!strcmp(arg, "-no_check_time"))

+        flags |= X509_V_FLAG_NO_CHECK_TIME;

     else

         return 0;

diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c

index 35fd44c..9f39bff 100644

--- a/crypto/asn1/a_strex.c

+++ b/crypto/asn1/a_strex.c

@@ -104,6 +104,7 @@ static int send_bio_chars(void *arg, const void *buf, int len)

     return 1;

 }

+#ifndef OPENSSL_NO_FP_API

 static int send_fp_chars(void *arg, const void *buf, int len)

 {

     if (!arg)

@@ -112,6 +113,7 @@ static int send_fp_chars(void *arg, const void *buf, int len)

         return 0;

     return 1;

 }

+#endif

 typedef int char_io (void *arg, const void *buf, int len);

diff --git a/crypto/asn1/asn1_mac.h b/crypto/asn1/asn1_mac.h

index abc6dc3..3a672e9 100644

--- a/crypto/asn1/asn1_mac.h

+++ b/crypto/asn1/asn1_mac.h

@@ -70,7 +70,7 @@ extern "C" {

 # endif

 # define ASN1_MAC_H_err(f,r,line) \

-        ERR_PUT_error(ASN1_MAC_ERR_LIB,(f),(r),__FILE__,(line))

+        ERR_PUT_error(ASN1_MAC_ERR_LIB,(f),(r),OPENSSL_FILE,(line))

 # define M_ASN1_D2I_vars(a,type,func) \

         ASN1_const_CTX c; \

@@ -81,7 +81,7 @@ extern "C" {

         c.error=ERR_R_NESTED_ASN1_ERROR; \

         if ((a == NULL) || ((*a) == NULL)) \

                 { if ((ret=(type)func()) == NULL) \

-                        { c.line=__LINE__; goto err; } } \

+                        { c.line=OPENSSL_LINE; goto err; } } \

         else    ret=(*a);

 # define M_ASN1_D2I_Init() \

@@ -90,7 +90,7 @@ extern "C" {

 # define M_ASN1_D2I_Finish_2(a) \

         if (!asn1_const_Finish(&c)) \

-                { c.line=__LINE__; goto err; } \

+                { c.line=OPENSSL_LINE; goto err; } \

         *(const unsigned char **)pp=c.p; \

         if (a != NULL) (*a)=ret; \

         return(ret);

@@ -105,7 +105,7 @@ err:\

 # define M_ASN1_D2I_start_sequence() \

         if (!asn1_GetSequence(&c,&length)) \

-                { c.line=__LINE__; goto err; }

+                { c.line=OPENSSL_LINE; goto err; }

 /* Begin reading ASN1 without a surrounding sequence */

 # define M_ASN1_D2I_begin() \

         c.slen = length;

@@ -129,21 +129,21 @@ err:\

 # define M_ASN1_D2I_get(b, func) \

         c.q=c.p; \

         if (func(&(b),&c.p,c.slen) == NULL) \

-                {c.line=__LINE__; goto err; } \

+                {c.line=OPENSSL_LINE; goto err; } \

         c.slen-=(c.p-c.q);

 /* Don't use this with d2i_ASN1_BOOLEAN() */

 # define M_ASN1_D2I_get_x(type,b,func) \

         c.q=c.p; \

         if (((D2I_OF(type))func)(&(b),&c.p,c.slen) == NULL) \

-                {c.line=__LINE__; goto err; } \

+                {c.line=OPENSSL_LINE; goto err; } \

         c.slen-=(c.p-c.q);

 /* use this instead () */

 # define M_ASN1_D2I_get_int(b,func) \

         c.q=c.p; \

         if (func(&(b),&c.p,c.slen) < 0) \

-                {c.line=__LINE__; goto err; } \

+                {c.line=OPENSSL_LINE; goto err; } \

         c.slen-=(c.p-c.q);

 # define M_ASN1_D2I_get_opt(b,func,type) \

@@ -164,7 +164,7 @@ err:\

         M_ASN1_next=(_tmp& V_ASN1_CONSTRUCTED)|type; \

         c.q=c.p; \

         if (func(&(b),&c.p,c.slen) == NULL) \

-                {c.line=__LINE__; M_ASN1_next_prev = _tmp; goto err; } \

+                {c.line=OPENSSL_LINE; M_ASN1_next_prev = _tmp; goto err; } \

         c.slen-=(c.p-c.q);\

         M_ASN1_next_prev=_tmp;

@@ -258,20 +258,20 @@ err:\

         c.q=c.p; \

         if (d2i_ASN1_SET(&(r),&c.p,c.slen,(char *(*)())func,\

                 (void (*)())free_func,a,b) == NULL) \

-                { c.line=__LINE__; goto err; } \

+                { c.line=OPENSSL_LINE; goto err; } \

         c.slen-=(c.p-c.q);

 # define M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,a,b) \

         c.q=c.p; \

         if (d2i_ASN1_SET_OF_##type(&(r),&c.p,c.slen,func,\

                                    free_func,a,b) == NULL) \

-                { c.line=__LINE__; goto err; } \

+                { c.line=OPENSSL_LINE; goto err; } \

         c.slen-=(c.p-c.q);

 # define M_ASN1_D2I_get_set_strings(r,func,a,b) \

         c.q=c.p; \

         if (d2i_ASN1_STRING_SET(&(r),&c.p,c.slen,a,b) == NULL) \

-                { c.line=__LINE__; goto err; } \

+                { c.line=OPENSSL_LINE; goto err; } \

         c.slen-=(c.p-c.q);

 # define M_ASN1_D2I_get_EXP_opt(r,func,tag) \

@@ -285,16 +285,16 @@ err:\

                 Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \

                 if (Tinf & 0x80) \

                         { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \

-                        c.line=__LINE__; goto err; } \

+                        c.line=OPENSSL_LINE; goto err; } \

                 if (Tinf == (V_ASN1_CONSTRUCTED+1)) \

                                         Tlen = c.slen - (c.p - c.q) - 2; \

                 if (func(&(r),&c.p,Tlen) == NULL) \

-                        { c.line=__LINE__; goto err; } \

+                        { c.line=OPENSSL_LINE; goto err; } \

                 if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \

                         Tlen = c.slen - (c.p - c.q); \

                         if(!ASN1_const_check_infinite_end(&c.p, Tlen)) \

                                 { c.error=ERR_R_MISSING_ASN1_EOS; \

-                                c.line=__LINE__; goto err; } \

+                                c.line=OPENSSL_LINE; goto err; } \

                 }\

                 c.slen-=(c.p-c.q); \

                 }

@@ -310,18 +310,18 @@ err:\

                 Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \

                 if (Tinf & 0x80) \

                         { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \

-                        c.line=__LINE__; goto err; } \

+                        c.line=OPENSSL_LINE; goto err; } \

                 if (Tinf == (V_ASN1_CONSTRUCTED+1)) \

                                         Tlen = c.slen - (c.p - c.q) - 2; \

                 if (d2i_ASN1_SET(&(r),&c.p,Tlen,(char *(*)())func, \

                         (void (*)())free_func, \

                         b,V_ASN1_UNIVERSAL) == NULL) \

-                        { c.line=__LINE__; goto err; } \

+                        { c.line=OPENSSL_LINE; goto err; } \

                 if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \

                         Tlen = c.slen - (c.p - c.q); \

                         if(!ASN1_check_infinite_end(&c.p, Tlen)) \

                                 { c.error=ERR_R_MISSING_ASN1_EOS; \

-                                c.line=__LINE__; goto err; } \

+                                c.line=OPENSSL_LINE; goto err; } \

                 }\

                 c.slen-=(c.p-c.q); \

                 }

@@ -337,17 +337,17 @@ err:\

                 Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \

                 if (Tinf & 0x80) \

                         { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \

-                        c.line=__LINE__; goto err; } \

+                        c.line=OPENSSL_LINE; goto err; } \

                 if (Tinf == (V_ASN1_CONSTRUCTED+1)) \

                                         Tlen = c.slen - (c.p - c.q) - 2; \

                 if (d2i_ASN1_SET_OF_##type(&(r),&c.p,Tlen,func, \

                         free_func,b,V_ASN1_UNIVERSAL) == NULL) \

-                        { c.line=__LINE__; goto err; } \

+                        { c.line=OPENSSL_LINE; goto err; } \

                 if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \

                         Tlen = c.slen - (c.p - c.q); \

                         if(!ASN1_check_infinite_end(&c.p, Tlen)) \

                                 { c.error=ERR_R_MISSING_ASN1_EOS; \

-                                c.line=__LINE__; goto err; } \

+                                c.line=OPENSSL_LINE; goto err; } \

                 }\

                 c.slen-=(c.p-c.q); \

                 }

@@ -355,7 +355,7 @@ err:\

 /* New macros */

 # define M_ASN1_New_Malloc(ret,type) \

         if ((ret=(type *)OPENSSL_malloc(sizeof(type))) == NULL) \

-                { c.line=__LINE__; goto err2; }

+                { c.line=OPENSSL_LINE; goto err2; }

 # define M_ASN1_New(arg,func) \

         if (((arg)=func()) == NULL) return(NULL)

diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c

index d5a5514..bede55c 100644

--- a/crypto/asn1/n_pkey.c

+++ b/crypto/asn1/n_pkey.c

@@ -193,7 +193,12 @@ int i2d_RSA_NET(const RSA *a, unsigned char **pp,

     OPENSSL_cleanse(pkey->private_key->data, rsalen);

     if (cb == NULL)

+#ifndef OPENSSL_NO_UI

         cb = EVP_read_pw_string;

+#else

+        i = 1;

+    else

+#endif

     i = cb((char *)buf, 256, "Enter Private Key password:", 1);

     if (i != 0) {

         ASN1err(ASN1_F_I2D_RSA_NET, ASN1_R_BAD_PASSWORD_READ);

@@ -264,7 +269,11 @@ RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,

         goto err;

     }

     if (cb == NULL)

+#ifndef OPENSSL_NO_UI

         cb = EVP_read_pw_string;

+#else

+        goto err;

+#endif

     if ((ret = d2i_RSA_NET_2(a, enckey->enckey->digest, cb, sgckey)) == NULL)

         goto err;

diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c

index 1d25687..e933ead 100644

--- a/crypto/bn/bn_prime.c

+++ b/crypto/bn/bn_prime.c

@@ -131,7 +131,7 @@

 static int witness(BIGNUM *w, const BIGNUM *a, const BIGNUM *a1,

                    const BIGNUM *a1_odd, int k, BN_CTX *ctx,

                    BN_MONT_CTX *mont);

-static int probable_prime(BIGNUM *rnd, int bits);

+static int probable_prime(BIGNUM *rnd, int bits, prime_t *mods);

 static int probable_prime_dh(BIGNUM *rnd, int bits,

                              const BIGNUM *add, const BIGNUM *rem,

                              BN_CTX *ctx);

@@ -166,9 +166,13 @@ int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe,

     BIGNUM *t;

     int found = 0;

     int i, j, c1 = 0;

-    BN_CTX *ctx;

+    BN_CTX *ctx = NULL;

+    prime_t *mods = NULL;

     int checks = BN_prime_checks_for_size(bits);

+    mods = OPENSSL_malloc(sizeof(*mods) * NUMPRIMES);

+    if (mods == NULL)

+	    goto err;

     ctx = BN_CTX_new();

     if (ctx == NULL)

         goto err;

@@ -179,7 +183,7 @@ int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe,

  loop:

     /* make a random number and set the top and bottom bits */

     if (add == NULL) {

-        if (!probable_prime(ret, bits))

+        if (!probable_prime(ret, bits, mods))

             goto err;

     } else {

         if (safe) {

@@ -230,6 +234,7 @@ int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe,

     /* we have a prime :-) */

     found = 1;

  err:

+    OPENSSL_free(mods);

     if (ctx != NULL) {

         BN_CTX_end(ctx);

         BN_CTX_free(ctx);

@@ -375,10 +380,9 @@ static int witness(BIGNUM *w, const BIGNUM *a, const BIGNUM *a1,

     return 1;

 }

-static int probable_prime(BIGNUM *rnd, int bits)

+static int probable_prime(BIGNUM *rnd, int bits, prime_t *mods)

 {

     int i;

-    prime_t mods[NUMPRIMES];

     BN_ULONG delta, maxdelta;

  again:

diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h

index 8d926d5..41cf38e 100644

--- a/crypto/conf/conf.h

+++ b/crypto/conf/conf.h

@@ -118,8 +118,10 @@ typedef void conf_finish_func (CONF_IMODULE *md);

 int CONF_set_default_method(CONF_METHOD *meth);

 void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash);

+# ifndef OPENSSL_NO_STDIO

 LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,

                                 long *eline);

+# endif

 # ifndef OPENSSL_NO_FP_API

 LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,

                                    long *eline);

@@ -133,7 +135,9 @@ char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,

 long CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group,

                      const char *name);

 void CONF_free(LHASH_OF(CONF_VALUE) *conf);

+#ifndef OPENSSL_NO_FP_API

 int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out);

+#endif

 int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out);

 void OPENSSL_config(const char *config_name);

@@ -160,7 +164,9 @@ CONF_METHOD *NCONF_XML(void);

 void NCONF_free(CONF *conf);

 void NCONF_free_data(CONF *conf);

+# ifndef OPENSSL_NO_STDIO

 int NCONF_load(CONF *conf, const char *file, long *eline);

+# endif

 # ifndef OPENSSL_NO_FP_API

 int NCONF_load_fp(CONF *conf, FILE *fp, long *eline);

 # endif

@@ -170,7 +176,9 @@ STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf,

 char *NCONF_get_string(const CONF *conf, const char *group, const char *name);

 int NCONF_get_number_e(const CONF *conf, const char *group, const char *name,

                        long *result);

+#ifndef OPENSSL_NO_FP_API

 int NCONF_dump_fp(const CONF *conf, FILE *out);

+#endif

 int NCONF_dump_bio(const CONF *conf, BIO *out);

 # if 0                          /* The following function has no error

@@ -184,8 +192,10 @@ long NCONF_get_number(CONF *conf, char *group, char *name);

 int CONF_modules_load(const CONF *cnf, const char *appname,

                       unsigned long flags);

+#ifndef OPENSSL_NO_STDIO

 int CONF_modules_load_file(const char *filename, const char *appname,

                            unsigned long flags);

+#endif

 void CONF_modules_unload(int all);

 void CONF_modules_finish(void);

 void CONF_modules_free(void);

diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c

index 68c77ce..3d308c7 100644

--- a/crypto/conf/conf_def.c

+++ b/crypto/conf/conf_def.c

@@ -182,6 +182,10 @@ static int def_destroy_data(CONF *conf)

 static int def_load(CONF *conf, const char *name, long *line)

 {

+#ifdef OPENSSL_NO_STDIO

+    CONFerr(CONF_F_DEF_LOAD, ERR_R_SYS_LIB);

+    return 0;

+#else

     int ret;

     BIO *in = NULL;

@@ -202,6 +206,7 @@ static int def_load(CONF *conf, const char *name, long *line)

     BIO_free(in);

     return ret;

+#endif

 }

 static int def_load_bio(CONF *conf, BIO *in, long *line)

diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c

index 5281384..952b545 100644

--- a/crypto/conf/conf_lib.c

+++ b/crypto/conf/conf_lib.c

@@ -90,6 +90,7 @@ int CONF_set_default_method(CONF_METHOD *meth)

     return 1;

 }

+#ifndef OPENSSL_NO_STDIO

 LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,

                                 long *eline)

 {

@@ -111,6 +112,7 @@ LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,

     return ltmp;

 }

+#endif

 #ifndef OPENSSL_NO_FP_API

 LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,

@@ -255,6 +257,7 @@ void NCONF_free_data(CONF *conf)

     conf->meth->destroy_data(conf);

 }

+#ifndef OPENSSL_NO_STDIO

 int NCONF_load(CONF *conf, const char *file, long *eline)

 {

     if (conf == NULL) {

@@ -264,6 +267,7 @@ int NCONF_load(CONF *conf, const char *file, long *eline)

     return conf->meth->load(conf, file, eline);

 }

+#endif

 #ifndef OPENSSL_NO_FP_API

 int NCONF_load_fp(CONF *conf, FILE *fp, long *eline)

diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c

index 9acfca4..5e0a482 100644

--- a/crypto/conf/conf_mod.c

+++ b/crypto/conf/conf_mod.c

@@ -159,6 +159,7 @@ int CONF_modules_load(const CONF *cnf, const char *appname,

 }

+#ifndef OPENSSL_NO_STDIO

 int CONF_modules_load_file(const char *filename, const char *appname,

                            unsigned long flags)

 {

@@ -194,6 +195,7 @@ int CONF_modules_load_file(const char *filename, const char *appname,

     return ret;

 }

+#endif

 static int module_run(const CONF *cnf, char *name, char *value,

                       unsigned long flags)

diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c

index c042cf2..a25b636 100644

--- a/crypto/conf/conf_sap.c

+++ b/crypto/conf/conf_sap.c

@@ -87,9 +87,11 @@ void OPENSSL_config(const char *config_name)

     ENGINE_load_builtin_engines();

 #endif

     ERR_clear_error();

+#ifndef OPENSSL_NO_STDIO

     CONF_modules_load_file(NULL, config_name,

                                CONF_MFLAGS_DEFAULT_SECTION |

                                CONF_MFLAGS_IGNORE_MISSING_FILE);

+#endif

     openssl_configured = 1;

 }

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c

index 1925428..da4b34d 100644

--- a/crypto/cryptlib.c

+++ b/crypto/cryptlib.c

@@ -263,7 +263,7 @@ int CRYPTO_get_new_dynlockid(void)

         return (0);

     }

     pointer->references = 1;

-    pointer->data = dynlock_create_callback(__FILE__, __LINE__);

+    pointer->data = dynlock_create_callback(OPENSSL_FILE, OPENSSL_LINE);

     if (pointer->data == NULL) {

         OPENSSL_free(pointer);

         CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID, ERR_R_MALLOC_FAILURE);

@@ -289,7 +289,7 @@ int CRYPTO_get_new_dynlockid(void)

     CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);

     if (i == -1) {

-        dynlock_destroy_callback(pointer->data, __FILE__, __LINE__);

+        dynlock_destroy_callback(pointer->data, OPENSSL_FILE, OPENSSL_LINE);

         OPENSSL_free(pointer);

     } else

         i += 1;                 /* to avoid 0 */

@@ -328,7 +328,7 @@ void CRYPTO_destroy_dynlockid(int i)

     CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);

     if (pointer) {

-        dynlock_destroy_callback(pointer->data, __FILE__, __LINE__);

+        dynlock_destroy_callback(pointer->data, OPENSSL_FILE, OPENSSL_LINE);

         OPENSSL_free(pointer);

     }

 }

@@ -670,6 +670,7 @@ unsigned long *OPENSSL_ia32cap_loc(void)

 }

 # if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)

+#include <stdio.h>

 #  define OPENSSL_CPUID_SETUP

 #  if defined(_WIN32)

 typedef unsigned __int64 IA32CAP;

@@ -980,11 +981,13 @@ void OPENSSL_showfatal(const char *fmta, ...)

 #else

 void OPENSSL_showfatal(const char *fmta, ...)

 {

+#ifndef OPENSSL_NO_STDIO

     va_list ap;

     va_start(ap, fmta);

     vfprintf(stderr, fmta, ap);

     va_end(ap);

+#endif

 }

 int OPENSSL_isservice(void)

@@ -1011,10 +1014,12 @@ void OpenSSLDie(const char *file, int line, const char *assertion)

 #endif

 }

+#ifndef OPENSSL_NO_STDIO

 void *OPENSSL_stderr(void)

 {

     return stderr;

 }

+#endif

 int CRYPTO_memcmp(const volatile void *in_a, const volatile void *in_b, size_t len)

 {

diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h

index fba180a..3e3ea5e 100644

--- a/crypto/cryptlib.h

+++ b/crypto/cryptlib.h

@@ -101,7 +101,9 @@ extern "C" {

 void OPENSSL_cpuid_setup(void);

 extern unsigned int OPENSSL_ia32cap_P[];

 void OPENSSL_showfatal(const char *fmta, ...);

+#ifndef OPENSSL_NO_STDIO

 void *OPENSSL_stderr(void);

+#endif

 extern int OPENSSL_NONPIC_relocated;

 #ifdef  __cplusplus

diff --git a/crypto/crypto.h b/crypto/crypto.h

index 6c644ce..bea4ca1 100644

--- a/crypto/crypto.h

+++ b/crypto/crypto.h

@@ -235,15 +235,15 @@ typedef struct openssl_item_st {

 # ifndef OPENSSL_NO_LOCKING

 #  ifndef CRYPTO_w_lock

 #   define CRYPTO_w_lock(type)     \

-        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)

+        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,OPENSSL_FILE,OPENSSL_LINE)

 #   define CRYPTO_w_unlock(type)   \

-        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)

+        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,OPENSSL_FILE,OPENSSL_LINE)

 #   define CRYPTO_r_lock(type)     \

-        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)

+        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,OPENSSL_FILE,OPENSSL_LINE)

 #   define CRYPTO_r_unlock(type)   \

-        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)

+        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,OPENSSL_FILE,OPENSSL_LINE)

 #   define CRYPTO_add(addr,amount,type)    \

-        CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)

+        CRYPTO_add_lock(addr,amount,type,OPENSSL_FILE,OPENSSL_LINE)

 #  endif

 # else

 #  define CRYPTO_w_lock(a)

@@ -378,19 +378,19 @@ int CRYPTO_is_mem_check_on(void);

 # define MemCheck_off()  CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)

 # define is_MemCheck_on() CRYPTO_is_mem_check_on()

-# define OPENSSL_malloc(num)     CRYPTO_malloc((int)num,__FILE__,__LINE__)

-# define OPENSSL_strdup(str)     CRYPTO_strdup((str),__FILE__,__LINE__)

+# define OPENSSL_malloc(num)     CRYPTO_malloc((int)num,OPENSSL_FILE,OPENSSL_LINE)

+# define OPENSSL_strdup(str)     CRYPTO_strdup((str),OPENSSL_FILE,OPENSSL_LINE)

 # define OPENSSL_realloc(addr,num) \

-        CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__)

+        CRYPTO_realloc((char *)addr,(int)num,OPENSSL_FILE,OPENSSL_LINE)

 # define OPENSSL_realloc_clean(addr,old_num,num) \

-        CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__)

+        CRYPTO_realloc_clean(addr,old_num,num,OPENSSL_FILE,OPENSSL_LINE)

 # define OPENSSL_remalloc(addr,num) \

-        CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__)

+        CRYPTO_remalloc((char **)addr,(int)num,OPENSSL_FILE,OPENSSL_LINE)

 # define OPENSSL_freeFunc        CRYPTO_free

 # define OPENSSL_free(addr)      CRYPTO_free(addr)

 # define OPENSSL_malloc_locked(num) \

-        CRYPTO_malloc_locked((int)num,__FILE__,__LINE__)

+        CRYPTO_malloc_locked((int)num,OPENSSL_FILE,OPENSSL_LINE)

 # define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr)

 const char *SSLeay_version(int type);

@@ -545,7 +545,7 @@ void CRYPTO_set_mem_debug_options(long bits);

 long CRYPTO_get_mem_debug_options(void);

 # define CRYPTO_push_info(info) \

-        CRYPTO_push_info_(info, __FILE__, __LINE__);

+        CRYPTO_push_info_(info, OPENSSL_FILE, OPENSSL_LINE);

 int CRYPTO_push_info_(const char *info, const char *file, int line);

 int CRYPTO_pop_info(void);

 int CRYPTO_remove_all_info(void);

@@ -588,7 +588,7 @@ void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);

 /* die if we have to */

 void OpenSSLDie(const char *file, int line, const char *assertion);

-# define OPENSSL_assert(e)       (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))

+# define OPENSSL_assert(e)       (void)((e) ? 0 : (OpenSSLDie(OPENSSL_FILE, OPENSSL_LINE, #e),1))

 unsigned long *OPENSSL_ia32cap_loc(void);

 # define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))

@@ -605,14 +605,14 @@ void OPENSSL_init(void);

 #  define fips_md_init_ctx(alg, cx) \

         int alg##_Init(cx##_CTX *c) \

         { \

-        if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \

+        if (FIPS_mode()) OpenSSLDie(OPENSSL_FILE, OPENSSL_LINE, \

                 "Low level API call to digest " #alg " forbidden in FIPS mode!"); \

         return private_##alg##_Init(c); \

         } \

         int private_##alg##_Init(cx##_CTX *c)

 #  define fips_cipher_abort(alg) \

-        if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \

+        if (FIPS_mode()) OpenSSLDie(OPENSSL_FILE, OPENSSL_LINE, \

                 "Low level API call to cipher " #alg " forbidden in FIPS mode!")

 # else

diff --git a/crypto/des/read2pwd.c b/crypto/des/read2pwd.c

index 01e275f..7633139 100644

--- a/crypto/des/read2pwd.c

+++ b/crypto/des/read2pwd.c

@@ -114,6 +114,10 @@

 #include <openssl/ui.h>

 #include <openssl/crypto.h>

+#ifndef BUFSIZ

+#define BUFSIZ 256

+#endif

+

 int DES_read_password(DES_cblock *key, const char *prompt, int verify)

 {

     int ok;

diff --git a/crypto/dh/Makefile b/crypto/dh/Makefile

index 46fa5ac..cc366ec 100644

--- a/crypto/dh/Makefile

+++ b/crypto/dh/Makefile

@@ -134,7 +134,7 @@ dh_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

 dh_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h

 dh_gen.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

 dh_gen.o: ../cryptlib.h dh_gen.c

-dh_kdf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

+dh_kdf.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h

 dh_kdf.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h

 dh_kdf.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h

 dh_kdf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h

diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h

index a5bd901..6488879 100644

--- a/crypto/dh/dh.h

+++ b/crypto/dh/dh.h

@@ -240,11 +240,13 @@ DH *DH_get_1024_160(void);

 DH *DH_get_2048_224(void);

 DH *DH_get_2048_256(void);

+# ifndef OPENSSL_NO_CMS

 /* RFC2631 KDF */

 int DH_KDF_X9_42(unsigned char *out, size_t outlen,

                  const unsigned char *Z, size_t Zlen,

                  ASN1_OBJECT *key_oid,

                  const unsigned char *ukm, size_t ukmlen, const EVP_MD *md);

+# endif

 # define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \

         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \

@@ -337,7 +339,9 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,

 /* KDF types */

 # define EVP_PKEY_DH_KDF_NONE                            1

+# ifndef OPENSSL_NO_CMS

 # define EVP_PKEY_DH_KDF_X9_42                           2

+# endif

 /* BEGIN ERROR CODES */

 /*

diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c

index a882cb2..4eddb9a 100644

--- a/crypto/dh/dh_kdf.c

+++ b/crypto/dh/dh_kdf.c

@@ -51,13 +51,18 @@

  * ====================================================================

  */

+#include <e_os.h>

+

+#ifndef OPENSSL_NO_CMS

 #include <string.h>

 #include <openssl/dh.h>

 #include <openssl/evp.h>

 #include <openssl/asn1.h>

 #include <openssl/cms.h>

+

 /* Key derivation from X9.42/RFC2631 */

+/* Uses CMS functions, hence the #ifdef wrapper. */

 #define DH_KDF_MAX      (1L << 30)

@@ -185,3 +190,4 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,

     EVP_MD_CTX_cleanup(&mctx);

     return rv;

 }

+#endif

diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c

index b58e3fa..c6288f6 100644

--- a/crypto/dh/dh_pmeth.c

+++ b/crypto/dh/dh_pmeth.c

@@ -207,7 +207,11 @@ static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)

     case EVP_PKEY_CTRL_DH_KDF_TYPE:

         if (p1 == -2)

             return dctx->kdf_type;

+#ifdef OPENSSL_NO_CMS

+        if (p1 != EVP_PKEY_DH_KDF_NONE)

+#else

         if (p1 != EVP_PKEY_DH_KDF_NONE && p1 != EVP_PKEY_DH_KDF_X9_42)

+#endif

             return -2;

         dctx->kdf_type = p1;

         return 1;

@@ -448,7 +452,10 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,

             return ret;

         *keylen = ret;

         return 1;

-    } else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) {

+    }

+#ifndef OPENSSL_NO_CMS

+    else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) {

+

         unsigned char *Z = NULL;

         size_t Zlen = 0;

         if (!dctx->kdf_outlen || !dctx->kdf_oid)

@@ -479,7 +486,8 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,

         }

         return ret;

     }

-    return 1;

+#endif

+    return 0;

 }

 const EVP_PKEY_METHOD dh_pkey_meth = {

diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c

index 83e208c..4869098 100644

--- a/crypto/ec/ec_ameth.c

+++ b/crypto/ec/ec_ameth.c

@@ -67,8 +67,10 @@

 #include <openssl/asn1t.h>

 #include "asn1_locl.h"

+#ifndef OPENSSL_NO_CMS

 static int ecdh_cms_decrypt(CMS_RecipientInfo *ri);

 static int ecdh_cms_encrypt(CMS_RecipientInfo *ri);

+#endif

 static int eckey_param2type(int *pptype, void **ppval, EC_KEY *ec_key)

 {

diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h

index 46f163b..b4a72a0 100644

--- a/crypto/engine/eng_int.h

+++ b/crypto/engine/eng_int.h

@@ -88,7 +88,7 @@ extern "C" {

                 (unsigned int)(e), (isfunct ? "funct" : "struct"), \

                 ((isfunct) ? ((e)->funct_ref - (diff)) : ((e)->struct_ref - (diff))), \

                 ((isfunct) ? (e)->funct_ref : (e)->struct_ref), \

-                (__FILE__), (__LINE__));

+                (OPENSSL_FILE), (OPENSSL_LINE));

 # else

@@ -136,7 +136,7 @@ ENGINE *engine_table_select(ENGINE_TABLE **table, int nid);

 # else

 ENGINE *engine_table_select_tmp(ENGINE_TABLE **table, int nid, const char *f,

                                 int l);

-#  define engine_table_select(t,n) engine_table_select_tmp(t,n,__FILE__,__LINE__)

+#  define engine_table_select(t,n) engine_table_select_tmp(t,n,OPENSSL_FILE,OPENSSL_LINE)

 # endif

 typedef void (engine_table_doall_cb) (int nid, STACK_OF(ENGINE) *sk,

                                       ENGINE *def, void *arg);

diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c

index 34b0029..cf622bb 100644

--- a/crypto/engine/eng_openssl.c

+++ b/crypto/engine/eng_openssl.c

@@ -86,7 +86,9 @@

  * this is no longer automatic in ENGINE_load_builtin_engines().

  */

 #define TEST_ENG_OPENSSL_RC4

+#ifndef OPENSSL_NO_FP_API

 #define TEST_ENG_OPENSSL_PKEY

+#endif

 /* #define TEST_ENG_OPENSSL_RC4_OTHERS */

 #define TEST_ENG_OPENSSL_RC4_P_INIT

 /* #define TEST_ENG_OPENSSL_RC4_P_CIPHER */

diff --git a/crypto/err/err.h b/crypto/err/err.h

index 585aa8b..04c6cfc 100644

--- a/crypto/err/err.h

+++ b/crypto/err/err.h

@@ -200,39 +200,39 @@ typedef struct err_state_st {

 # define ERR_LIB_USER            128

-# define SYSerr(f,r)  ERR_PUT_error(ERR_LIB_SYS,(f),(r),__FILE__,__LINE__)

-# define BNerr(f,r)   ERR_PUT_error(ERR_LIB_BN,(f),(r),__FILE__,__LINE__)

-# define RSAerr(f,r)  ERR_PUT_error(ERR_LIB_RSA,(f),(r),__FILE__,__LINE__)

-# define DHerr(f,r)   ERR_PUT_error(ERR_LIB_DH,(f),(r),__FILE__,__LINE__)

-# define EVPerr(f,r)  ERR_PUT_error(ERR_LIB_EVP,(f),(r),__FILE__,__LINE__)

-# define BUFerr(f,r)  ERR_PUT_error(ERR_LIB_BUF,(f),(r),__FILE__,__LINE__)

-# define OBJerr(f,r)  ERR_PUT_error(ERR_LIB_OBJ,(f),(r),__FILE__,__LINE__)

-# define PEMerr(f,r)  ERR_PUT_error(ERR_LIB_PEM,(f),(r),__FILE__,__LINE__)

-# define DSAerr(f,r)  ERR_PUT_error(ERR_LIB_DSA,(f),(r),__FILE__,__LINE__)

-# define X509err(f,r) ERR_PUT_error(ERR_LIB_X509,(f),(r),__FILE__,__LINE__)

-# define ASN1err(f,r) ERR_PUT_error(ERR_LIB_ASN1,(f),(r),__FILE__,__LINE__)

-# define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),__FILE__,__LINE__)

-# define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),__FILE__,__LINE__)

-# define ECerr(f,r)   ERR_PUT_error(ERR_LIB_EC,(f),(r),__FILE__,__LINE__)

-# define SSLerr(f,r)  ERR_PUT_error(ERR_LIB_SSL,(f),(r),__FILE__,__LINE__)

-# define BIOerr(f,r)  ERR_PUT_error(ERR_LIB_BIO,(f),(r),__FILE__,__LINE__)

-# define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),__FILE__,__LINE__)

-# define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),__FILE__,__LINE__)

-# define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),__FILE__,__LINE__)

-# define RANDerr(f,r) ERR_PUT_error(ERR_LIB_RAND,(f),(r),__FILE__,__LINE__)

-# define DSOerr(f,r) ERR_PUT_error(ERR_LIB_DSO,(f),(r),__FILE__,__LINE__)

-# define ENGINEerr(f,r) ERR_PUT_error(ERR_LIB_ENGINE,(f),(r),__FILE__,__LINE__)

-# define OCSPerr(f,r) ERR_PUT_error(ERR_LIB_OCSP,(f),(r),__FILE__,__LINE__)

-# define UIerr(f,r) ERR_PUT_error(ERR_LIB_UI,(f),(r),__FILE__,__LINE__)

-# define COMPerr(f,r) ERR_PUT_error(ERR_LIB_COMP,(f),(r),__FILE__,__LINE__)

-# define ECDSAerr(f,r)  ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),__FILE__,__LINE__)

-# define ECDHerr(f,r)  ERR_PUT_error(ERR_LIB_ECDH,(f),(r),__FILE__,__LINE__)

-# define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__)

-# define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),__FILE__,__LINE__)

-# define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__)

-# define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),__FILE__,__LINE__)

-# define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)

-# define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__)

+# define SYSerr(f,r)  ERR_PUT_error(ERR_LIB_SYS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define BNerr(f,r)   ERR_PUT_error(ERR_LIB_BN,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define RSAerr(f,r)  ERR_PUT_error(ERR_LIB_RSA,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define DHerr(f,r)   ERR_PUT_error(ERR_LIB_DH,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define EVPerr(f,r)  ERR_PUT_error(ERR_LIB_EVP,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define BUFerr(f,r)  ERR_PUT_error(ERR_LIB_BUF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define OBJerr(f,r)  ERR_PUT_error(ERR_LIB_OBJ,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define PEMerr(f,r)  ERR_PUT_error(ERR_LIB_PEM,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define DSAerr(f,r)  ERR_PUT_error(ERR_LIB_DSA,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define X509err(f,r) ERR_PUT_error(ERR_LIB_X509,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define ASN1err(f,r) ERR_PUT_error(ERR_LIB_ASN1,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define ECerr(f,r)   ERR_PUT_error(ERR_LIB_EC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define SSLerr(f,r)  ERR_PUT_error(ERR_LIB_SSL,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define BIOerr(f,r)  ERR_PUT_error(ERR_LIB_BIO,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define RANDerr(f,r) ERR_PUT_error(ERR_LIB_RAND,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define DSOerr(f,r) ERR_PUT_error(ERR_LIB_DSO,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define ENGINEerr(f,r) ERR_PUT_error(ERR_LIB_ENGINE,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define OCSPerr(f,r) ERR_PUT_error(ERR_LIB_OCSP,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define UIerr(f,r) ERR_PUT_error(ERR_LIB_UI,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define COMPerr(f,r) ERR_PUT_error(ERR_LIB_COMP,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define ECDSAerr(f,r)  ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define ECDHerr(f,r)  ERR_PUT_error(ERR_LIB_ECDH,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

+# define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

 /*

  * Borland C seems too stupid to be able to shift and do longs in the

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h