remove md4.c from patch
This commit is contained in:
Mark Andrews
@@ -408,138 +408,6 @@ diff -u /dev/null openssl/README.pkcs11:1.4
|
||||
+
|
||||
+Latest version should be always available on http://blogs.sun.com/janp.
|
||||
+
|
||||
Index: openssl/apps/md4.c
|
||||
diff -u /dev/null openssl/apps/md4.c:1.2
|
||||
--- /dev/null Wed Sep 2 11:37:22 2009
|
||||
+++ openssl/apps/md4.c Fri Aug 29 15:36:16 2008
|
||||
@@ -0,0 +1,127 @@
|
||||
+/* crypto/md4/md4.c */
|
||||
+/* 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 <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <openssl/md4.h>
|
||||
+
|
||||
+#define BUFSIZE 1024*16
|
||||
+
|
||||
+void do_fp(FILE *f);
|
||||
+void pt(unsigned char *md);
|
||||
+#if !defined(_OSD_POSIX) && !defined(__DJGPP__)
|
||||
+int read(int, void *, unsigned int);
|
||||
+#endif
|
||||
+
|
||||
+int main(int argc, char **argv)
|
||||
+ {
|
||||
+ int i,err=0;
|
||||
+ FILE *IN;
|
||||
+
|
||||
+ if (argc == 1)
|
||||
+ {
|
||||
+ do_fp(stdin);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ for (i=1; i<argc; i++)
|
||||
+ {
|
||||
+ IN=fopen(argv[i],"r");
|
||||
+ if (IN == NULL)
|
||||
+ {
|
||||
+ perror(argv[i]);
|
||||
+ err++;
|
||||
+ continue;
|
||||
+ }
|
||||
+ printf("MD4(%s)= ",argv[i]);
|
||||
+ do_fp(IN);
|
||||
+ fclose(IN);
|
||||
+ }
|
||||
+ }
|
||||
+ exit(err);
|
||||
+ }
|
||||
+
|
||||
+void do_fp(FILE *f)
|
||||
+ {
|
||||
+ MD4_CTX c;
|
||||
+ unsigned char md[MD4_DIGEST_LENGTH];
|
||||
+ int fd;
|
||||
+ int i;
|
||||
+ static unsigned char buf[BUFSIZE];
|
||||
+
|
||||
+ fd=fileno(f);
|
||||
+ MD4_Init(&c);
|
||||
+ for (;;)
|
||||
+ {
|
||||
+ i=read(fd,buf,sizeof buf);
|
||||
+ if (i <= 0) break;
|
||||
+ MD4_Update(&c,buf,(unsigned long)i);
|
||||
+ }
|
||||
+ MD4_Final(&(md[0]),&c);
|
||||
+ pt(md);
|
||||
+ }
|
||||
+
|
||||
+void pt(unsigned char *md)
|
||||
+ {
|
||||
+ int i;
|
||||
+
|
||||
+ for (i=0; i<MD4_DIGEST_LENGTH; i++)
|
||||
+ printf("%02x",md[i]);
|
||||
+ printf("\n");
|
||||
+ }
|
||||
+
|
||||
Index: openssl/crypto/opensslconf.h
|
||||
diff -u openssl/crypto/opensslconf.h:1.1.2.1 openssl/crypto/opensslconf.h:1.4
|
||||
--- openssl/crypto/opensslconf.h:1.1.2.1 Mon Sep 15 15:27:21 2008
|
||||
@@ -11078,7 +10946,7 @@ diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1
|
||||
+++ openssl/crypto/engine/pkcs11.h Wed Oct 24 23:27:09 2007
|
||||
@@ -0,0 +1,299 @@
|
||||
+/* pkcs11.h include file for PKCS #11. */
|
||||
+/* $Revision: 1.2 $ */
|
||||
+/* $Revision: 1.3 $ */
|
||||
+
|
||||
+/* License to copy and use this software is granted provided that it is
|
||||
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
|
||||
@@ -11382,7 +11250,7 @@ diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1
|
||||
+++ openssl/crypto/engine/pkcs11f.h Wed Oct 24 23:27:09 2007
|
||||
@@ -0,0 +1,912 @@
|
||||
+/* pkcs11f.h include file for PKCS #11. */
|
||||
+/* $Revision: 1.2 $ */
|
||||
+/* $Revision: 1.3 $ */
|
||||
+
|
||||
+/* License to copy and use this software is granted provided that it is
|
||||
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
|
||||
@@ -12299,7 +12167,7 @@ diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2
|
||||
+++ openssl/crypto/engine/pkcs11t.h Sat Aug 30 11:58:07 2008
|
||||
@@ -0,0 +1,1885 @@
|
||||
+/* pkcs11t.h include file for PKCS #11. */
|
||||
+/* $Revision: 1.2 $ */
|
||||
+/* $Revision: 1.3 $ */
|
||||
+
|
||||
+/* License to copy and use this software is granted provided that it is
|
||||
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
|
||||
|
||||
Reference in New Issue
Block a user