Down below, as discussed, a patch for getting rid of ctx_size.c and
pem.org follows. The Configure script obviously should be cleaned up
if we do this. The new pem.h will differ from the existing pem.org as
follows (remember that HEADER_ENVELOPE_H is always defined here
because of a previous #include, and that the dummy structure
definitions anyway could fail on some systems because they don't
necessary have the alignment needed for the actual structures):
--- pem.org Mon Mar 8 23:46:54 1999
+++ pem.h Sun Apr 11 05:18:19 1999
@@ -121,36 +121,6 @@
#define PEM_STRING_SSL_SESSION "SSL SESSION PARAMETERS"
#define PEM_STRING_DSAPARAMS "DSA PARAMETERS"
-#ifndef HEADER_ENVELOPE_H
-
-#define EVP_ENCODE_CTX_SIZE 92
-#define EVP_MD_SIZE 48
-#define EVP_MD_CTX_SIZE 152
-#define EVP_CIPHER_SIZE 28
-#define EVP_CIPHER_CTX_SIZE 4212
-#define EVP_MAX_MD_SIZE 20
-
-typedef struct evp_encode_ctx_st
- {
- char data[EVP_ENCODE_CTX_SIZE];
- } EVP_ENCODE_CTX;
-
-typedef struct env_md_ctx_st
- {
- char data[EVP_MD_CTX_SIZE];
- } EVP_MD_CTX;
-
-typedef struct evp_cipher_st
- {
- char data[EVP_CIPHER_SIZE];
- } EVP_CIPHER;
-
-typedef struct evp_cipher_ctx_st
- {
- char data[EVP_CIPHER_CTX_SIZE];
- } EVP_CIPHER_CTX;
-#endif
-
typedef struct PEM_Encode_Seal_st
{
Index: Configure
===================================================================
RCS file: /e/openssl/cvs//openssl/Configure,v
retrieving revision 1.35
diff -u -r1.35 Configure
--- Configure 1999/04/09 16:25:25 1.35
+++ Configure 1999/04/11 03:40:53
@@ -236,9 +236,9 @@
# Miscellaneous hacks: this is designed to allow environments where the "one
# makefile" option does not auto build all files.
-# The first six fields are the hard coded versions of the stuff generated by
-# ctx_size for pem.h: that is EVP_ENCODE_CTX_SIZE, EVP_MD_SIZE EVP_MD_CTX_SIZE,
-# EVP_CIPHER_SIZE, EVP_CIPHER_CTX_SIZE and EVP_MAX_MD_SIZE respectively.
+## # The first six fields are the hard coded versions of the stuff generated by
+## # ctx_size for pem.h: that is EVP_ENCODE_CTX_SIZE, EVP_MD_SIZE EVP_MD_CTX_SIZE,
+## # EVP_CIPHER_SIZE, EVP_CIPHER_CTX_SIZE and EVP_MAX_MD_SIZE respectively.
# If the seventh field is 1 then auto generate
# crypto/date.h
# Need to add Win16 and others here.
@@ -636,12 +636,12 @@
$max_md_size, $date_fix) =
split(/\s*:\s*/,$misc_table{$target} . ":", -1);
-#print "EVP_ENCODE_CTX_SIZE $enc_ctx\n";
-#print "EVP_MD_SIZE $md_size\n";
-#print "EVP_MD_CTX_SIZE $md_ctx_size\n";
-#print "EVP_CIPHER_SIZE $cipher_size\n";
-#print "EVP_CIPHER_CTX_SIZE $cipher_ctx_size\n";
-#print "EVP_MAX_MD_SIZE $max_md_size\n";
+## #print "EVP_ENCODE_CTX_SIZE $enc_ctx\n";
+## #print "EVP_MD_SIZE $md_size\n";
+## #print "EVP_MD_CTX_SIZE $md_ctx_size\n";
+## #print "EVP_CIPHER_SIZE $cipher_size\n";
+## #print "EVP_CIPHER_CTX_SIZE $cipher_ctx_size\n";
+## #print "EVP_MAX_MD_SIZE $max_md_size\n";
#printf "Date fix: %s\n", $date_fix ? "Yes" : "No";
# Fix the date
@@ -652,23 +652,23 @@
close(OUT);
}
-open (IN, "crypto/pem/pem.org") || die "Can't open crypto/pem/pem.org";
-open (OUT, ">crypto/pem/pem.h") || die "Can't create crypto/pem/pem.h";
-
-# Now fix up pem.h
-while(<IN>) {
- chop;
- s/^(#define EVP_ENCODE_CTX_SIZE).*$/$1 $enc_ctx/;
- s/^(#define EVP_MD_SIZE).*$/$1 $md_size/;
- s/^(#define EVP_MD_CTX_SIZE).*$/$1 $md_ctx_size/;
- s/^(#define EVP_CIPHER_SIZE).*$/$1 $cipher_size/;
- s/^(#define EVP_CIPHER_CTX_SIZE).*$/$1 $cipher_ctx_size/;
- s/^(#define EVP_MAX_MD_SIZE).*$/$1 $max_md_size/;
- print OUT "$_\n";
-}
-
-close (IN);
-close (OUT);
+## open (IN, "crypto/pem/pem.org") || die "Can't open crypto/pem/pem.org";
+## open (OUT, ">crypto/pem/pem.h") || die "Can't create crypto/pem/pem.h";
+##
+## # Now fix up pem.h
+## while(<IN>) {
+## chop;
+## s/^(#define EVP_ENCODE_CTX_SIZE).*$/$1 $enc_ctx/;
+## s/^(#define EVP_MD_SIZE).*$/$1 $md_size/;
+## s/^(#define EVP_MD_CTX_SIZE).*$/$1 $md_ctx_size/;
+## s/^(#define EVP_CIPHER_SIZE).*$/$1 $cipher_size/;
+## s/^(#define EVP_CIPHER_CTX_SIZE).*$/$1 $cipher_ctx_size/;
+## s/^(#define EVP_MAX_MD_SIZE).*$/$1 $max_md_size/;
+## print OUT "$_\n";
+## }
+##
+## close (IN);
+## close (OUT);
}
Index: crypto/pem/Makefile.ssl
===================================================================
RCS file: /e/openssl/cvs//openssl/crypto/pem/Makefile.ssl,v
retrieving revision 1.11
diff -u -r1.11 Makefile.ssl
--- crypto/pem/Makefile.ssl 1999/04/01 12:34:09 1.11
+++ crypto/pem/Makefile.ssl 1999/04/11 03:40:55
@@ -21,8 +21,6 @@
TEST=
APPS=
-CTX_SIZE= ctx_size
-
LIB=$(TOP)/libcrypto.a
LIBSRC= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c $(ERRC).c
@@ -37,16 +35,8 @@
top:
(cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
-
-all: pem.h lib
-
-pem.h: $(CTX_SIZE) pem.org
- ./$(CTX_SIZE) <pem.org >pem.new
- if [ -f pem.h ]; then mv -f pem.h pem.old; fi
- mv -f pem.new pem.h
-$(CTX_SIZE): $(CTX_SIZE).o
- $(CC) $(CFLAGS) -o $(CTX_SIZE) $(CTX_SIZE).o
+all: lib
lib: $(LIBOBJ)
$(AR) $(LIB) $(LIBOBJ)
@@ -78,14 +68,14 @@
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
- $(MAKEDEPEND) $(INCLUDES) $(CTX_SIZE).c $(LIBSRC)
+ $(MAKEDEPEND) $(INCLUDES) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE)
>Makefile.new
mv -f Makefile.new $(MAKEFILE)
clean:
- rm -f $(CTX_SIZE) *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+ rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
errors: $(ERRC).c
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [EMAIL PROTECTED]
Automated List Manager [EMAIL PROTECTED]
