Readd MD4.
Sadly this is needed by wpa_supplicant for NTLM hashes. Change-Id: I1c362c676a11ee01f301ff6fbd33d0669396ea23 Reviewed-on: https://boringssl-review.googlesource.com/1620 Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
Adam Langley
committed by
Adam Langley
Adam Langley
parent
8da990677b
commit
c9eb7eac86
@@ -71,6 +71,7 @@ add_subdirectory(bytestring)
|
||||
|
||||
# Level 0.2 - depends on nothing but itself
|
||||
add_subdirectory(sha)
|
||||
add_subdirectory(md4)
|
||||
add_subdirectory(md5)
|
||||
add_subdirectory(modes)
|
||||
add_subdirectory(aes)
|
||||
@@ -129,6 +130,7 @@ add_library(
|
||||
$<TARGET_OBJECTS:base64>
|
||||
$<TARGET_OBJECTS:bytestring>
|
||||
$<TARGET_OBJECTS:sha>
|
||||
$<TARGET_OBJECTS:md4>
|
||||
$<TARGET_OBJECTS:md5>
|
||||
$<TARGET_OBJECTS:digest>
|
||||
$<TARGET_OBJECTS:cipher>
|
||||
|
||||
@@ -56,6 +56,7 @@
|
||||
|
||||
#include <openssl/digest.h>
|
||||
|
||||
#include <openssl/md4.h>
|
||||
#include <openssl/md5.h>
|
||||
#include <openssl/obj.h>
|
||||
#include <openssl/sha.h>
|
||||
@@ -63,6 +64,24 @@
|
||||
#include "internal.h"
|
||||
|
||||
|
||||
static int md4_init(EVP_MD_CTX *ctx) { return MD4_Init(ctx->md_data); }
|
||||
|
||||
static int md4_update(EVP_MD_CTX *ctx, const void *data, size_t count) {
|
||||
return MD4_Update(ctx->md_data, data, count);
|
||||
}
|
||||
|
||||
static int md4_final(EVP_MD_CTX *ctx, unsigned char *out) {
|
||||
return MD4_Final(out, ctx->md_data);
|
||||
}
|
||||
|
||||
static const EVP_MD md4_md = {
|
||||
NID_md4, MD4_DIGEST_LENGTH, 0 /* flags */, md4_init,
|
||||
md4_update, md4_final, 64 /* block size */, sizeof(MD4_CTX),
|
||||
};
|
||||
|
||||
const EVP_MD *EVP_md4(void) { return &md4_md; }
|
||||
|
||||
|
||||
static int md5_init(EVP_MD_CTX *ctx) { return MD5_Init(ctx->md_data); }
|
||||
|
||||
static int md5_update(EVP_MD_CTX *ctx, const void *data, size_t count) {
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
include_directories(. .. ../../include)
|
||||
|
||||
add_library(
|
||||
md4
|
||||
|
||||
OBJECT
|
||||
|
||||
md4.c
|
||||
)
|
||||
@@ -0,0 +1,222 @@
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
* This package is an SSL implementation written
|
||||
* by Eric Young (eay@cryptsoft.com).
|
||||
* The implementation was written so as to conform with Netscapes SSL.
|
||||
*
|
||||
* This library is free for commercial and non-commercial use as long as
|
||||
* the following conditions are aheared to. The following conditions
|
||||
* apply to all code found in this distribution, be it the RC4, RSA,
|
||||
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
||||
* included with this distribution is covered by the same copyright terms
|
||||
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
* Copyright remains Eric Young's, and as such any Copyright notices in
|
||||
* the code are not to be removed.
|
||||
* If this package is used in a product, Eric Young should be given attribution
|
||||
* as the author of the parts of the library used.
|
||||
* This can be in the form of a textual message at program startup or
|
||||
* in documentation (online or textual) provided with the package.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* "This product includes cryptographic software written by
|
||||
* Eric Young (eay@cryptsoft.com)"
|
||||
* The word 'cryptographic' can be left out if the rouines from the library
|
||||
* being used are not cryptographic related :-).
|
||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||
* the apps directory (application code) you must include an acknowledgement:
|
||||
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* The licence and distribution terms for any publically available version or
|
||||
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
||||
* copied and put under another distribution licence
|
||||
* [including the GNU Public Licence.] */
|
||||
|
||||
#include <openssl/md4.h>
|
||||
|
||||
|
||||
/* Implemented from RFC1186 The MD4 Message-Digest Algorithm. */
|
||||
|
||||
int MD4_Init(MD4_CTX *md4) {
|
||||
memset(md4, 0, sizeof(MD4_CTX));
|
||||
md4->A = 0x67452301UL;
|
||||
md4->B = 0xefcdab89UL;
|
||||
md4->C = 0x98badcfeUL;
|
||||
md4->D = 0x10325476UL;
|
||||
return 1;
|
||||
}
|
||||
|
||||
void md4_block_data_order (MD4_CTX *md4, const void *p, size_t num);
|
||||
|
||||
#define DATA_ORDER_IS_LITTLE_ENDIAN
|
||||
|
||||
#define HASH_LONG uint32_t
|
||||
#define HASH_CTX MD4_CTX
|
||||
#define HASH_CBLOCK 64
|
||||
#define HASH_UPDATE MD4_Update
|
||||
#define HASH_TRANSFORM MD4_Transform
|
||||
#define HASH_FINAL MD4_Final
|
||||
#define HASH_MAKE_STRING(c, s) \
|
||||
do { \
|
||||
unsigned long ll; \
|
||||
ll = (c)->A; \
|
||||
(void) HOST_l2c(ll, (s)); \
|
||||
ll = (c)->B; \
|
||||
(void) HOST_l2c(ll, (s)); \
|
||||
ll = (c)->C; \
|
||||
(void) HOST_l2c(ll, (s)); \
|
||||
ll = (c)->D; \
|
||||
(void) HOST_l2c(ll, (s)); \
|
||||
} while (0)
|
||||
#define HASH_BLOCK_DATA_ORDER md4_block_data_order
|
||||
|
||||
#include "../digest/md32_common.h"
|
||||
|
||||
/* As pointed out by Wei Dai <weidai@eskimo.com>, the above can be
|
||||
* simplified to the code below. Wei attributes these optimizations
|
||||
* to Peter Gutmann's SHS code, and he attributes it to Rich Schroeppel. */
|
||||
#define F(b, c, d) ((((c) ^ (d)) & (b)) ^ (d))
|
||||
#define G(b, c, d) (((b) & (c)) | ((b) & (d)) | ((c) & (d)))
|
||||
#define H(b, c, d) ((b) ^ (c) ^ (d))
|
||||
|
||||
#define R0(a, b, c, d, k, s, t) \
|
||||
{ \
|
||||
a += ((k) + (t)+F((b), (c), (d))); \
|
||||
a = ROTATE(a, s); \
|
||||
};
|
||||
|
||||
#define R1(a, b, c, d, k, s, t) \
|
||||
{ \
|
||||
a += ((k) + (t)+G((b), (c), (d))); \
|
||||
a = ROTATE(a, s); \
|
||||
};
|
||||
|
||||
#define R2(a, b, c, d, k, s, t) \
|
||||
{ \
|
||||
a += ((k) + (t)+H((b), (c), (d))); \
|
||||
a = ROTATE(a, s); \
|
||||
};
|
||||
|
||||
void md4_block_data_order(MD4_CTX *c, const void *data_, size_t num) {
|
||||
const uint8_t *data = data_;
|
||||
uint32_t A, B, C, D, l;
|
||||
uint32_t X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15;
|
||||
|
||||
A = c->A;
|
||||
B = c->B;
|
||||
C = c->C;
|
||||
D = c->D;
|
||||
|
||||
for (; num--;) {
|
||||
HOST_c2l(data, l);
|
||||
X0 = l;
|
||||
HOST_c2l(data, l);
|
||||
X1 = l;
|
||||
/* Round 0 */
|
||||
R0(A, B, C, D, X0, 3, 0);
|
||||
HOST_c2l(data, l);
|
||||
X2 = l;
|
||||
R0(D, A, B, C, X1, 7, 0);
|
||||
HOST_c2l(data, l);
|
||||
X3 = l;
|
||||
R0(C, D, A, B, X2, 11, 0);
|
||||
HOST_c2l(data, l);
|
||||
X4 = l;
|
||||
R0(B, C, D, A, X3, 19, 0);
|
||||
HOST_c2l(data, l);
|
||||
X5 = l;
|
||||
R0(A, B, C, D, X4, 3, 0);
|
||||
HOST_c2l(data, l);
|
||||
X6 = l;
|
||||
R0(D, A, B, C, X5, 7, 0);
|
||||
HOST_c2l(data, l);
|
||||
X7 = l;
|
||||
R0(C, D, A, B, X6, 11, 0);
|
||||
HOST_c2l(data, l);
|
||||
X8 = l;
|
||||
R0(B, C, D, A, X7, 19, 0);
|
||||
HOST_c2l(data, l);
|
||||
X9 = l;
|
||||
R0(A, B, C, D, X8, 3, 0);
|
||||
HOST_c2l(data, l);
|
||||
X10 = l;
|
||||
R0(D, A, B, C, X9, 7, 0);
|
||||
HOST_c2l(data, l);
|
||||
X11 = l;
|
||||
R0(C, D, A, B, X10, 11, 0);
|
||||
HOST_c2l(data, l);
|
||||
X12 = l;
|
||||
R0(B, C, D, A, X11, 19, 0);
|
||||
HOST_c2l(data, l);
|
||||
X13 = l;
|
||||
R0(A, B, C, D, X12, 3, 0);
|
||||
HOST_c2l(data, l);
|
||||
X14 = l;
|
||||
R0(D, A, B, C, X13, 7, 0);
|
||||
HOST_c2l(data, l);
|
||||
X15 = l;
|
||||
R0(C, D, A, B, X14, 11, 0);
|
||||
R0(B, C, D, A, X15, 19, 0);
|
||||
/* Round 1 */
|
||||
R1(A, B, C, D, X0, 3, 0x5A827999L);
|
||||
R1(D, A, B, C, X4, 5, 0x5A827999L);
|
||||
R1(C, D, A, B, X8, 9, 0x5A827999L);
|
||||
R1(B, C, D, A, X12, 13, 0x5A827999L);
|
||||
R1(A, B, C, D, X1, 3, 0x5A827999L);
|
||||
R1(D, A, B, C, X5, 5, 0x5A827999L);
|
||||
R1(C, D, A, B, X9, 9, 0x5A827999L);
|
||||
R1(B, C, D, A, X13, 13, 0x5A827999L);
|
||||
R1(A, B, C, D, X2, 3, 0x5A827999L);
|
||||
R1(D, A, B, C, X6, 5, 0x5A827999L);
|
||||
R1(C, D, A, B, X10, 9, 0x5A827999L);
|
||||
R1(B, C, D, A, X14, 13, 0x5A827999L);
|
||||
R1(A, B, C, D, X3, 3, 0x5A827999L);
|
||||
R1(D, A, B, C, X7, 5, 0x5A827999L);
|
||||
R1(C, D, A, B, X11, 9, 0x5A827999L);
|
||||
R1(B, C, D, A, X15, 13, 0x5A827999L);
|
||||
/* Round 2 */
|
||||
R2(A, B, C, D, X0, 3, 0x6ED9EBA1L);
|
||||
R2(D, A, B, C, X8, 9, 0x6ED9EBA1L);
|
||||
R2(C, D, A, B, X4, 11, 0x6ED9EBA1L);
|
||||
R2(B, C, D, A, X12, 15, 0x6ED9EBA1L);
|
||||
R2(A, B, C, D, X2, 3, 0x6ED9EBA1L);
|
||||
R2(D, A, B, C, X10, 9, 0x6ED9EBA1L);
|
||||
R2(C, D, A, B, X6, 11, 0x6ED9EBA1L);
|
||||
R2(B, C, D, A, X14, 15, 0x6ED9EBA1L);
|
||||
R2(A, B, C, D, X1, 3, 0x6ED9EBA1L);
|
||||
R2(D, A, B, C, X9, 9, 0x6ED9EBA1L);
|
||||
R2(C, D, A, B, X5, 11, 0x6ED9EBA1L);
|
||||
R2(B, C, D, A, X13, 15, 0x6ED9EBA1L);
|
||||
R2(A, B, C, D, X3, 3, 0x6ED9EBA1L);
|
||||
R2(D, A, B, C, X11, 9, 0x6ED9EBA1L);
|
||||
R2(C, D, A, B, X7, 11, 0x6ED9EBA1L);
|
||||
R2(B, C, D, A, X15, 15, 0x6ED9EBA1L);
|
||||
|
||||
A = c->A += A;
|
||||
B = c->B += B;
|
||||
C = c->C += C;
|
||||
D = c->D += D;
|
||||
}
|
||||
}
|
||||
@@ -184,6 +184,7 @@ typedef struct evp_pkey_ctx_st EVP_PKEY_CTX;
|
||||
typedef struct evp_pkey_method_st EVP_PKEY_METHOD;
|
||||
typedef struct evp_pkey_st EVP_PKEY;
|
||||
typedef struct hmac_ctx_st HMAC_CTX;
|
||||
typedef struct md4_state_st MD4_CTX;
|
||||
typedef struct md5_state_st MD5_CTX;
|
||||
typedef struct pkcs8_priv_key_info_st PKCS8_PRIV_KEY_INFO;
|
||||
typedef struct rand_meth_st RAND_METHOD;
|
||||
|
||||
@@ -76,6 +76,7 @@ extern "C" {
|
||||
* The following functions return |EVP_MD| objects that implement the named hash
|
||||
* function. */
|
||||
|
||||
OPENSSL_EXPORT const EVP_MD *EVP_md4(void);
|
||||
OPENSSL_EXPORT const EVP_MD *EVP_md5(void);
|
||||
OPENSSL_EXPORT const EVP_MD *EVP_sha1(void);
|
||||
OPENSSL_EXPORT const EVP_MD *EVP_sha224(void);
|
||||
|
||||
@@ -0,0 +1,105 @@
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved.
|
||||
*
|
||||
* This package is an SSL implementation written
|
||||
* by Eric Young (eay@cryptsoft.com).
|
||||
* The implementation was written so as to conform with Netscapes SSL.
|
||||
*
|
||||
* This library is free for commercial and non-commercial use as long as
|
||||
* the following conditions are aheared to. The following conditions
|
||||
* apply to all code found in this distribution, be it the RC4, RSA,
|
||||
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
||||
* included with this distribution is covered by the same copyright terms
|
||||
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
* Copyright remains Eric Young's, and as such any Copyright notices in
|
||||
* the code are not to be removed.
|
||||
* If this package is used in a product, Eric Young should be given attribution
|
||||
* as the author of the parts of the library used.
|
||||
* This can be in the form of a textual message at program startup or
|
||||
* in documentation (online or textual) provided with the package.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* "This product includes cryptographic software written by
|
||||
* Eric Young (eay@cryptsoft.com)"
|
||||
* The word 'cryptographic' can be left out if the rouines from the library
|
||||
* being used are not cryptographic related :-).
|
||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||
* the apps directory (application code) you must include an acknowledgement:
|
||||
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* The licence and distribution terms for any publically available version or
|
||||
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
||||
* copied and put under another distribution licence
|
||||
* [including the GNU Public Licence.] */
|
||||
|
||||
#ifndef OPENSSL_HEADER_MD4_H
|
||||
#define OPENSSL_HEADER_MD4_H
|
||||
|
||||
#include <openssl/base.h>
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
/* MD4. */
|
||||
|
||||
/* MD4_CBLOCK is the block size of MD4. */
|
||||
#define MD4_CBLOCK 64
|
||||
|
||||
/* MD4_DIGEST_LENGTH is the length of an MD4 digest. */
|
||||
#define MD4_DIGEST_LENGTH 16
|
||||
|
||||
/* MD41_Init initialises |md4| and returns one. */
|
||||
OPENSSL_EXPORT int MD4_Init(MD4_CTX *md4);
|
||||
|
||||
/* MD4_Update adds |len| bytes from |data| to |md4| and returns one. */
|
||||
OPENSSL_EXPORT int MD4_Update(MD4_CTX *md4, const void *data, size_t len);
|
||||
|
||||
/* MD4_Final adds the final padding to |md4| and writes the resulting digest to
|
||||
* |md|, which must have at least |MD4_DIGEST_LENGTH| bytes of space. It
|
||||
* returns one. */
|
||||
OPENSSL_EXPORT int MD4_Final(uint8_t *md, MD4_CTX *md4);
|
||||
|
||||
/* MD4 writes the digest of |len| bytes from |data| to |out| and returns |out|.
|
||||
* There must be at least |MD4_DIGEST_LENGTH| bytes of space in |out|. */
|
||||
OPENSSL_EXPORT uint8_t *MD4(const uint8_t *data, size_t len, uint8_t *out);
|
||||
|
||||
/* MD4_Transform is a low-level function that performs a single, MD4 block
|
||||
* transformation using the state from |md4| and 64 bytes from |block|. */
|
||||
OPENSSL_EXPORT void MD4_Transform(MD4_CTX *md4, const uint8_t *block);
|
||||
|
||||
typedef struct md4_state_st {
|
||||
uint32_t A, B, C, D;
|
||||
uint32_t Nl, Nh;
|
||||
uint32_t data[16];
|
||||
unsigned int num;
|
||||
} MD4_CTX;
|
||||
|
||||
|
||||
#if defined(__cplusplus)
|
||||
} /* extern C */
|
||||
#endif
|
||||
|
||||
#endif /* OPENSSL_HEADER_MD4_H */
|
||||
@@ -72,7 +72,7 @@ extern "C" {
|
||||
/* MD5_DIGEST_LENGTH is the length of an MD5 digest. */
|
||||
#define MD5_DIGEST_LENGTH 16
|
||||
|
||||
/* MD51_Init initialises |md5| and returns 1. */
|
||||
/* MD51_Init initialises |md5| and returns one. */
|
||||
OPENSSL_EXPORT int MD5_Init(MD5_CTX *md5);
|
||||
|
||||
/* MD5_Update adds |len| bytes from |data| to |md5| and returns one. */
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
#define OPENSSL_NO_JPAKE
|
||||
#define OPENSSL_NO_KRB5
|
||||
#define OPENSSL_NO_MD2
|
||||
#define OPENSSL_NO_MD4
|
||||
#define OPENSSL_NO_MDC2
|
||||
#define OPENSSL_NO_OCSP
|
||||
#define OPENSSL_NO_RC2
|
||||
|
||||
Reference in New Issue
Block a user