Fix: PEM_read_bio_PrivateKey with no-ui / no-stdio

[openssl.git] / crypto / mem.c

diff --git a/crypto/mem.c b/crypto/mem.c
index 096b1919b75f621d1fe3606c26b8a982accec0fc..6be14ab54ae2a6214a0bb6694822faac36f9c71a 100644 (file)
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -1,59 +1,10 @@
-/* crypto/mem.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

  *
  *

- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>


@@ -67,11 +18,11 @@
  */
 static int allow_customize = 1;
 
  */
 static int allow_customize = 1;
 

-static void *(*malloc_wrapper)(size_t, const char *, int)
+static void *(*malloc_impl)(size_t, const char *, int)

     = CRYPTO_malloc;
     = CRYPTO_malloc;

-static void *(*realloc_wrapper)(void *, size_t, const char *, int)
+static void *(*realloc_impl)(void *, size_t, const char *, int)

     = CRYPTO_realloc;
     = CRYPTO_realloc;

-static void (*free_wrapper)(void *)
+static void (*free_impl)(void *, const char *, int)

     = CRYPTO_free;
 
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG
     = CRYPTO_free;
 
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG


@@ -83,16 +34,16 @@ static int call_malloc_debug = 0;
 int CRYPTO_set_mem_functions(
         void *(*m)(size_t, const char *, int),
         void *(*r)(void *, size_t, const char *, int),
 int CRYPTO_set_mem_functions(
         void *(*m)(size_t, const char *, int),
         void *(*r)(void *, size_t, const char *, int),

-        void (*f)(void *))
+        void (*f)(void *, const char *, int))

 {
     if (!allow_customize)
         return 0;
     if (m)
 {
     if (!allow_customize)
         return 0;
     if (m)

-        malloc_wrapper = m;
+        malloc_impl = m;

     if (r)
     if (r)

-        realloc_wrapper = r;
+        realloc_impl = r;

     if (f)
     if (f)

-        free_wrapper = f;
+        free_impl = f;

     return 1;
 }
 
     return 1;
 }
 


@@ -107,20 +58,23 @@ int CRYPTO_set_mem_debug(int flag)
 void CRYPTO_get_mem_functions(
         void *(**m)(size_t, const char *, int),
         void *(**r)(void *, size_t, const char *, int),
 void CRYPTO_get_mem_functions(
         void *(**m)(size_t, const char *, int),
         void *(**r)(void *, size_t, const char *, int),

-        void (**f)(void *))
+        void (**f)(void *, const char *, int))

 {
     if (m != NULL)
 {
     if (m != NULL)

-        *m = malloc_wrapper;
+        *m = malloc_impl;

     if (r != NULL)
     if (r != NULL)

-        *r = realloc_wrapper;
+        *r = realloc_impl;

     if (f != NULL)
     if (f != NULL)

-        *f = free_wrapper;
+        *f = free_impl;

 }
 
 void *CRYPTO_malloc(size_t num, const char *file, int line)
 {
     void *ret = NULL;
 
 }
 
 void *CRYPTO_malloc(size_t num, const char *file, int line)
 {
     void *ret = NULL;
 

+    if (malloc_impl != NULL && malloc_impl != CRYPTO_malloc)
+        return malloc_impl(num, file, line);
+

     if (num <= 0)
         return NULL;
 
     if (num <= 0)
         return NULL;
 


@@ -134,23 +88,10 @@ void *CRYPTO_malloc(size_t num, const char *file, int line)
         ret = malloc(num);
     }
 #else
         ret = malloc(num);
     }
 #else

-    (void)file;
-    (void)line;
+    osslargused(file); osslargused(line);

     ret = malloc(num);
 #endif
 
     ret = malloc(num);
 #endif
 

-#ifndef OPENSSL_CPUID_OBJ
-    /*
-     * Create a dependency on the value of 'cleanse_ctr' so our memory
-     * sanitisation function can't be optimised out. NB: We only do this for
-     * >2Kb so the overhead doesn't bother us.
-     */
-    if (ret && (num > 2048)) {
-        extern unsigned char cleanse_ctr;
-        ((unsigned char *)ret)[0] = cleanse_ctr;
-    }
-#endif
-

     return ret;
 }
 
     return ret;
 }
 


