projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move MD2, MD4 and MD5 digests completely to the providers
[openssl.git]
/
crypto
/
cryptlib.c
diff --git
a/crypto/cryptlib.c
b/crypto/cryptlib.c
index 9cf264b72022d109e440da311e2de4772c8fe4e5..bc29a3b583d63525eb12c2b4665f650e56c41a70 100644
(file)
--- a/
crypto/cryptlib.c
+++ b/
crypto/cryptlib.c
@@
-9,7
+9,7
@@
*/
#include "e_os.h"
*/
#include "e_os.h"
-#include "
internal/cryptlib_int
.h"
+#include "
crypto/cryptlib
.h"
#include <openssl/safestack.h>
#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
#include <openssl/safestack.h>
#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
@@
-18,7
+18,7
@@
extern unsigned int OPENSSL_ia32cap_P[4];
extern unsigned int OPENSSL_ia32cap_P[4];
-# if defined(OPENSSL_CPUID_OBJ)
&& !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
+# if defined(OPENSSL_CPUID_OBJ)
/*
* Purpose of these minimalistic and character-type-agnostic subroutines
/*
* Purpose of these minimalistic and character-type-agnostic subroutines
@@
-49,7
+49,7
@@
typedef char variant_char;
# define ossl_getenv getenv
# endif
# define ossl_getenv getenv
# endif
-# include "
internal
/ctype.h"
+# include "
crypto
/ctype.h"
static int todigit(variant_char c)
{
static int todigit(variant_char c)
{
@@
-84,7
+84,7
@@
static variant_char *ossl_strchr(const variant_char *str, char srch)
while((c = *str)) {
if (c == srch)
while((c = *str)) {
if (c == srch)
- return (variant_char *)str;
+
return (variant_char *)str;
str++;
}
str++;
}
@@
-352,9
+352,9
@@
void OPENSSL_showfatal(const char *fmta, ...)
/*
* TODO: (For non GUI and no std error cases)
/*
* TODO: (For non GUI and no std error cases)
- * Add event logging feature here.
+ * Add event logging feature here.
*/
*/
-
+
# if !defined(NDEBUG)
/*
* We are in a situation where we tried to report a critical
# if !defined(NDEBUG)
/*
* We are in a situation where we tried to report a critical
@@
-393,7
+393,7
@@
void OPENSSL_showfatal(const char *fmta, ...)
# endif
# else
MessageBox(NULL, buf, _T("OpenSSL: FATAL"), MB_OK | MB_ICONERROR);
# endif
# else
MessageBox(NULL, buf, _T("OpenSSL: FATAL"), MB_OK | MB_ICONERROR);
-# endif
+# endif
}
#else
void OPENSSL_showfatal(const char *fmta, ...)
}
#else
void OPENSSL_showfatal(const char *fmta, ...)
@@
-460,4
+460,14
@@
uint32_t OPENSSL_rdtsc(void)
{
return 0;
}
{
return 0;
}
+
+size_t OPENSSL_instrument_bus(unsigned int *out, size_t cnt)
+{
+ return 0;
+}
+
+size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max)
+{
+ return 0;
+}
#endif
#endif