generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New Configure option --openssldir to replace ssldir.pl.

Browse Source
This commit is contained in:
Ulf Möller 1999-04-24 23:01:36 +00:00
parent 462ba4f6b6
commit b0b7b1c5ae
5 changed files with 14 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -5,6 +5,8 @@
Changes between 0.9.2b and 0.9.3
*) New Configure options --prefix=DIR and --openssldir=DIR.
*) Complete rewrite of the error code script(s). It is all now handled
by one script at the top level which handles error code gathering,
header rewriting and C source file generation. It should be much better

5
apps/Makefile.ssl
View File

@ -8,6 +8,7 @@ CC= cc
INCLUDES= -I../include
CFLAG= -g -static
INSTALLTOP= /usr/local/ssl
OPENSSLDIR= /usr/local/ssl
MAKE= make -f Makefile.ssl
MAKEDEPEND= $(TOP)/util/domd $(TOP)
MAKEFILE= Makefile.ssl
@ -93,8 +94,8 @@ install:
cp $$i $(INSTALLTOP)/bin/$$i; \
chmod 755 $(INSTALLTOP)/bin/$$i ); \
done; \
cp openssl.cnf $(INSTALLTOP)/lib; \
chmod 644 $(INSTALLTOP)/lib/openssl.cnf
cp openssl.cnf $(OPENSSLDIR)/lib; \
chmod 644 $(OPENSSLDIR)/lib/openssl.cnf
tags:
ctags $(SRC)

22
crypto/cryptlib.h
View File

@ -66,29 +66,17 @@
extern "C" {
#endif
/* #ifdef FLAT_INC */
#include <openssl/e_os.h>
#include <openssl/crypto.h>
#include <openssl/buffer.h>
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/opensslconf.h>
/*
#else
#include "../e_os.h"
#include <openssl/crypto.h>
#include "buffer/buffer.h"
#include "bio/bio.h"
#include "err/err.h"
#endif
*/
#define X509_CERT_AREA "/usr/local/ssl"
#define X509_CERT_DIR "/usr/local/ssl/certs"
#define X509_CERT_FILE "/usr/local/ssl/cert.pem"
#define X509_PRIVATE_DIR "/usr/local/ssl/private"
#define X509_CERT_AREA OPENSSLDIR
#define X509_CERT_DIR OPENSSLDIR "/certs"
#define X509_CERT_FILE OPENSSLDIR "/cert.pem"
#define X509_PRIVATE_DIR OPENSSLDIR "/private"
#define X509_CERT_DIR_EVP "SSL_CERT_DIR"
#define X509_CERT_FILE_EVP "SSL_CERT_FILE"

4
crypto/opensslconf.h.in
View File

@ -1,6 +1,10 @@
/* crypto/opensslconf.h */
/* WARNING: This file is autogenerated by Configure */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define OPENSSLDIR "/usr/local/ssl"
#endif
#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
#define IDEA_INT unsigned int
#endif

52
util/ssldir.pl
View File

@ -1,52 +0,0 @@
#!/usr/local/bin/perl
$#ARGV == 0 || die "usage: ssldir.pl /new/path\n";
@files=('crypto/cryptlib.h',
'Makefile.ssl',
'tools/c_rehash',
'util/mk1mf.pl',
);
%cryptlib=(
'\sX509_CERT_AREA\s',"#define X509_CERT_AREA\t\t".'"%s"',
'\sX509_CERT_DIR\s', "#define X509_CERT_DIR\t\t".'"%s/certs"',
'\sX509_CERT_FILE\s', "#define X509_CERT_FILE\t\t".'"%s/cert.pem"',
'\sX509_PRIVATE_DIR\s',"#define X509_PRIVATE_DIR\t".'"%s/private"',
);
%Makefile_ssl=(
'^INSTALLTOP=','INSTALLTOP=%s',
);
%c_rehash=(
'^DIR=', 'DIR=%s',
);
%mk1mf=(
'^\$INSTALLTOP=','$INSTALLTOP="%s";',
);
&dofile("crypto/cryptlib.h",$ARGV[0],%cryptlib);
&dofile("Makefile.ssl",$ARGV[0],%Makefile_ssl);
&dofile("tools/c_rehash",$ARGV[0],%c_rehash);
&dofile("util/mk1mf.pl",$ARGV[0],%mk1mf);
sub dofile
{
($f,$p,%m)=@_;
open(IN,"<$f") || die "unable to open $f:$!\n";
@a=<IN>;
close(IN);
foreach $k (keys %m)
{
grep(/$k/ && ($_=sprintf($m{$k}."\n",$p)),@a);
}
($ff=$f) =~ s/\..*$//;
open(OUT,">$ff.new") || die "unable to open $f:$!\n";
print OUT @a;
close(OUT);
rename($f,"$ff.bak") || die "unable to rename $f\n";
rename("$ff.new",$f) || die "unable to rename $ff.new\n";
}