@@ -165,11 +106,14 @@ void *CRYPTO_zalloc(size_t num, const char *file, int line)
 
 void *CRYPTO_realloc(void *str, size_t num, const char *file, int line)
 {
 
 void *CRYPTO_realloc(void *str, size_t num, const char *file, int line)
 {

+    if (realloc_impl != NULL && realloc_impl != &CRYPTO_realloc)
+        return realloc_impl(str, num, file, line);
+

     if (str == NULL)
         return CRYPTO_malloc(num, file, line);
 
     if (num == 0) {
     if (str == NULL)
         return CRYPTO_malloc(num, file, line);
 
     if (num == 0) {

-        CRYPTO_free(str);
+        CRYPTO_free(str, file, line);

         return NULL;
     }
 
         return NULL;
     }
 


@@ -183,8 +127,7 @@ void *CRYPTO_realloc(void *str, size_t num, const char *file, int line)
         return ret;
     }
 #else
         return ret;
     }
 #else

-    (void)file;
-    (void)line;
+    osslargused(file); osslargused(line);

 #endif
     return realloc(str, num);
 
 #endif
     return realloc(str, num);
 


@@ -199,7 +142,7 @@ void *CRYPTO_clear_realloc(void *str, size_t old_len, size_t num,
         return CRYPTO_malloc(num, file, line);
 
     if (num == 0) {
         return CRYPTO_malloc(num, file, line);
 
     if (num == 0) {

-        CRYPTO_clear_free(str, old_len);
+        CRYPTO_clear_free(str, old_len, file, line);

         return NULL;
     }
 
         return NULL;
     }
 


@@ -209,35 +152,26 @@ void *CRYPTO_clear_realloc(void *str, size_t old_len, size_t num,
         return str;
     }
 
         return str;
     }
 

-    /* Allocate new memory.  Call malloc and do a copy, so that we can
-     * cleanse the old buffer. */
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG
-    if (call_malloc_debug) {
-        CRYPTO_mem_debug_realloc(str, NULL, num, 0, file, line);
-        ret = malloc(num);
-        CRYPTO_mem_debug_realloc(str, ret, num, 1, file, line);
-    } else {
-        ret = malloc(num);
-    }
-#else
-    (void)file;
-    (void)line;
-    ret = malloc(num);
-#endif
-
-    if (ret)
+    ret = CRYPTO_malloc(num, file, line);
+    if (ret != NULL) {

         memcpy(ret, str, old_len);
         memcpy(ret, str, old_len);

-    CRYPTO_clear_free(str, old_len);
+        CRYPTO_clear_free(str, old_len, file, line);
+    }

     return ret;
 }
 
     return ret;
 }
 

-void CRYPTO_free(void *str)
+void CRYPTO_free(void *str, const char *file, int line)

 {
 {

+    if (free_impl != NULL && free_impl != &CRYPTO_free) {
+        free_impl(str, file, line);
+        return;
+    }
+

 #ifndef OPENSSL_NO_CRYPTO_MDEBUG
     if (call_malloc_debug) {
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG
     if (call_malloc_debug) {

-        CRYPTO_mem_debug_free(str, 0);
+        CRYPTO_mem_debug_free(str, 0, file, line);

         free(str);
         free(str);

-        CRYPTO_mem_debug_free(str, 1);
+        CRYPTO_mem_debug_free(str, 1, file, line);

     } else {
         free(str);
     }
     } else {
         free(str);
     }


@@ -246,11 +180,11 @@ void CRYPTO_free(void *str)
 #endif
 }
 
 #endif
 }
 

-void CRYPTO_clear_free(void *str, size_t num)
+void CRYPTO_clear_free(void *str, size_t num, const char *file, int line)

 {
     if (str == NULL)
         return;
     if (num)
         OPENSSL_cleanse(str, num);
 {
     if (str == NULL)
         return;
     if (num)
         OPENSSL_cleanse(str, num);

-    CRYPTO_free(str);
+    CRYPTO_free(str, file, line);

 }
 }