diff options
| author | Ben Laurie <ben@openssl.org> | 2012-06-03 22:00:21 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2012-06-03 22:00:21 +0000 |
| commit | 71fa451343f97b3624374ed1359adc23fba5696e (patch) | |
| tree | 87ebfb43ece32507c68e360f36a67b4a921e79c0 /crypto/evp | |
| parent | a9e1c50bb09a110d4774e6710f9322344684fa2d (diff) | |
Version skew reduction: trivia (I hope).
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/Makefile | 1 | ||||
| -rw-r--r-- | crypto/evp/c_all.c | 2 | ||||
| -rw-r--r-- | crypto/evp/e_null.c | 1 | ||||
| -rw-r--r-- | crypto/evp/e_rc4_hmac_md5.c | 3 | ||||
| -rw-r--r-- | crypto/evp/m_ecdsa.c | 1 | ||||
| -rw-r--r-- | crypto/evp/names.c | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile index 6b2dac1e37..90d6dbd528 100644 --- a/crypto/evp/Makefile +++ b/crypto/evp/Makefile @@ -278,7 +278,6 @@ e_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h e_null.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h e_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h e_null.o: ../cryptlib.h e_null.c -e_old.o: e_old.c e_rc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h e_rc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h e_rc2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c index a5da52e62d..766c4cecdf 100644 --- a/crypto/evp/c_all.c +++ b/crypto/evp/c_all.c @@ -83,7 +83,7 @@ void OPENSSL_add_all_algorithms_noconf(void) OpenSSL_add_all_ciphers(); OpenSSL_add_all_digests(); #ifndef OPENSSL_NO_ENGINE -# if defined(__OpenBSD__) || defined(__FreeBSD__) +# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) ENGINE_setup_bsd_cryptodev(); # endif #endif diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c index 067a03cc59..9ca12ee243 100644 --- a/crypto/evp/e_null.c +++ b/crypto/evp/e_null.c @@ -99,4 +99,3 @@ static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, memcpy((char *)out,(const char *)in,inl); return 1; } - diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c index 649fcadd98..56563191ba 100644 --- a/crypto/evp/e_rc4_hmac_md5.c +++ b/crypto/evp/e_rc4_hmac_md5.c @@ -103,7 +103,8 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, #if !defined(OPENSSL_NO_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ defined(_M_AMD64) || defined(_M_X64) || \ - defined(__INTEL__) ) + defined(__INTEL__) ) && \ + !(defined(__APPLE__) && defined(__MACH__)) #define STITCHED_CALL #endif diff --git a/crypto/evp/m_ecdsa.c b/crypto/evp/m_ecdsa.c index 85acd4825e..aeb36ba2be 100644 --- a/crypto/evp/m_ecdsa.c +++ b/crypto/evp/m_ecdsa.c @@ -116,6 +116,7 @@ #include <openssl/sha.h> #ifndef OPENSSL_NO_SHA + static int init(EVP_MD_CTX *ctx) { return SHA1_Init(ctx->md_data); } diff --git a/crypto/evp/names.c b/crypto/evp/names.c index 33dea162dc..42f1e5d9e7 100644 --- a/crypto/evp/names.c +++ b/crypto/evp/names.c @@ -66,7 +66,7 @@ int EVP_add_cipher(const EVP_CIPHER *c) { int r; - if (c == NULL) return(0); + if (c == NULL) return 0; r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c); if (r == 0) return(0); |