Commit 6397ac58 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

crypto/mem.c: drop reference to cleanse_ctr and fix no-asm builds. 



crypto/mem_clr.c was harmonized with master branch and doesn't use
cleanse_ctr kludge anymore.

RT#4563

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 80e07cc7

crypto/mem.c

+0 −24
Original line number Diff line number Diff line
@@ -298,18 +298,6 @@ void *CRYPTO_malloc_locked(int num, const char *file, int line) 
    if (malloc_debug_func != NULL)

        malloc_debug_func(ret, num, file, line, 1);



#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;

}
@@ -346,18 +334,6 @@ void *CRYPTO_malloc(int num, const char *file, int line) 
    if (malloc_debug_func != NULL)

        malloc_debug_func(ret, num, file, line, 1);



#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;

}