summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cryptlib/Include/openssl/opensslconf.h3
-rw-r--r--Cryptlib/OpenSSL/Makefile2
-rw-r--r--Cryptlib/OpenSSL/crypto/md4/md4_dgst.c147
-rw-r--r--Cryptlib/OpenSSL/crypto/md4/md4_locl.h60
-rw-r--r--Cryptlib/OpenSSL/crypto/md4/md4_one.c47
-rwxr-xr-xCryptlib/OpenSSL/update.sh1
-rw-r--r--Cryptlib/opensslconf-diff.patch14
-rwxr-xr-xCryptlib/update.sh1
8 files changed, 18 insertions, 257 deletions
diff --git a/Cryptlib/Include/openssl/opensslconf.h b/Cryptlib/Include/openssl/opensslconf.h
index 1917d7ab..68a26036 100644
--- a/Cryptlib/Include/openssl/opensslconf.h
+++ b/Cryptlib/Include/openssl/opensslconf.h
@@ -59,6 +59,9 @@ extern "C" {
#ifndef OPENSSL_NO_MD2
# define OPENSSL_NO_MD2
#endif
+#ifndef OPENSSL_NO_MD4
+# define OPENSSL_NO_MD4
+#endif
#ifndef OPENSSL_NO_MDC2
# define OPENSSL_NO_MDC2
#endif
diff --git a/Cryptlib/OpenSSL/Makefile b/Cryptlib/OpenSSL/Makefile
index 860aaadb..363a537e 100644
--- a/Cryptlib/OpenSSL/Makefile
+++ b/Cryptlib/OpenSSL/Makefile
@@ -283,8 +283,6 @@ OBJS = crypto/bio/b_print.o \
crypto/kdf/tls1_prf.o \
crypto/lhash/lh_stats.o \
crypto/lhash/lhash.o \
- crypto/md4/md4_dgst.o \
- crypto/md4/md4_one.o \
crypto/md5/md5_dgst.o \
crypto/md5/md5_one.o \
crypto/mem.o \
diff --git a/Cryptlib/OpenSSL/crypto/md4/md4_dgst.c b/Cryptlib/OpenSSL/crypto/md4/md4_dgst.c
deleted file mode 100644
index 53196186..00000000
--- a/Cryptlib/OpenSSL/crypto/md4/md4_dgst.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License"). You may not use
- * this file except in compliance with the License. You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#include <stdio.h>
-#include <openssl/opensslv.h>
-#include "md4_locl.h"
-
-/*
- * Implemented from RFC1186 The MD4 Message-Digest Algorithm
- */
-
-#define INIT_DATA_A (unsigned long)0x67452301L
-#define INIT_DATA_B (unsigned long)0xefcdab89L
-#define INIT_DATA_C (unsigned long)0x98badcfeL
-#define INIT_DATA_D (unsigned long)0x10325476L
-
-int MD4_Init(MD4_CTX *c)
-{
- memset(c, 0, sizeof(*c));
- c->A = INIT_DATA_A;
- c->B = INIT_DATA_B;
- c->C = INIT_DATA_C;
- c->D = INIT_DATA_D;
- return 1;
-}
-
-#ifndef md4_block_data_order
-# ifdef X
-# undef X
-# endif
-void md4_block_data_order(MD4_CTX *c, const void *data_, size_t num)
-{
- const unsigned char *data = data_;
- register unsigned MD32_REG_T A, B, C, D, l;
-# ifndef MD32_XARRAY
- /* See comment in crypto/sha/sha_locl.h for details. */
- unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
- XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
-# define X(i) XX##i
-# else
- MD4_LONG XX[MD4_LBLOCK];
-# define X(i) XX[i]
-# endif
-
- A = c->A;
- B = c->B;
- C = c->C;
- D = c->D;
-
- for (; num--;) {
- (void)HOST_c2l(data, l);
- X(0) = l;
- (void)HOST_c2l(data, l);
- X(1) = l;
- /* Round 0 */
- R0(A, B, C, D, X(0), 3, 0);
- (void)HOST_c2l(data, l);
- X(2) = l;
- R0(D, A, B, C, X(1), 7, 0);
- (void)HOST_c2l(data, l);
- X(3) = l;
- R0(C, D, A, B, X(2), 11, 0);
- (void)HOST_c2l(data, l);
- X(4) = l;
- R0(B, C, D, A, X(3), 19, 0);
- (void)HOST_c2l(data, l);
- X(5) = l;
- R0(A, B, C, D, X(4), 3, 0);
- (void)HOST_c2l(data, l);
- X(6) = l;
- R0(D, A, B, C, X(5), 7, 0);
- (void)HOST_c2l(data, l);
- X(7) = l;
- R0(C, D, A, B, X(6), 11, 0);
- (void)HOST_c2l(data, l);
- X(8) = l;
- R0(B, C, D, A, X(7), 19, 0);
- (void)HOST_c2l(data, l);
- X(9) = l;
- R0(A, B, C, D, X(8), 3, 0);
- (void)HOST_c2l(data, l);
- X(10) = l;
- R0(D, A, B, C, X(9), 7, 0);
- (void)HOST_c2l(data, l);
- X(11) = l;
- R0(C, D, A, B, X(10), 11, 0);
- (void)HOST_c2l(data, l);
- X(12) = l;
- R0(B, C, D, A, X(11), 19, 0);
- (void)HOST_c2l(data, l);
- X(13) = l;
- R0(A, B, C, D, X(12), 3, 0);
- (void)HOST_c2l(data, l);
- X(14) = l;
- R0(D, A, B, C, X(13), 7, 0);
- (void)HOST_c2l(data, l);
- X(15) = l;
- R0(C, D, A, B, X(14), 11, 0);
- R0(B, C, D, A, X(15), 19, 0);
- /* Round 1 */
- R1(A, B, C, D, X(0), 3, 0x5A827999L);
- R1(D, A, B, C, X(4), 5, 0x5A827999L);
- R1(C, D, A, B, X(8), 9, 0x5A827999L);
- R1(B, C, D, A, X(12), 13, 0x5A827999L);
- R1(A, B, C, D, X(1), 3, 0x5A827999L);
- R1(D, A, B, C, X(5), 5, 0x5A827999L);
- R1(C, D, A, B, X(9), 9, 0x5A827999L);
- R1(B, C, D, A, X(13), 13, 0x5A827999L);
- R1(A, B, C, D, X(2), 3, 0x5A827999L);
- R1(D, A, B, C, X(6), 5, 0x5A827999L);
- R1(C, D, A, B, X(10), 9, 0x5A827999L);
- R1(B, C, D, A, X(14), 13, 0x5A827999L);
- R1(A, B, C, D, X(3), 3, 0x5A827999L);
- R1(D, A, B, C, X(7), 5, 0x5A827999L);
- R1(C, D, A, B, X(11), 9, 0x5A827999L);
- R1(B, C, D, A, X(15), 13, 0x5A827999L);
- /* Round 2 */
- R2(A, B, C, D, X(0), 3, 0x6ED9EBA1L);
- R2(D, A, B, C, X(8), 9, 0x6ED9EBA1L);
- R2(C, D, A, B, X(4), 11, 0x6ED9EBA1L);
- R2(B, C, D, A, X(12), 15, 0x6ED9EBA1L);
- R2(A, B, C, D, X(2), 3, 0x6ED9EBA1L);
- R2(D, A, B, C, X(10), 9, 0x6ED9EBA1L);
- R2(C, D, A, B, X(6), 11, 0x6ED9EBA1L);
- R2(B, C, D, A, X(14), 15, 0x6ED9EBA1L);
- R2(A, B, C, D, X(1), 3, 0x6ED9EBA1L);
- R2(D, A, B, C, X(9), 9, 0x6ED9EBA1L);
- R2(C, D, A, B, X(5), 11, 0x6ED9EBA1L);
- R2(B, C, D, A, X(13), 15, 0x6ED9EBA1L);
- R2(A, B, C, D, X(3), 3, 0x6ED9EBA1L);
- R2(D, A, B, C, X(11), 9, 0x6ED9EBA1L);
- R2(C, D, A, B, X(7), 11, 0x6ED9EBA1L);
- R2(B, C, D, A, X(15), 15, 0x6ED9EBA1L);
-
- A = c->A += A;
- B = c->B += B;
- C = c->C += C;
- D = c->D += D;
- }
-}
-#endif
diff --git a/Cryptlib/OpenSSL/crypto/md4/md4_locl.h b/Cryptlib/OpenSSL/crypto/md4/md4_locl.h
deleted file mode 100644
index 6aec5562..00000000
--- a/Cryptlib/OpenSSL/crypto/md4/md4_locl.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License"). You may not use
- * this file except in compliance with the License. You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <openssl/opensslconf.h>
-#include <openssl/md4.h>
-
-void md4_block_data_order(MD4_CTX *c, const void *p, size_t num);
-
-#define DATA_ORDER_IS_LITTLE_ENDIAN
-
-#define HASH_LONG MD4_LONG
-#define HASH_CTX MD4_CTX
-#define HASH_CBLOCK MD4_CBLOCK
-#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 "internal/md32_common.h"
-
-/*-
-#define F(x,y,z) (((x) & (y)) | ((~(x)) & (z)))
-#define G(x,y,z) (((x) & (y)) | ((x) & ((z))) | ((y) & ((z))))
-*/
-
-/*
- * 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); };
diff --git a/Cryptlib/OpenSSL/crypto/md4/md4_one.c b/Cryptlib/OpenSSL/crypto/md4/md4_one.c
deleted file mode 100644
index 9f0989fa..00000000
--- a/Cryptlib/OpenSSL/crypto/md4/md4_one.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License"). You may not use
- * this file except in compliance with the License. You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <openssl/md4.h>
-#include <openssl/crypto.h>
-
-#ifdef CHARSET_EBCDIC
-# include <openssl/ebcdic.h>
-#endif
-
-unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md)
-{
- MD4_CTX c;
- static unsigned char m[MD4_DIGEST_LENGTH];
-
- if (md == NULL)
- md = m;
- if (!MD4_Init(&c))
- return NULL;
-#ifndef CHARSET_EBCDIC
- MD4_Update(&c, d, n);
-#else
- {
- char temp[1024];
- unsigned long chunk;
-
- while (n > 0) {
- chunk = (n > sizeof(temp)) ? sizeof(temp) : n;
- ebcdic2ascii(temp, d, chunk);
- MD4_Update(&c, temp, chunk);
- n -= chunk;
- d += chunk;
- }
- }
-#endif
- MD4_Final(md, &c);
- OPENSSL_cleanse(&c, sizeof(c)); /* security consideration */
- return (md);
-}
diff --git a/Cryptlib/OpenSSL/update.sh b/Cryptlib/OpenSSL/update.sh
index 8a3bfbec..b14300d9 100755
--- a/Cryptlib/OpenSSL/update.sh
+++ b/Cryptlib/OpenSSL/update.sh
@@ -54,7 +54,6 @@ SUBDIRS="
hmac
kdf
lhash
- md4
md5
modes
objects
diff --git a/Cryptlib/opensslconf-diff.patch b/Cryptlib/opensslconf-diff.patch
new file mode 100644
index 00000000..76caa2c1
--- /dev/null
+++ b/Cryptlib/opensslconf-diff.patch
@@ -0,0 +1,14 @@
+diff --git a/Cryptlib/Include/openssl/opensslconf.h b/Cryptlib/Include/openssl/opensslconf.h
+index 1917d7a..68a2603 100644
+--- a/Cryptlib/Include/openssl/opensslconf.h
++++ b/Cryptlib/Include/openssl/opensslconf.h
+@@ -59,6 +59,9 @@ extern "C" {
+ #ifndef OPENSSL_NO_MD2
+ # define OPENSSL_NO_MD2
+ #endif
++#ifndef OPENSSL_NO_MD4
++# define OPENSSL_NO_MD4
++#endif
+ #ifndef OPENSSL_NO_MDC2
+ # define OPENSSL_NO_MDC2
+ #endif
diff --git a/Cryptlib/update.sh b/Cryptlib/update.sh
index db0483ee..b29f11ce 100755
--- a/Cryptlib/update.sh
+++ b/Cryptlib/update.sh
@@ -35,3 +35,4 @@ cp $DIR/CryptoPkg/Library/Include/internal/dso_conf.h Include/internal/
cp $DIR/CryptoPkg/Library/Include/openssl/opensslconf.h Include/openssl/
patch -p2 <Cryptlib.diff
+patch -p2 <opensslconf-diff.patch
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-17 13:25:52 +0000