projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo: only return error if unrecognise bag type.
[openssl.git]
/
crypto
/
mem_sec.c
diff --git
a/crypto/mem_sec.c
b/crypto/mem_sec.c
index 5f4f733fd06f3f11f5871be37a7c25e39d5cd224..196c2457ad806828c6b5fbf18db6581397a08a7b 100644
(file)
--- a/
crypto/mem_sec.c
+++ b/
crypto/mem_sec.c
@@
-13,10
+13,11
@@
#include <openssl/crypto.h>
#include <e_os.h>
#include <openssl/crypto.h>
#include <e_os.h>
+#include <string.h>
+
#if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX)
# define IMPLEMENTED
# include <stdlib.h>
#if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX)
# define IMPLEMENTED
# include <stdlib.h>
-# include <string.h>
# include <assert.h>
# include <unistd.h>
# include <sys/types.h>
# include <assert.h>
# include <unistd.h>
# include <sys/types.h>
@@
-110,6
+111,15
@@
void *CRYPTO_secure_malloc(size_t num, const char *file, int line)
#endif /* IMPLEMENTED */
}
#endif /* IMPLEMENTED */
}
+void *CRYPTO_secure_zalloc(size_t num, const char *file, int line)
+{
+ void *ret = CRYPTO_secure_malloc(num, file, line);
+
+ if (ret != NULL)
+ memset(ret, 0, num);
+ return ret;
+}
+
void CRYPTO_secure_free(void *ptr)
{
#ifdef IMPLEMENTED
void CRYPTO_secure_free(void *ptr)
{
#ifdef IMPLEMENTED
@@
-157,6
+167,19
@@
size_t CRYPTO_secure_used()
#endif /* IMPLEMENTED */
}
#endif /* IMPLEMENTED */
}
+size_t CRYPTO_secure_actual_size(void *ptr)
+{
+#ifdef IMPLEMENTED
+ size_t actual_size;
+
+ LOCK();
+ actual_size = sh_actual_size(ptr);
+ UNLOCK();
+ return actual_size;
+#else
+ return 0;
+#endif
+}
/* END OF PAGE ...
... START OF PAGE */
/* END OF PAGE ...
... START OF PAGE */