Commit ec517d25 authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge from 0.9.7-stable.

parent ce9b1b05

crypto/md5/md5.h

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ 
#ifndef HEADER_MD5_H

#define HEADER_MD5_H



#include <openssl/e_os2.h>



#ifdef  __cplusplus

extern "C" {

#endif

crypto/md5/md5_locl.h

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 


#include <stdlib.h>

#include <string.h>

#include <openssl/opensslconf.h>

#include <openssl/e_os2.h>

#include <openssl/md5.h>



#ifndef MD5_LONG_LOG2
@@ -68,7 +68,7 @@ 
#ifdef MD5_ASM

# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)

#  define md5_block_host_order md5_block_asm_host_order

# elif defined(__sparc) && defined(OPENSSL_SYSNAME_ULTRASPARC)

# elif defined(__sparc) && defined(OPENSSL_SYS_ULTRASPARC)

   void md5_block_asm_data_order_aligned (MD5_CTX *c, const MD5_LONG *p,int num);

#  define HASH_BLOCK_DATA_ORDER_ALIGNED md5_block_asm_data_order_aligned

# endif

crypto/ossl_typ.h

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ 
#ifndef HEADER_OPENSSL_TYPES_H

#define HEADER_OPENSSL_TYPES_H



#include <openssl/e_os2.h>



#ifdef NO_ASN1_TYPEDEFS

#define ASN1_INTEGER		ASN1_STRING

#define ASN1_ENUMERATED		ASN1_STRING