Compare commits
	
		
			2 Commits
		
	
	
		
			OpenSSL-fi
			...
			OpenSSL_0_
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					b6079a7835 | ||
| 
						 | 
					afa0598f06 | 
@@ -1,4 +1,4 @@
 | 
			
		||||
openssl.pc
 | 
			
		||||
Makefile.ssl
 | 
			
		||||
MINFO
 | 
			
		||||
makefile.one
 | 
			
		||||
tmp
 | 
			
		||||
@@ -7,12 +7,5 @@ outinc
 | 
			
		||||
rehash.time
 | 
			
		||||
testlog
 | 
			
		||||
make.log
 | 
			
		||||
maketest.log
 | 
			
		||||
cctest
 | 
			
		||||
cctest.c
 | 
			
		||||
cctest.a
 | 
			
		||||
libcrypto.so.*
 | 
			
		||||
libssl.so.*
 | 
			
		||||
*.flc
 | 
			
		||||
semantic.cache
 | 
			
		||||
Makefile
 | 
			
		||||
 
 | 
			
		||||
@@ -1,163 +0,0 @@
 | 
			
		||||
This file, together with ChangeLog.0_9_7-stable_not-in-head_FIPS,
 | 
			
		||||
provides a collection of those CVS change log entries for the
 | 
			
		||||
0.9.7 branch (OpenSSL_0_9_7-stable) that do not appear similarly in
 | 
			
		||||
0.9.8-dev (CVS head).
 | 
			
		||||
    
 | 
			
		||||
ChangeLog.0_9_7-stable_not-in-head_FIPS  -  "FIPS" related changes
 | 
			
		||||
ChangeLog.0_9_7-stable_not-in-head       -  everything else
 | 
			
		||||
 | 
			
		||||
Some obvious false positives have been eliminated: e.g., we do not
 | 
			
		||||
care about a simple "make update"; and we don't care about changes
 | 
			
		||||
identified to the 0.9.7 branch that were explicitly identified as
 | 
			
		||||
backports from head.
 | 
			
		||||
    
 | 
			
		||||
Eliminating all other entries (and finally this file and its
 | 
			
		||||
compantion), either as false positives or as things that should go
 | 
			
		||||
into 0.9.8, remains to be done.  Any additional changes to 0.9.7 that
 | 
			
		||||
are not immediately put into 0.9.8, but belong there as well, should
 | 
			
		||||
be added to the end of this file.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
2002-11-04 17:33  levitte
 | 
			
		||||
 | 
			
		||||
	Changed:
 | 
			
		||||
		Configure (1.314.2.38), "Exp", lines: +4 -2
 | 
			
		||||
 | 
			
		||||
	Return my normal debug targets to something not so extreme, and
 | 
			
		||||
	make the extreme ones special (or 'extreme', if you will :-)).
 | 
			
		||||
 | 
			
		||||
2002-12-16 19:17  appro
 | 
			
		||||
 | 
			
		||||
	Changed:
 | 
			
		||||
		crypto/bn/bn_lcl.h (1.23.2.3), "Exp", lines: +3 -0
 | 
			
		||||
		crypto/bn/bn_mul.c (1.28.2.4), "Exp", lines: +84 -445
 | 
			
		||||
 | 
			
		||||
	This is rollback to 0.9.6h bn_mul.c to address problem reported in
 | 
			
		||||
	RT#272.
 | 
			
		||||
 | 
			
		||||
2003-07-27 15:46  ben
 | 
			
		||||
 | 
			
		||||
	Changed:
 | 
			
		||||
		crypto/aes/aes.h (1.1.2.5), "Exp", lines: +3 -0
 | 
			
		||||
		crypto/aes/aes_cfb.c (1.1.2.4), "Exp", lines: +57 -0
 | 
			
		||||
 | 
			
		||||
	Add untested CFB-r mode. Will be tested soon.
 | 
			
		||||
 | 
			
		||||
2003-07-28 17:07  ben
 | 
			
		||||
 | 
			
		||||
	Changed:
 | 
			
		||||
		Makefile.org (1.154.2.69), "Exp", lines: +5 -1
 | 
			
		||||
		crypto/aes/aes.h (1.1.2.6), "Exp", lines: +3 -0
 | 
			
		||||
		crypto/aes/aes_cfb.c (1.1.2.5), "Exp", lines: +19 -0
 | 
			
		||||
		crypto/dsa/Makefile.ssl (1.49.2.6), "Exp", lines: +3 -2
 | 
			
		||||
		crypto/err/Makefile.ssl (1.48.2.4), "Exp", lines: +17 -16
 | 
			
		||||
		crypto/evp/e_aes.c (1.6.2.5), "Exp", lines: +8 -0
 | 
			
		||||
		crypto/evp/e_des.c (1.5.2.2), "Exp", lines: +1 -1
 | 
			
		||||
		crypto/evp/e_des3.c (1.8.2.3), "Exp", lines: +2 -2
 | 
			
		||||
		crypto/evp/evp.h (1.86.2.11), "Exp", lines: +28 -11
 | 
			
		||||
		crypto/evp/evp_locl.h (1.7.2.3), "Exp", lines: +2 -2
 | 
			
		||||
		crypto/objects/obj_dat.h (1.49.2.13), "Exp", lines: +10 -5
 | 
			
		||||
		crypto/objects/obj_mac.h (1.19.2.13), "Exp", lines: +5 -0
 | 
			
		||||
		crypto/objects/obj_mac.num (1.15.2.9), "Exp", lines: +1 -0
 | 
			
		||||
		crypto/objects/objects.txt (1.20.2.14), "Exp", lines: +4 -0
 | 
			
		||||
		fips/Makefile.ssl (1.1.2.3), "Exp", lines: +7 -0
 | 
			
		||||
		fips/aes/Makefile.ssl (1.1.2.2), "Exp", lines: +23 -1
 | 
			
		||||
		fips/aes/fips_aesavs.c (1.1.2.3), "Exp", lines: +9 -1
 | 
			
		||||
		test/Makefile.ssl (1.84.2.30), "Exp", lines: +101 -43
 | 
			
		||||
 | 
			
		||||
	Add support for partial CFB modes, make tests work, update
 | 
			
		||||
	dependencies.
 | 
			
		||||
 | 
			
		||||
2003-07-29 12:56  ben
 | 
			
		||||
 | 
			
		||||
	Changed:
 | 
			
		||||
		crypto/aes/aes_cfb.c (1.1.2.6), "Exp", lines: +9 -6
 | 
			
		||||
		crypto/evp/c_allc.c (1.8.2.3), "Exp", lines: +1 -0
 | 
			
		||||
		crypto/evp/evp_test.c (1.14.2.11), "Exp", lines: +17 -8
 | 
			
		||||
		crypto/evp/evptests.txt (1.9.2.2), "Exp", lines: +48 -1
 | 
			
		||||
 | 
			
		||||
	Working CFB1 and test vectors.
 | 
			
		||||
 | 
			
		||||
2003-07-29 15:24  ben
 | 
			
		||||
 | 
			
		||||
	Changed:
 | 
			
		||||
		crypto/evp/e_aes.c (1.6.2.6), "Exp", lines: +14 -0
 | 
			
		||||
		crypto/objects/obj_dat.h (1.49.2.14), "Exp", lines: +15 -5
 | 
			
		||||
		crypto/objects/obj_mac.h (1.19.2.14), "Exp", lines: +10 -0
 | 
			
		||||
		crypto/objects/obj_mac.num (1.15.2.10), "Exp", lines: +2 -0
 | 
			
		||||
		crypto/objects/objects.txt (1.20.2.15), "Exp", lines: +2 -0
 | 
			
		||||
		fips/aes/Makefile.ssl (1.1.2.3), "Exp", lines: +1 -1
 | 
			
		||||
		fips/aes/fips_aesavs.c (1.1.2.4), "Exp", lines: +34 -19
 | 
			
		||||
 | 
			
		||||
	The rest of the keysizes for CFB1, working AES AVS test for CFB1.
 | 
			
		||||
 | 
			
		||||
2003-07-29 19:05  ben
 | 
			
		||||
 | 
			
		||||
	Changed:
 | 
			
		||||
		crypto/aes/aes.h (1.1.2.7), "Exp", lines: +3 -0
 | 
			
		||||
		crypto/aes/aes_cfb.c (1.1.2.7), "Exp", lines: +14 -0
 | 
			
		||||
		crypto/evp/c_allc.c (1.8.2.4), "Exp", lines: +1 -0
 | 
			
		||||
		crypto/evp/e_aes.c (1.6.2.7), "Exp", lines: +4 -9
 | 
			
		||||
		crypto/evp/evptests.txt (1.9.2.3), "Exp", lines: +48 -0
 | 
			
		||||
		crypto/objects/obj_dat.h (1.49.2.15), "Exp", lines: +20 -5
 | 
			
		||||
		crypto/objects/obj_mac.h (1.19.2.15), "Exp", lines: +15 -0
 | 
			
		||||
		crypto/objects/obj_mac.num (1.15.2.11), "Exp", lines: +3 -0
 | 
			
		||||
		crypto/objects/objects.txt (1.20.2.16), "Exp", lines: +3 -0
 | 
			
		||||
		fips/aes/fips_aesavs.c (1.1.2.7), "Exp", lines: +11 -0
 | 
			
		||||
 | 
			
		||||
	AES CFB8.
 | 
			
		||||
 | 
			
		||||
2003-07-30 20:30  ben
 | 
			
		||||
 | 
			
		||||
	Changed:
 | 
			
		||||
		Makefile.org (1.154.2.70), "Exp", lines: +16 -5
 | 
			
		||||
		crypto/des/cfb_enc.c (1.7.2.1), "Exp", lines: +2 -1
 | 
			
		||||
		crypto/des/des_enc.c (1.11.2.2), "Exp", lines: +4 -0
 | 
			
		||||
		crypto/evp/e_aes.c (1.6.2.8), "Exp", lines: +7 -14
 | 
			
		||||
		crypto/evp/e_des.c (1.5.2.3), "Exp", lines: +37 -1
 | 
			
		||||
		crypto/evp/evp.h (1.86.2.12), "Exp", lines: +6 -0
 | 
			
		||||
		crypto/evp/evp_locl.h (1.7.2.4), "Exp", lines: +9 -0
 | 
			
		||||
		crypto/objects/obj_dat.h (1.49.2.16), "Exp", lines: +48 -23
 | 
			
		||||
		crypto/objects/obj_mac.h (1.19.2.16), "Exp", lines: +31 -6
 | 
			
		||||
		crypto/objects/obj_mac.num (1.15.2.12), "Exp", lines: +5 -0
 | 
			
		||||
		crypto/objects/objects.txt (1.20.2.17), "Exp", lines: +12 -6
 | 
			
		||||
		fips/Makefile.ssl (1.1.2.4), "Exp", lines: +8 -1
 | 
			
		||||
		fips/fips_make_sha1 (1.1.2.3), "Exp", lines: +3 -0
 | 
			
		||||
		fips/aes/Makefile.ssl (1.1.2.4), "Exp", lines: +1 -1
 | 
			
		||||
		fips/des/.cvsignore (1.1.2.1), "Exp", lines: +3 -0
 | 
			
		||||
		fips/des/Makefile.ssl (1.1.2.1), "Exp", lines: +96 -0
 | 
			
		||||
		fips/des/fingerprint.sha1 (1.1.2.1), "Exp", lines: +2 -0
 | 
			
		||||
		fips/des/fips_des_enc.c (1.1.2.1), "Exp", lines: +288 -0
 | 
			
		||||
		fips/des/fips_des_locl.h (1.1.2.1), "Exp", lines: +428 -0
 | 
			
		||||
		fips/des/fips_desmovs.c (1.1.2.1), "Exp", lines: +659 -0
 | 
			
		||||
 | 
			
		||||
	Whoops, forgot FIPS DES, also add EVPs for DES CFB1 and 8.
 | 
			
		||||
 | 
			
		||||
2003-08-01 12:25  ben
 | 
			
		||||
 | 
			
		||||
	Changed:
 | 
			
		||||
		crypto/des/cfb_enc.c (1.7.2.2), "Exp", lines: +45 -36
 | 
			
		||||
		crypto/evp/c_allc.c (1.8.2.5), "Exp", lines: +2 -0
 | 
			
		||||
		crypto/evp/e_des.c (1.5.2.4), "Exp", lines: +8 -3
 | 
			
		||||
		crypto/evp/evptests.txt (1.9.2.4), "Exp", lines: +6 -0
 | 
			
		||||
 | 
			
		||||
	Fix DES CFB-r.
 | 
			
		||||
 | 
			
		||||
2003-08-01 12:31  ben
 | 
			
		||||
 | 
			
		||||
	Changed:
 | 
			
		||||
		crypto/evp/evptests.txt (1.9.2.5), "Exp", lines: +4 -0
 | 
			
		||||
 | 
			
		||||
	DES CFB8 test.
 | 
			
		||||
 | 
			
		||||
2005-04-19 16:21  appro
 | 
			
		||||
 | 
			
		||||
	Changed:
 | 
			
		||||
		Configure (1.314.2.117), "Exp", lines: +24 -21
 | 
			
		||||
		Makefile.org (1.154.2.100), "Exp", lines: +1 -11
 | 
			
		||||
		TABLE (1.99.2.52), "Exp", lines: +20 -20
 | 
			
		||||
		apps/Makefile (1.1.4.15), "Exp", lines: +1 -1
 | 
			
		||||
		test/Makefile (1.1.4.12), "Exp", lines: +1 -1
 | 
			
		||||
 | 
			
		||||
	Enable shared link on HP-UX.
 | 
			
		||||
 | 
			
		||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										844
									
								
								FAQ
									
									
									
									
									
								
							
							
						
						
									
										844
									
								
								FAQ
									
									
									
									
									
								
							@@ -1,80 +1,20 @@
 | 
			
		||||
OpenSSL  -  Frequently Asked Questions
 | 
			
		||||
--------------------------------------
 | 
			
		||||
 | 
			
		||||
[MISC] Miscellaneous questions
 | 
			
		||||
 | 
			
		||||
* Which is the current version of OpenSSL?
 | 
			
		||||
* Where is the documentation?
 | 
			
		||||
* How can I contact the OpenSSL developers?
 | 
			
		||||
* Where can I get a compiled version of OpenSSL?
 | 
			
		||||
* Why aren't tools like 'autoconf' and 'libtool' used?
 | 
			
		||||
* What is an 'engine' version?
 | 
			
		||||
* How do I check the authenticity of the OpenSSL distribution?
 | 
			
		||||
 | 
			
		||||
[LEGAL] Legal questions
 | 
			
		||||
 | 
			
		||||
* Do I need patent licenses to use OpenSSL?
 | 
			
		||||
* Can I use OpenSSL with GPL software? 
 | 
			
		||||
 | 
			
		||||
[USER] Questions on using the OpenSSL applications
 | 
			
		||||
 | 
			
		||||
* Why do I get a "PRNG not seeded" error message?
 | 
			
		||||
* Why do I get an "unable to write 'random state'" error message?
 | 
			
		||||
* How do I create certificates or certificate requests?
 | 
			
		||||
* Why can't I create certificate requests?
 | 
			
		||||
* Why does <SSL program> fail with a certificate verify error?
 | 
			
		||||
* Why can I only use weak ciphers when I connect to a server using OpenSSL?
 | 
			
		||||
* How can I create DSA certificates?
 | 
			
		||||
* Why can't I make an SSL connection using a DSA certificate?
 | 
			
		||||
* How can I remove the passphrase on a private key?
 | 
			
		||||
* Why can't I use OpenSSL certificates with SSL client authentication?
 | 
			
		||||
* Why does my browser give a warning about a mismatched hostname?
 | 
			
		||||
* How do I install a CA certificate into a browser?
 | 
			
		||||
* Why is OpenSSL x509 DN output not conformant to RFC2253?
 | 
			
		||||
* What is a "128 bit certificate"? Can I create one with OpenSSL?
 | 
			
		||||
 | 
			
		||||
[BUILD] Questions about building and testing OpenSSL
 | 
			
		||||
 | 
			
		||||
* Why does the linker complain about undefined symbols?
 | 
			
		||||
* Why does the OpenSSL test fail with "bc: command not found"?
 | 
			
		||||
* Why does the OpenSSL test fail with "bc: 1 no implemented"?
 | 
			
		||||
* Why does the OpenSSL test fail with "bc: stack empty"?
 | 
			
		||||
* Why does the OpenSSL compilation fail on Alpha Tru64 Unix?
 | 
			
		||||
* Why does the OpenSSL compilation fail with "ar: command not found"?
 | 
			
		||||
* Why does the OpenSSL compilation fail on Win32 with VC++?
 | 
			
		||||
* What is special about OpenSSL on Redhat?
 | 
			
		||||
* Why does the OpenSSL compilation fail on MacOS X?
 | 
			
		||||
* Why does the OpenSSL test suite fail on MacOS X?
 | 
			
		||||
* Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]?
 | 
			
		||||
* Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"?
 | 
			
		||||
* Why does the OpenSSL test suite fail in sha512t on x86 CPU?
 | 
			
		||||
* Why does compiler fail to compile sha512.c?
 | 
			
		||||
* Test suite still fails, what to do?
 | 
			
		||||
 | 
			
		||||
[PROG] Questions about programming with OpenSSL
 | 
			
		||||
 | 
			
		||||
* Is OpenSSL thread-safe?
 | 
			
		||||
* I've compiled a program under Windows and it crashes: why?
 | 
			
		||||
* How do I read or write a DER encoded buffer using the ASN1 functions?
 | 
			
		||||
* OpenSSL uses DER but I need BER format: does OpenSSL support BER?
 | 
			
		||||
* I've tried using <M_some_evil_pkcs12_macro> and I get errors why?
 | 
			
		||||
* I've called <some function> and it fails, why?
 | 
			
		||||
* I just get a load of numbers for the error output, what do they mean?
 | 
			
		||||
* Why do I get errors about unknown algorithms?
 | 
			
		||||
* Why can't the OpenSSH configure script detect OpenSSL?
 | 
			
		||||
* Can I use OpenSSL's SSL library with non-blocking I/O?
 | 
			
		||||
* Why doesn't my server application receive a client certificate?
 | 
			
		||||
* Why does compilation fail due to an undefined symbol NID_uniqueIdentifier?
 | 
			
		||||
* I think I've detected a memory leak, is this a bug?
 | 
			
		||||
* Why do I get a "PRNG not seeded" error message?
 | 
			
		||||
* Why does the linker complain about undefined symbols?
 | 
			
		||||
* Where can I get a compiled version of OpenSSL?
 | 
			
		||||
 | 
			
		||||
===============================================================================
 | 
			
		||||
 | 
			
		||||
[MISC] ========================================================================
 | 
			
		||||
 | 
			
		||||
* Which is the current version of OpenSSL?
 | 
			
		||||
 | 
			
		||||
The current version is available from <URL: http://www.openssl.org>.
 | 
			
		||||
OpenSSL 0.9.8e was released on February 23rd, 2007.
 | 
			
		||||
OpenSSL 0.9.5 was released on February 28th, 2000.
 | 
			
		||||
 | 
			
		||||
In addition to the current stable release, you can also access daily
 | 
			
		||||
snapshots of the OpenSSL development version at <URL:
 | 
			
		||||
@@ -120,50 +60,6 @@ OpenSSL.  Information on the OpenSSL mailing lists is available from
 | 
			
		||||
<URL: http://www.openssl.org>.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Where can I get a compiled version of OpenSSL?
 | 
			
		||||
 | 
			
		||||
You can finder pointers to binary distributions in
 | 
			
		||||
http://www.openssl.org/related/binaries.html .
 | 
			
		||||
 | 
			
		||||
Some applications that use OpenSSL are distributed in binary form.
 | 
			
		||||
When using such an application, you don't need to install OpenSSL
 | 
			
		||||
yourself; the application will include the required parts (e.g. DLLs).
 | 
			
		||||
 | 
			
		||||
If you want to build OpenSSL on a Windows system and you don't have
 | 
			
		||||
a C compiler, read the "Mingw32" section of INSTALL.W32 for information
 | 
			
		||||
on how to obtain and install the free GNU C compiler.
 | 
			
		||||
 | 
			
		||||
A number of Linux and *BSD distributions include OpenSSL.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why aren't tools like 'autoconf' and 'libtool' used?
 | 
			
		||||
 | 
			
		||||
autoconf will probably be used in future OpenSSL versions. If it was
 | 
			
		||||
less Unix-centric, it might have been used much earlier.
 | 
			
		||||
 | 
			
		||||
* What is an 'engine' version?
 | 
			
		||||
 | 
			
		||||
With version 0.9.6 OpenSSL was extended to interface to external crypto
 | 
			
		||||
hardware. This was realized in a special release '0.9.6-engine'. With
 | 
			
		||||
version 0.9.7 the changes were merged into the main development line,
 | 
			
		||||
so that the special release is no longer necessary.
 | 
			
		||||
 | 
			
		||||
* How do I check the authenticity of the OpenSSL distribution?
 | 
			
		||||
 | 
			
		||||
We provide MD5 digests and ASC signatures of each tarball.
 | 
			
		||||
Use MD5 to check that a tarball from a mirror site is identical:
 | 
			
		||||
 | 
			
		||||
   md5sum TARBALL | awk '{print $1;}' | cmp - TARBALL.md5
 | 
			
		||||
 | 
			
		||||
You can check authenticity using pgp or gpg. You need the OpenSSL team
 | 
			
		||||
member public key used to sign it (download it from a key server, see a
 | 
			
		||||
list of keys at <URL: http://www.openssl.org/about/>). Then
 | 
			
		||||
just do:
 | 
			
		||||
 | 
			
		||||
   pgp TARBALL.asc
 | 
			
		||||
 | 
			
		||||
[LEGAL] =======================================================================
 | 
			
		||||
 | 
			
		||||
* Do I need patent licenses to use OpenSSL?
 | 
			
		||||
 | 
			
		||||
The patents section of the README file lists patents that may apply to
 | 
			
		||||
@@ -171,261 +67,42 @@ you if you want to use OpenSSL.  For information on intellectual
 | 
			
		||||
property rights, please consult a lawyer.  The OpenSSL team does not
 | 
			
		||||
offer legal advice.
 | 
			
		||||
 | 
			
		||||
You can configure OpenSSL so as not to use IDEA, MDC2 and RC5 by using
 | 
			
		||||
 ./config no-idea no-mdc2 no-rc5
 | 
			
		||||
You can configure OpenSSL so as not to use RC5 and IDEA by using
 | 
			
		||||
 ./config no-rc5 no-idea
 | 
			
		||||
 | 
			
		||||
Until the RSA patent expires, U.S. users may want to use
 | 
			
		||||
 ./config no-rc5 no-idea no-rsa
 | 
			
		||||
 | 
			
		||||
Please note that you will *not* be able to communicate with most of
 | 
			
		||||
the popular web browsers without RSA support.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Can I use OpenSSL with GPL software?
 | 
			
		||||
* Is OpenSSL thread-safe?
 | 
			
		||||
 | 
			
		||||
On many systems including the major Linux and BSD distributions, yes (the
 | 
			
		||||
GPL does not place restrictions on using libraries that are part of the
 | 
			
		||||
normal operating system distribution).
 | 
			
		||||
Yes.  On Windows and many Unix systems, OpenSSL automatically uses the
 | 
			
		||||
multi-threaded versions of the standard libraries.  If your platform
 | 
			
		||||
is not one of these, consult the INSTALL file.
 | 
			
		||||
 | 
			
		||||
On other systems, the situation is less clear. Some GPL software copyright
 | 
			
		||||
holders claim that you infringe on their rights if you use OpenSSL with
 | 
			
		||||
their software on operating systems that don't normally include OpenSSL.
 | 
			
		||||
Multi-threaded applications must provide two callback functions to
 | 
			
		||||
OpenSSL.  This is described in the threads(3) manpage.
 | 
			
		||||
 | 
			
		||||
If you develop open source software that uses OpenSSL, you may find it
 | 
			
		||||
useful to choose an other license than the GPL, or state explicitly that
 | 
			
		||||
"This program is released under the GPL with the additional exemption that
 | 
			
		||||
compiling, linking, and/or using OpenSSL is allowed."  If you are using
 | 
			
		||||
GPL software developed by others, you may want to ask the copyright holder
 | 
			
		||||
for permission to use their software with OpenSSL.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
[USER] ========================================================================
 | 
			
		||||
 | 
			
		||||
* Why do I get a "PRNG not seeded" error message?
 | 
			
		||||
 | 
			
		||||
Cryptographic software needs a source of unpredictable data to work
 | 
			
		||||
correctly.  Many open source operating systems provide a "randomness
 | 
			
		||||
device" (/dev/urandom or /dev/random) that serves this purpose.
 | 
			
		||||
All OpenSSL versions try to use /dev/urandom by default; starting with
 | 
			
		||||
version 0.9.7, OpenSSL also tries /dev/random if /dev/urandom is not
 | 
			
		||||
available.
 | 
			
		||||
device" that serves this purpose.  On other systems, applications have
 | 
			
		||||
to call the RAND_add() or RAND_seed() function with appropriate data
 | 
			
		||||
before generating keys or performing public key encryption.
 | 
			
		||||
 | 
			
		||||
Some broken applications do not do this.  As of version 0.9.5, the
 | 
			
		||||
OpenSSL functions that need randomness report an error if the random
 | 
			
		||||
number generator has not been seeded with at least 128 bits of
 | 
			
		||||
randomness.  If this error occurs, please contact the author of the
 | 
			
		||||
application you are using.  It is likely that it never worked
 | 
			
		||||
correctly.  OpenSSL 0.9.5 makes the error visible by refusing to
 | 
			
		||||
perform potentially insecure encryption.
 | 
			
		||||
 | 
			
		||||
On other systems, applications have to call the RAND_add() or
 | 
			
		||||
RAND_seed() function with appropriate data before generating keys or
 | 
			
		||||
performing public key encryption. (These functions initialize the
 | 
			
		||||
pseudo-random number generator, PRNG.)  Some broken applications do
 | 
			
		||||
not do this.  As of version 0.9.5, the OpenSSL functions that need
 | 
			
		||||
randomness report an error if the random number generator has not been
 | 
			
		||||
seeded with at least 128 bits of randomness.  If this error occurs and
 | 
			
		||||
is not discussed in the documentation of the application you are
 | 
			
		||||
using, please contact the author of that application; it is likely
 | 
			
		||||
that it never worked correctly.  OpenSSL 0.9.5 and later make the
 | 
			
		||||
error visible by refusing to perform potentially insecure encryption.
 | 
			
		||||
 | 
			
		||||
If you are using Solaris 8, you can add /dev/urandom and /dev/random
 | 
			
		||||
devices by installing patch 112438 (Sparc) or 112439 (x86), which are
 | 
			
		||||
available via the Patchfinder at <URL: http://sunsolve.sun.com>
 | 
			
		||||
(Solaris 9 includes these devices by default). For /dev/random support
 | 
			
		||||
for earlier Solaris versions, see Sun's statement at
 | 
			
		||||
<URL: http://sunsolve.sun.com/pub-cgi/retrieve.pl?doc=fsrdb/27606&zone_32=SUNWski>
 | 
			
		||||
(the SUNWski package is available in patch 105710).
 | 
			
		||||
 | 
			
		||||
On systems without /dev/urandom and /dev/random, it is a good idea to
 | 
			
		||||
use the Entropy Gathering Demon (EGD); see the RAND_egd() manpage for
 | 
			
		||||
details.  Starting with version 0.9.7, OpenSSL will automatically look
 | 
			
		||||
for an EGD socket at /var/run/egd-pool, /dev/egd-pool, /etc/egd-pool and
 | 
			
		||||
/etc/entropy.
 | 
			
		||||
 | 
			
		||||
Most components of the openssl command line utility automatically try
 | 
			
		||||
to seed the random number generator from a file.  The name of the
 | 
			
		||||
default seeding file is determined as follows: If environment variable
 | 
			
		||||
RANDFILE is set, then it names the seeding file.  Otherwise if
 | 
			
		||||
environment variable HOME is set, then the seeding file is $HOME/.rnd.
 | 
			
		||||
If neither RANDFILE nor HOME is set, versions up to OpenSSL 0.9.6 will
 | 
			
		||||
use file .rnd in the current directory while OpenSSL 0.9.6a uses no
 | 
			
		||||
default seeding file at all.  OpenSSL 0.9.6b and later will behave
 | 
			
		||||
similarly to 0.9.6a, but will use a default of "C:\" for HOME on
 | 
			
		||||
Windows systems if the environment variable has not been set.
 | 
			
		||||
 | 
			
		||||
If the default seeding file does not exist or is too short, the "PRNG
 | 
			
		||||
not seeded" error message may occur.
 | 
			
		||||
 | 
			
		||||
The openssl command line utility will write back a new state to the
 | 
			
		||||
default seeding file (and create this file if necessary) unless
 | 
			
		||||
there was no sufficient seeding.
 | 
			
		||||
 | 
			
		||||
Pointing $RANDFILE to an Entropy Gathering Daemon socket does not work.
 | 
			
		||||
Use the "-rand" option of the OpenSSL command line tools instead.
 | 
			
		||||
The $RANDFILE environment variable and $HOME/.rnd are only used by the
 | 
			
		||||
OpenSSL command line tools. Applications using the OpenSSL library
 | 
			
		||||
provide their own configuration options to specify the entropy source,
 | 
			
		||||
please check out the documentation coming the with application.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why do I get an "unable to write 'random state'" error message?
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Sometimes the openssl command line utility does not abort with
 | 
			
		||||
a "PRNG not seeded" error message, but complains that it is
 | 
			
		||||
"unable to write 'random state'".  This message refers to the
 | 
			
		||||
default seeding file (see previous answer).  A possible reason
 | 
			
		||||
is that no default filename is known because neither RANDFILE
 | 
			
		||||
nor HOME is set.  (Versions up to 0.9.6 used file ".rnd" in the
 | 
			
		||||
current directory in this case, but this has changed with 0.9.6a.)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* How do I create certificates or certificate requests?
 | 
			
		||||
 | 
			
		||||
Check out the CA.pl(1) manual page. This provides a simple wrapper round
 | 
			
		||||
the 'req', 'verify', 'ca' and 'pkcs12' utilities. For finer control check
 | 
			
		||||
out the manual pages for the individual utilities and the certificate
 | 
			
		||||
extensions documentation (currently in doc/openssl.txt).
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why can't I create certificate requests?
 | 
			
		||||
 | 
			
		||||
You typically get the error:
 | 
			
		||||
 | 
			
		||||
	unable to find 'distinguished_name' in config
 | 
			
		||||
	problems making Certificate Request
 | 
			
		||||
 | 
			
		||||
This is because it can't find the configuration file. Check out the
 | 
			
		||||
DIAGNOSTICS section of req(1) for more information.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why does <SSL program> fail with a certificate verify error?
 | 
			
		||||
 | 
			
		||||
This problem is usually indicated by log messages saying something like
 | 
			
		||||
"unable to get local issuer certificate" or "self signed certificate".
 | 
			
		||||
When a certificate is verified its root CA must be "trusted" by OpenSSL
 | 
			
		||||
this typically means that the CA certificate must be placed in a directory
 | 
			
		||||
or file and the relevant program configured to read it. The OpenSSL program
 | 
			
		||||
'verify' behaves in a similar way and issues similar error messages: check
 | 
			
		||||
the verify(1) program manual page for more information.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why can I only use weak ciphers when I connect to a server using OpenSSL?
 | 
			
		||||
 | 
			
		||||
This is almost certainly because you are using an old "export grade" browser
 | 
			
		||||
which only supports weak encryption. Upgrade your browser to support 128 bit
 | 
			
		||||
ciphers.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* How can I create DSA certificates?
 | 
			
		||||
 | 
			
		||||
Check the CA.pl(1) manual page for a DSA certificate example.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why can't I make an SSL connection to a server using a DSA certificate?
 | 
			
		||||
 | 
			
		||||
Typically you'll see a message saying there are no shared ciphers when
 | 
			
		||||
the same setup works fine with an RSA certificate. There are two possible
 | 
			
		||||
causes. The client may not support connections to DSA servers most web
 | 
			
		||||
browsers (including Netscape and MSIE) only support connections to servers
 | 
			
		||||
supporting RSA cipher suites. The other cause is that a set of DH parameters
 | 
			
		||||
has not been supplied to the server. DH parameters can be created with the
 | 
			
		||||
dhparam(1) command and loaded using the SSL_CTX_set_tmp_dh() for example:
 | 
			
		||||
check the source to s_server in apps/s_server.c for an example.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* How can I remove the passphrase on a private key?
 | 
			
		||||
 | 
			
		||||
Firstly you should be really *really* sure you want to do this. Leaving
 | 
			
		||||
a private key unencrypted is a major security risk. If you decide that
 | 
			
		||||
you do have to do this check the EXAMPLES sections of the rsa(1) and
 | 
			
		||||
dsa(1) manual pages.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why can't I use OpenSSL certificates with SSL client authentication?
 | 
			
		||||
 | 
			
		||||
What will typically happen is that when a server requests authentication
 | 
			
		||||
it will either not include your certificate or tell you that you have
 | 
			
		||||
no client certificates (Netscape) or present you with an empty list box
 | 
			
		||||
(MSIE). The reason for this is that when a server requests a client
 | 
			
		||||
certificate it includes a list of CAs names which it will accept. Browsers
 | 
			
		||||
will only let you select certificates from the list on the grounds that
 | 
			
		||||
there is little point presenting a certificate which the server will
 | 
			
		||||
reject.
 | 
			
		||||
 | 
			
		||||
The solution is to add the relevant CA certificate to your servers "trusted
 | 
			
		||||
CA list". How you do this depends on the server software in uses. You can
 | 
			
		||||
print out the servers list of acceptable CAs using the OpenSSL s_client tool:
 | 
			
		||||
 | 
			
		||||
openssl s_client -connect www.some.host:443 -prexit
 | 
			
		||||
 | 
			
		||||
If your server only requests certificates on certain URLs then you may need
 | 
			
		||||
to manually issue an HTTP GET command to get the list when s_client connects:
 | 
			
		||||
 | 
			
		||||
GET /some/page/needing/a/certificate.html
 | 
			
		||||
 | 
			
		||||
If your CA does not appear in the list then this confirms the problem.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why does my browser give a warning about a mismatched hostname?
 | 
			
		||||
 | 
			
		||||
Browsers expect the server's hostname to match the value in the commonName
 | 
			
		||||
(CN) field of the certificate. If it does not then you get a warning.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* How do I install a CA certificate into a browser?
 | 
			
		||||
 | 
			
		||||
The usual way is to send the DER encoded certificate to the browser as
 | 
			
		||||
MIME type application/x-x509-ca-cert, for example by clicking on an appropriate
 | 
			
		||||
link. On MSIE certain extensions such as .der or .cacert may also work, or you
 | 
			
		||||
can import the certificate using the certificate import wizard.
 | 
			
		||||
 | 
			
		||||
You can convert a certificate to DER form using the command:
 | 
			
		||||
 | 
			
		||||
openssl x509 -in ca.pem -outform DER -out ca.der
 | 
			
		||||
 | 
			
		||||
Occasionally someone suggests using a command such as:
 | 
			
		||||
 | 
			
		||||
openssl pkcs12 -export -out cacert.p12 -in cacert.pem -inkey cakey.pem
 | 
			
		||||
 | 
			
		||||
DO NOT DO THIS! This command will give away your CAs private key and
 | 
			
		||||
reduces its security to zero: allowing anyone to forge certificates in
 | 
			
		||||
whatever name they choose.
 | 
			
		||||
 | 
			
		||||
* Why is OpenSSL x509 DN output not conformant to RFC2253?
 | 
			
		||||
 | 
			
		||||
The ways to print out the oneline format of the DN (Distinguished Name) have
 | 
			
		||||
been extended in version 0.9.7 of OpenSSL. Using the new X509_NAME_print_ex()
 | 
			
		||||
interface, the "-nameopt" option could be introduded. See the manual
 | 
			
		||||
page of the "openssl x509" commandline tool for details. The old behaviour
 | 
			
		||||
has however been left as default for the sake of compatibility.
 | 
			
		||||
 | 
			
		||||
* What is a "128 bit certificate"? Can I create one with OpenSSL?
 | 
			
		||||
 | 
			
		||||
The term "128 bit certificate" is a highly misleading marketing term. It does
 | 
			
		||||
*not* refer to the size of the public key in the certificate! A certificate
 | 
			
		||||
containing a 128 bit RSA key would have negligible security.
 | 
			
		||||
 | 
			
		||||
There were various other names such as "magic certificates", "SGC
 | 
			
		||||
certificates", "step up certificates" etc.
 | 
			
		||||
 | 
			
		||||
You can't generally create such a certificate using OpenSSL but there is no
 | 
			
		||||
need to any more. Nowadays web browsers using unrestricted strong encryption
 | 
			
		||||
are generally available.
 | 
			
		||||
 | 
			
		||||
When there were tight export restrictions on the export of strong encryption
 | 
			
		||||
software from the US only weak encryption algorithms could be freely exported
 | 
			
		||||
(initially 40 bit and then 56 bit). It was widely recognised that this was
 | 
			
		||||
inadequate. A relaxation the rules allowed the use of strong encryption but
 | 
			
		||||
only to an authorised server.
 | 
			
		||||
 | 
			
		||||
Two slighly different techniques were developed to support this, one used by
 | 
			
		||||
Netscape was called "step up", the other used by MSIE was called "Server Gated
 | 
			
		||||
Cryptography" (SGC). When a browser initially connected to a server it would
 | 
			
		||||
check to see if the certificate contained certain extensions and was issued by
 | 
			
		||||
an authorised authority. If these test succeeded it would reconnect using
 | 
			
		||||
strong encryption.
 | 
			
		||||
 | 
			
		||||
Only certain (initially one) certificate authorities could issue the
 | 
			
		||||
certificates and they generally cost more than ordinary certificates.
 | 
			
		||||
 | 
			
		||||
Although OpenSSL can create certificates containing the appropriate extensions
 | 
			
		||||
the certificate would not come from a permitted authority and so would not
 | 
			
		||||
be recognized.
 | 
			
		||||
 | 
			
		||||
The export laws were later changed to allow almost unrestricted use of strong
 | 
			
		||||
encryption so these certificates are now obsolete.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
[BUILD] =======================================================================
 | 
			
		||||
 | 
			
		||||
* Why does the linker complain about undefined symbols?
 | 
			
		||||
 | 
			
		||||
@@ -436,463 +113,18 @@ If you used ./Configure instead of ./config, make sure that you
 | 
			
		||||
selected the right target.  File formats may differ slightly between
 | 
			
		||||
OS versions (for example sparcv8/sparcv9, or a.out/elf).
 | 
			
		||||
 | 
			
		||||
In case you get errors about the following symbols, use the config
 | 
			
		||||
option "no-asm", as described in INSTALL:
 | 
			
		||||
 | 
			
		||||
 BF_cbc_encrypt, BF_decrypt, BF_encrypt, CAST_cbc_encrypt,
 | 
			
		||||
 CAST_decrypt, CAST_encrypt, RC4, RC5_32_cbc_encrypt, RC5_32_decrypt,
 | 
			
		||||
 RC5_32_encrypt, bn_add_words, bn_div_words, bn_mul_add_words,
 | 
			
		||||
 bn_mul_comba4, bn_mul_comba8, bn_mul_words, bn_sqr_comba4,
 | 
			
		||||
 bn_sqr_comba8, bn_sqr_words, bn_sub_words, des_decrypt3,
 | 
			
		||||
 des_ede3_cbc_encrypt, des_encrypt, des_encrypt2, des_encrypt3,
 | 
			
		||||
 des_ncbc_encrypt, md5_block_asm_host_order, sha1_block_asm_data_order
 | 
			
		||||
 | 
			
		||||
If none of these helps, you may want to try using the current snapshot.
 | 
			
		||||
If that doesn't help, you may want to try using the current snapshot.
 | 
			
		||||
If the problem persists, please submit a bug report.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why does the OpenSSL test fail with "bc: command not found"?
 | 
			
		||||
* Where can I get a compiled version of OpenSSL?
 | 
			
		||||
 | 
			
		||||
You didn't install "bc", the Unix calculator.  If you want to run the
 | 
			
		||||
tests, get GNU bc from ftp://ftp.gnu.org or from your OS distributor.
 | 
			
		||||
Some applications that use OpenSSL are distributed in binary form.
 | 
			
		||||
When using such an application, you don't need to install OpenSSL
 | 
			
		||||
yourself; the application will include the required parts (e.g. DLLs).
 | 
			
		||||
 | 
			
		||||
If you want to install OpenSSL on a Windows system and you don't have
 | 
			
		||||
a C compiler, read the "Mingw32" section of INSTALL.W32 for information
 | 
			
		||||
on how to obtain and install the free GNU C compiler.
 | 
			
		||||
 | 
			
		||||
* Why does the OpenSSL test fail with "bc: 1 no implemented"?
 | 
			
		||||
 | 
			
		||||
On some SCO installations or versions, bc has a bug that gets triggered
 | 
			
		||||
when you run the test suite (using "make test").  The message returned is
 | 
			
		||||
"bc: 1 not implemented".
 | 
			
		||||
 | 
			
		||||
The best way to deal with this is to find another implementation of bc
 | 
			
		||||
and compile/install it.  GNU bc (see http://www.gnu.org/software/software.html
 | 
			
		||||
for download instructions) can be safely used, for example.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why does the OpenSSL test fail with "bc: stack empty"?
 | 
			
		||||
 | 
			
		||||
On some DG/ux versions, bc seems to have a too small stack for calculations
 | 
			
		||||
that the OpenSSL bntest throws at it.  This gets triggered when you run the
 | 
			
		||||
test suite (using "make test").  The message returned is "bc: stack empty".
 | 
			
		||||
 | 
			
		||||
The best way to deal with this is to find another implementation of bc
 | 
			
		||||
and compile/install it.  GNU bc (see http://www.gnu.org/software/software.html
 | 
			
		||||
for download instructions) can be safely used, for example.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why does the OpenSSL compilation fail on Alpha Tru64 Unix?
 | 
			
		||||
 | 
			
		||||
On some Alpha installations running Tru64 Unix and Compaq C, the compilation
 | 
			
		||||
of crypto/sha/sha_dgst.c fails with the message 'Fatal:  Insufficient virtual
 | 
			
		||||
memory to continue compilation.'  As far as the tests have shown, this may be
 | 
			
		||||
a compiler bug.  What happens is that it eats up a lot of resident memory
 | 
			
		||||
to build something, probably a table.  The problem is clearly in the
 | 
			
		||||
optimization code, because if one eliminates optimization completely (-O0),
 | 
			
		||||
the compilation goes through (and the compiler consumes about 2MB of resident
 | 
			
		||||
memory instead of 240MB or whatever one's limit is currently).
 | 
			
		||||
 | 
			
		||||
There are three options to solve this problem:
 | 
			
		||||
 | 
			
		||||
1. set your current data segment size soft limit higher.  Experience shows
 | 
			
		||||
that about 241000 kbytes seems to be enough on an AlphaServer DS10.  You do
 | 
			
		||||
this with the command 'ulimit -Sd nnnnnn', where 'nnnnnn' is the number of
 | 
			
		||||
kbytes to set the limit to.
 | 
			
		||||
 | 
			
		||||
2. If you have a hard limit that is lower than what you need and you can't
 | 
			
		||||
get it changed, you can compile all of OpenSSL with -O0 as optimization
 | 
			
		||||
level.  This is however not a very nice thing to do for those who expect to
 | 
			
		||||
get the best result from OpenSSL.  A bit more complicated solution is the
 | 
			
		||||
following:
 | 
			
		||||
 | 
			
		||||
----- snip:start -----
 | 
			
		||||
  make DIRS=crypto SDIRS=sha "`grep '^CFLAG=' Makefile.ssl | \
 | 
			
		||||
       sed -e 's/ -O[0-9] / -O0 /'`"
 | 
			
		||||
  rm `ls crypto/*.o crypto/sha/*.o | grep -v 'sha_dgst\.o'`
 | 
			
		||||
  make
 | 
			
		||||
----- snip:end -----
 | 
			
		||||
 | 
			
		||||
This will only compile sha_dgst.c with -O0, the rest with the optimization
 | 
			
		||||
level chosen by the configuration process.  When the above is done, do the
 | 
			
		||||
test and installation and you're set.
 | 
			
		||||
 | 
			
		||||
3. Reconfigure the toolkit with no-sha0 option to leave out SHA0. It 
 | 
			
		||||
should not be used and is not used in SSL/TLS nor any other recognized
 | 
			
		||||
protocol in either case.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why does the OpenSSL compilation fail with "ar: command not found"?
 | 
			
		||||
 | 
			
		||||
Getting this message is quite usual on Solaris 2, because Sun has hidden
 | 
			
		||||
away 'ar' and other development commands in directories that aren't in
 | 
			
		||||
$PATH by default.  One of those directories is '/usr/ccs/bin'.  The
 | 
			
		||||
quickest way to fix this is to do the following (it assumes you use sh
 | 
			
		||||
or any sh-compatible shell):
 | 
			
		||||
 | 
			
		||||
----- snip:start -----
 | 
			
		||||
  PATH=${PATH}:/usr/ccs/bin; export PATH
 | 
			
		||||
----- snip:end -----
 | 
			
		||||
 | 
			
		||||
and then redo the compilation.  What you should really do is make sure
 | 
			
		||||
'/usr/ccs/bin' is permanently in your $PATH, for example through your
 | 
			
		||||
'.profile' (again, assuming you use a sh-compatible shell).
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why does the OpenSSL compilation fail on Win32 with VC++?
 | 
			
		||||
 | 
			
		||||
Sometimes, you may get reports from VC++ command line (cl) that it
 | 
			
		||||
can't find standard include files like stdio.h and other weirdnesses.
 | 
			
		||||
One possible cause is that the environment isn't correctly set up.
 | 
			
		||||
To solve that problem for VC++ versions up to 6, one should run
 | 
			
		||||
VCVARS32.BAT which is found in the 'bin' subdirectory of the VC++
 | 
			
		||||
installation directory (somewhere under 'Program Files').  For VC++
 | 
			
		||||
version 7 (and up?), which is also called VS.NET, the file is called
 | 
			
		||||
VSVARS32.BAT instead.
 | 
			
		||||
This needs to be done prior to running NMAKE, and the changes are only
 | 
			
		||||
valid for the current DOS session.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* What is special about OpenSSL on Redhat?
 | 
			
		||||
 | 
			
		||||
Red Hat Linux (release 7.0 and later) include a preinstalled limited
 | 
			
		||||
version of OpenSSL. For patent reasons, support for IDEA, RC5 and MDC2
 | 
			
		||||
is disabled in this version. The same may apply to other Linux distributions.
 | 
			
		||||
Users may therefore wish to install more or all of the features left out.
 | 
			
		||||
 | 
			
		||||
To do this you MUST ensure that you do not overwrite the openssl that is in
 | 
			
		||||
/usr/bin on your Red Hat machine. Several packages depend on this file,
 | 
			
		||||
including sendmail and ssh. /usr/local/bin is a good alternative choice. The
 | 
			
		||||
libraries that come with Red Hat 7.0 onwards have different names and so are
 | 
			
		||||
not affected. (eg For Red Hat 7.2 they are /lib/libssl.so.0.9.6b and
 | 
			
		||||
/lib/libcrypto.so.0.9.6b with symlinks /lib/libssl.so.2 and
 | 
			
		||||
/lib/libcrypto.so.2 respectively).
 | 
			
		||||
 | 
			
		||||
Please note that we have been advised by Red Hat attempting to recompile the
 | 
			
		||||
openssl rpm with all the cryptography enabled will not work. All other
 | 
			
		||||
packages depend on the original Red Hat supplied openssl package. It is also
 | 
			
		||||
worth noting that due to the way Red Hat supplies its packages, updates to
 | 
			
		||||
openssl on each distribution never change the package version, only the
 | 
			
		||||
build number. For example, on Red Hat 7.1, the latest openssl package has
 | 
			
		||||
version number 0.9.6 and build number 9 even though it contains all the
 | 
			
		||||
relevant updates in packages up to and including 0.9.6b.
 | 
			
		||||
 | 
			
		||||
A possible way around this is to persuade Red Hat to produce a non-US
 | 
			
		||||
version of Red Hat Linux.
 | 
			
		||||
 | 
			
		||||
FYI: Patent numbers and expiry dates of US patents:
 | 
			
		||||
MDC-2: 4,908,861 13/03/2007
 | 
			
		||||
IDEA:  5,214,703 25/05/2010
 | 
			
		||||
RC5:   5,724,428 03/03/2015
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why does the OpenSSL compilation fail on MacOS X?
 | 
			
		||||
 | 
			
		||||
If the failure happens when trying to build the "openssl" binary, with
 | 
			
		||||
a large number of undefined symbols, it's very probable that you have
 | 
			
		||||
OpenSSL 0.9.6b delivered with the operating system (you can find out by
 | 
			
		||||
running '/usr/bin/openssl version') and that you were trying to build
 | 
			
		||||
OpenSSL 0.9.7 or newer.  The problem is that the loader ('ld') in
 | 
			
		||||
MacOS X has a misfeature that's quite difficult to go around.
 | 
			
		||||
Look in the file PROBLEMS for a more detailed explanation and for possible
 | 
			
		||||
solutions.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why does the OpenSSL test suite fail on MacOS X?
 | 
			
		||||
 | 
			
		||||
If the failure happens when running 'make test' and the RC4 test fails,
 | 
			
		||||
it's very probable that you have OpenSSL 0.9.6b delivered with the
 | 
			
		||||
operating system (you can find out by running '/usr/bin/openssl version')
 | 
			
		||||
and that you were trying to build OpenSSL 0.9.6d.  The problem is that
 | 
			
		||||
the loader ('ld') in MacOS X has a misfeature that's quite difficult to
 | 
			
		||||
go around and has linked the programs "openssl" and the test programs
 | 
			
		||||
with /usr/lib/libcrypto.dylib and /usr/lib/libssl.dylib instead of the
 | 
			
		||||
libraries you just built.
 | 
			
		||||
Look in the file PROBLEMS for a more detailed explanation and for possible
 | 
			
		||||
solutions.
 | 
			
		||||
 | 
			
		||||
* Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]?
 | 
			
		||||
 | 
			
		||||
Failure in BN_sqr test is most likely caused by a failure to configure the
 | 
			
		||||
toolkit for current platform or lack of support for the platform in question.
 | 
			
		||||
Run './config -t' and './apps/openssl version -p'. Do these platform
 | 
			
		||||
identifiers match? If they don't, then you most likely failed to run
 | 
			
		||||
./config and you're hereby advised to do so before filing a bug report.
 | 
			
		||||
If ./config itself fails to run, then it's most likely problem with your
 | 
			
		||||
local environment and you should turn to your system administrator (or
 | 
			
		||||
similar). If identifiers match (and/or no alternative identifier is
 | 
			
		||||
suggested by ./config script), then the platform is unsupported. There might
 | 
			
		||||
or might not be a workaround. Most notably on SPARC64 platforms with GNU
 | 
			
		||||
C compiler you should be able to produce a working build by running
 | 
			
		||||
'./config -m32'. I understand that -m32 might not be what you want/need,
 | 
			
		||||
but the build should be operational. For further details turn to
 | 
			
		||||
<openssl-dev@openssl.org>.
 | 
			
		||||
 | 
			
		||||
* Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"?
 | 
			
		||||
 | 
			
		||||
As of 0.9.7 assembler routines were overhauled for position independence
 | 
			
		||||
of the machine code, which is essential for shared library support. For
 | 
			
		||||
some reason OpenBSD is equipped with an out-of-date GNU assembler which
 | 
			
		||||
finds the new code offensive. To work around the problem, configure with
 | 
			
		||||
no-asm (and sacrifice a great deal of performance) or patch your assembler
 | 
			
		||||
according to <URL: http://www.openssl.org/~appro/gas-1.92.3.OpenBSD.patch>.
 | 
			
		||||
For your convenience a pre-compiled replacement binary is provided at
 | 
			
		||||
<URL: http://www.openssl.org/~appro/gas-1.92.3.static.aout.bin>.
 | 
			
		||||
Reportedly elder *BSD a.out platforms also suffer from this problem and
 | 
			
		||||
remedy should be same. Provided binary is statically linked and should be
 | 
			
		||||
working across wider range of *BSD branches, not just OpenBSD.
 | 
			
		||||
 | 
			
		||||
* Why does the OpenSSL test suite fail in sha512t on x86 CPU?
 | 
			
		||||
 | 
			
		||||
If the test program in question fails withs SIGILL, Illegal Instruction
 | 
			
		||||
exception, then you more than likely to run SSE2-capable CPU, such as
 | 
			
		||||
Intel P4, under control of kernel which does not support SSE2
 | 
			
		||||
instruction extentions. See accompanying INSTALL file and
 | 
			
		||||
OPENSSL_ia32cap(3) documentation page for further information.
 | 
			
		||||
 | 
			
		||||
* Why does compiler fail to compile sha512.c?
 | 
			
		||||
 | 
			
		||||
OpenSSL SHA-512 implementation depends on compiler support for 64-bit
 | 
			
		||||
integer type. Few elder compilers [ULTRIX cc, SCO compiler to mention a
 | 
			
		||||
couple] lack support for this and therefore are incapable of compiling
 | 
			
		||||
the module in question. The recommendation is to disable SHA-512 by
 | 
			
		||||
adding no-sha512 to ./config [or ./Configure] command line. Another
 | 
			
		||||
possible alternative might be to switch to GCC.
 | 
			
		||||
 | 
			
		||||
* Test suite still fails, what to do?
 | 
			
		||||
 | 
			
		||||
Another common reason for failure to complete some particular test is
 | 
			
		||||
simply bad code generated by a buggy component in toolchain or deficiency
 | 
			
		||||
in run-time environment. There are few cases documented in PROBLEMS file,
 | 
			
		||||
consult it for possible workaround before you beat the drum. Even if you
 | 
			
		||||
don't find solution or even mention there, do reserve for possibility of
 | 
			
		||||
a compiler bug. Compiler bugs might appear in rather bizarre ways, they
 | 
			
		||||
never make sense, and tend to emerge when you least expect them. In order
 | 
			
		||||
to identify one, drop optimization level, e.g. by editing CFLAG line in
 | 
			
		||||
top-level Makefile, recompile and re-run the test.
 | 
			
		||||
 | 
			
		||||
[PROG] ========================================================================
 | 
			
		||||
 | 
			
		||||
* Is OpenSSL thread-safe?
 | 
			
		||||
 | 
			
		||||
Yes (with limitations: an SSL connection may not concurrently be used
 | 
			
		||||
by multiple threads).  On Windows and many Unix systems, OpenSSL
 | 
			
		||||
automatically uses the multi-threaded versions of the standard
 | 
			
		||||
libraries.  If your platform is not one of these, consult the INSTALL
 | 
			
		||||
file.
 | 
			
		||||
 | 
			
		||||
Multi-threaded applications must provide two callback functions to
 | 
			
		||||
OpenSSL by calling CRYPTO_set_locking_callback() and
 | 
			
		||||
CRYPTO_set_id_callback().  This is described in the threads(3)
 | 
			
		||||
manpage.
 | 
			
		||||
 | 
			
		||||
* I've compiled a program under Windows and it crashes: why?
 | 
			
		||||
 | 
			
		||||
This is usually because you've missed the comment in INSTALL.W32.
 | 
			
		||||
Your application must link against the same version of the Win32
 | 
			
		||||
C-Runtime against which your openssl libraries were linked.  The
 | 
			
		||||
default version for OpenSSL is /MD - "Multithreaded DLL".
 | 
			
		||||
 | 
			
		||||
If you are using Microsoft Visual C++'s IDE (Visual Studio), in
 | 
			
		||||
many cases, your new project most likely defaulted to "Debug
 | 
			
		||||
Singlethreaded" - /ML.  This is NOT interchangeable with /MD and your
 | 
			
		||||
program will crash, typically on the first BIO related read or write
 | 
			
		||||
operation.
 | 
			
		||||
 | 
			
		||||
For each of the six possible link stage configurations within Win32,
 | 
			
		||||
your application must link  against the same by which OpenSSL was
 | 
			
		||||
built.  If you are using MS Visual C++ (Studio) this can be changed
 | 
			
		||||
by:
 | 
			
		||||
 | 
			
		||||
 1. Select Settings... from the Project Menu.
 | 
			
		||||
 2. Select the C/C++ Tab.
 | 
			
		||||
 3. Select "Code Generation from the "Category" drop down list box
 | 
			
		||||
 4. Select the Appropriate library (see table below) from the "Use
 | 
			
		||||
    run-time library" drop down list box.  Perform this step for both
 | 
			
		||||
    your debug and release versions of your application (look at the
 | 
			
		||||
    top left of the settings panel to change between the two)
 | 
			
		||||
 | 
			
		||||
    Single Threaded           /ML        -  MS VC++ often defaults to
 | 
			
		||||
                                            this for the release
 | 
			
		||||
                                            version of a new project.
 | 
			
		||||
    Debug Single Threaded     /MLd       -  MS VC++ often defaults to
 | 
			
		||||
                                            this for the debug version
 | 
			
		||||
                                            of a new project.
 | 
			
		||||
    Multithreaded             /MT
 | 
			
		||||
    Debug Multithreaded       /MTd
 | 
			
		||||
    Multithreaded DLL         /MD        -  OpenSSL defaults to this.
 | 
			
		||||
    Debug Multithreaded DLL   /MDd
 | 
			
		||||
 | 
			
		||||
Note that debug and release libraries are NOT interchangeable.  If you
 | 
			
		||||
built OpenSSL with /MD your application must use /MD and cannot use /MDd.
 | 
			
		||||
 | 
			
		||||
As per 0.9.8 the above limitation is eliminated for .DLLs. OpenSSL
 | 
			
		||||
.DLLs compiled with some specific run-time option [we insist on the
 | 
			
		||||
default /MD] can be deployed with application compiled with different
 | 
			
		||||
option or even different compiler. But there is a catch! Instead of
 | 
			
		||||
re-compiling OpenSSL toolkit, as you would have to with prior versions,
 | 
			
		||||
you have to compile small C snippet with compiler and/or options of
 | 
			
		||||
your choice. The snippet gets installed as
 | 
			
		||||
<install-root>/include/openssl/applink.c and should be either added to
 | 
			
		||||
your application project or simply #include-d in one [and only one]
 | 
			
		||||
of your application source files. Failure to link this shim module
 | 
			
		||||
into your application manifests itself as fatal "no OPENSSL_Applink"
 | 
			
		||||
run-time error. An explicit reminder is due that in this situation
 | 
			
		||||
[mixing compiler options] it is as important to add CRYPTO_malloc_init
 | 
			
		||||
prior first call to OpenSSL.
 | 
			
		||||
 | 
			
		||||
* How do I read or write a DER encoded buffer using the ASN1 functions?
 | 
			
		||||
 | 
			
		||||
You have two options. You can either use a memory BIO in conjunction
 | 
			
		||||
with the i2d_*_bio() or d2i_*_bio() functions or you can use the
 | 
			
		||||
i2d_*(), d2i_*() functions directly. Since these are often the
 | 
			
		||||
cause of grief here are some code fragments using PKCS7 as an example:
 | 
			
		||||
 | 
			
		||||
 unsigned char *buf, *p;
 | 
			
		||||
 int len;
 | 
			
		||||
 | 
			
		||||
 len = i2d_PKCS7(p7, NULL);
 | 
			
		||||
 buf = OPENSSL_malloc(len); /* or Malloc, error checking omitted */
 | 
			
		||||
 p = buf;
 | 
			
		||||
 i2d_PKCS7(p7, &p);
 | 
			
		||||
 | 
			
		||||
At this point buf contains the len bytes of the DER encoding of
 | 
			
		||||
p7.
 | 
			
		||||
 | 
			
		||||
The opposite assumes we already have len bytes in buf:
 | 
			
		||||
 | 
			
		||||
 unsigned char *p;
 | 
			
		||||
 p = buf;
 | 
			
		||||
 p7 = d2i_PKCS7(NULL, &p, len);
 | 
			
		||||
 | 
			
		||||
At this point p7 contains a valid PKCS7 structure of NULL if an error
 | 
			
		||||
occurred. If an error occurred ERR_print_errors(bio) should give more
 | 
			
		||||
information.
 | 
			
		||||
 | 
			
		||||
The reason for the temporary variable 'p' is that the ASN1 functions
 | 
			
		||||
increment the passed pointer so it is ready to read or write the next
 | 
			
		||||
structure. This is often a cause of problems: without the temporary
 | 
			
		||||
variable the buffer pointer is changed to point just after the data
 | 
			
		||||
that has been read or written. This may well be uninitialized data
 | 
			
		||||
and attempts to free the buffer will have unpredictable results
 | 
			
		||||
because it no longer points to the same address.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* OpenSSL uses DER but I need BER format: does OpenSSL support BER?
 | 
			
		||||
 | 
			
		||||
The short answer is yes, because DER is a special case of BER and OpenSSL
 | 
			
		||||
ASN1 decoders can process BER.
 | 
			
		||||
 | 
			
		||||
The longer answer is that ASN1 structures can be encoded in a number of
 | 
			
		||||
different ways. One set of ways is the Basic Encoding Rules (BER) with various
 | 
			
		||||
permissible encodings. A restriction of BER is the Distinguished Encoding
 | 
			
		||||
Rules (DER): these uniquely specify how a given structure is encoded.
 | 
			
		||||
 | 
			
		||||
Therefore, because DER is a special case of BER, DER is an acceptable encoding
 | 
			
		||||
for BER.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* I've tried using <M_some_evil_pkcs12_macro> and I get errors why?
 | 
			
		||||
 | 
			
		||||
This usually happens when you try compiling something using the PKCS#12
 | 
			
		||||
macros with a C++ compiler. There is hardly ever any need to use the
 | 
			
		||||
PKCS#12 macros in a program, it is much easier to parse and create
 | 
			
		||||
PKCS#12 files using the PKCS12_parse() and PKCS12_create() functions
 | 
			
		||||
documented in doc/openssl.txt and with examples in demos/pkcs12. The
 | 
			
		||||
'pkcs12' application has to use the macros because it prints out 
 | 
			
		||||
debugging information.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* I've called <some function> and it fails, why?
 | 
			
		||||
 | 
			
		||||
Before submitting a report or asking in one of the mailing lists, you
 | 
			
		||||
should try to determine the cause. In particular, you should call
 | 
			
		||||
ERR_print_errors() or ERR_print_errors_fp() after the failed call
 | 
			
		||||
and see if the message helps. Note that the problem may occur earlier
 | 
			
		||||
than you think -- you should check for errors after every call where
 | 
			
		||||
it is possible, otherwise the actual problem may be hidden because
 | 
			
		||||
some OpenSSL functions clear the error state.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* I just get a load of numbers for the error output, what do they mean?
 | 
			
		||||
 | 
			
		||||
The actual format is described in the ERR_print_errors() manual page.
 | 
			
		||||
You should call the function ERR_load_crypto_strings() before hand and
 | 
			
		||||
the message will be output in text form. If you can't do this (for example
 | 
			
		||||
it is a pre-compiled binary) you can use the errstr utility on the error
 | 
			
		||||
code itself (the hex digits after the second colon).
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why do I get errors about unknown algorithms?
 | 
			
		||||
 | 
			
		||||
This can happen under several circumstances such as reading in an
 | 
			
		||||
encrypted private key or attempting to decrypt a PKCS#12 file. The cause
 | 
			
		||||
is forgetting to load OpenSSL's table of algorithms with
 | 
			
		||||
OpenSSL_add_all_algorithms(). See the manual page for more information.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why can't the OpenSSH configure script detect OpenSSL?
 | 
			
		||||
 | 
			
		||||
Several reasons for problems with the automatic detection exist.
 | 
			
		||||
OpenSSH requires at least version 0.9.5a of the OpenSSL libraries.
 | 
			
		||||
Sometimes the distribution has installed an older version in the system
 | 
			
		||||
locations that is detected instead of a new one installed. The OpenSSL
 | 
			
		||||
library might have been compiled for another CPU or another mode (32/64 bits).
 | 
			
		||||
Permissions might be wrong.
 | 
			
		||||
 | 
			
		||||
The general answer is to check the config.log file generated when running
 | 
			
		||||
the OpenSSH configure script. It should contain the detailed information
 | 
			
		||||
on why the OpenSSL library was not detected or considered incompatible.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Can I use OpenSSL's SSL library with non-blocking I/O?
 | 
			
		||||
 | 
			
		||||
Yes; make sure to read the SSL_get_error(3) manual page!
 | 
			
		||||
 | 
			
		||||
A pitfall to avoid: Don't assume that SSL_read() will just read from
 | 
			
		||||
the underlying transport or that SSL_write() will just write to it --
 | 
			
		||||
it is also possible that SSL_write() cannot do any useful work until
 | 
			
		||||
there is data to read, or that SSL_read() cannot do anything until it
 | 
			
		||||
is possible to send data.  One reason for this is that the peer may
 | 
			
		||||
request a new TLS/SSL handshake at any time during the protocol,
 | 
			
		||||
requiring a bi-directional message exchange; both SSL_read() and
 | 
			
		||||
SSL_write() will try to continue any pending handshake.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why doesn't my server application receive a client certificate?
 | 
			
		||||
 | 
			
		||||
Due to the TLS protocol definition, a client will only send a certificate,
 | 
			
		||||
if explicitly asked by the server. Use the SSL_VERIFY_PEER flag of the
 | 
			
		||||
SSL_CTX_set_verify() function to enable the use of client certificates.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Why does compilation fail due to an undefined symbol NID_uniqueIdentifier?
 | 
			
		||||
 | 
			
		||||
For OpenSSL 0.9.7 the OID table was extended and corrected. In earlier
 | 
			
		||||
versions, uniqueIdentifier was incorrectly used for X.509 certificates.
 | 
			
		||||
The correct name according to RFC2256 (LDAP) is x500UniqueIdentifier.
 | 
			
		||||
Change your code to use the new name when compiling against OpenSSL 0.9.7.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* I think I've detected a memory leak, is this a bug?
 | 
			
		||||
 | 
			
		||||
In most cases the cause of an apparent memory leak is an OpenSSL internal table
 | 
			
		||||
that is allocated when an application starts up. Since such tables do not grow
 | 
			
		||||
in size over time they are harmless.
 | 
			
		||||
 | 
			
		||||
These internal tables can be freed up when an application closes using various
 | 
			
		||||
functions.  Currently these include following:
 | 
			
		||||
 | 
			
		||||
Thread-local cleanup functions:
 | 
			
		||||
 | 
			
		||||
  ERR_remove_state()
 | 
			
		||||
 | 
			
		||||
Application-global cleanup functions that are aware of usage (and therefore
 | 
			
		||||
thread-safe):
 | 
			
		||||
 | 
			
		||||
  ENGINE_cleanup() and CONF_modules_unload()
 | 
			
		||||
 | 
			
		||||
"Brutal" (thread-unsafe) Application-global cleanup functions:
 | 
			
		||||
 | 
			
		||||
  ERR_free_strings(), EVP_cleanup() and CRYPTO_cleanup_all_ex_data().
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
===============================================================================
 | 
			
		||||
 | 
			
		||||
A number of Linux and *BSD distributions include OpenSSL.
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										126
									
								
								INSTALL
									
									
									
									
									
								
							
							
						
						
									
										126
									
								
								INSTALL
									
									
									
									
									
								
							@@ -2,20 +2,13 @@
 | 
			
		||||
 INSTALLATION ON THE UNIX PLATFORM
 | 
			
		||||
 ---------------------------------
 | 
			
		||||
 | 
			
		||||
 [Installation on DOS (with djgpp), Windows, OpenVMS, MacOS (before MacOS X)
 | 
			
		||||
  and NetWare is described in INSTALL.DJGPP, INSTALL.W32, INSTALL.VMS,
 | 
			
		||||
  INSTALL.MacOS and INSTALL.NW.
 | 
			
		||||
  
 | 
			
		||||
  This document describes installation on operating systems in the Unix
 | 
			
		||||
  family.]
 | 
			
		||||
 [See INSTALL.W32 for instructions for compiling OpenSSL on Windows systems,
 | 
			
		||||
  and INSTALL.VMS for installing on OpenVMS systems.]
 | 
			
		||||
 | 
			
		||||
 To install OpenSSL, you will need:
 | 
			
		||||
 | 
			
		||||
  * make
 | 
			
		||||
  * Perl 5
 | 
			
		||||
  * an ANSI C compiler
 | 
			
		||||
  * a development environment in form of development libraries and C
 | 
			
		||||
    header files
 | 
			
		||||
  * a supported Unix operating system
 | 
			
		||||
 | 
			
		||||
 Quick Start
 | 
			
		||||
@@ -40,8 +33,7 @@
 | 
			
		||||
 Configuration Options
 | 
			
		||||
 ---------------------
 | 
			
		||||
 | 
			
		||||
 There are several options to ./config (or ./Configure) to customize
 | 
			
		||||
 the build:
 | 
			
		||||
 There are several options to ./config to customize the build:
 | 
			
		||||
 | 
			
		||||
  --prefix=DIR  Install in DIR/bin, DIR/lib, DIR/include/openssl.
 | 
			
		||||
	        Configuration files used by OpenSSL will be in DIR/ssl
 | 
			
		||||
@@ -50,6 +42,9 @@
 | 
			
		||||
  --openssldir=DIR Directory for OpenSSL files. If no prefix is specified,
 | 
			
		||||
                the library files and binaries are also installed there.
 | 
			
		||||
 | 
			
		||||
  rsaref        Build with RSADSI's RSAREF toolkit (this assumes that
 | 
			
		||||
                librsaref.a is in the library search path).
 | 
			
		||||
 | 
			
		||||
  no-threads    Don't try to build with support for multi-threaded
 | 
			
		||||
                applications.
 | 
			
		||||
 | 
			
		||||
@@ -57,48 +52,17 @@
 | 
			
		||||
                This will usually require additional system-dependent options!
 | 
			
		||||
                See "Note on multi-threading" below.
 | 
			
		||||
 | 
			
		||||
  no-zlib       Don't try to build with support for zlib compression and
 | 
			
		||||
                decompression.
 | 
			
		||||
 | 
			
		||||
  zlib          Build with support for zlib compression/decompression.
 | 
			
		||||
 | 
			
		||||
  zlib-dynamic  Like "zlib", but has OpenSSL load the zlib library dynamically
 | 
			
		||||
                when needed.  This is only supported on systems where loading
 | 
			
		||||
                of shared libraries is supported.  This is the default choice.
 | 
			
		||||
 | 
			
		||||
  no-shared     Don't try to create shared libraries.
 | 
			
		||||
 | 
			
		||||
  shared        In addition to the usual static libraries, create shared
 | 
			
		||||
                libraries on platforms where it's supported.  See "Note on
 | 
			
		||||
                shared libraries" below.
 | 
			
		||||
 | 
			
		||||
  no-asm        Do not use assembler code.
 | 
			
		||||
 | 
			
		||||
  386           Use the 80386 instruction set only (the default x86 code is
 | 
			
		||||
                more efficient, but requires at least a 486). Note: Use
 | 
			
		||||
                compiler flags for any other CPU specific configuration,
 | 
			
		||||
                e.g. "-m32" to build x86 code on an x64 system.
 | 
			
		||||
 | 
			
		||||
  no-sse2	Exclude SSE2 code pathes. Normally SSE2 extention is
 | 
			
		||||
		detected at run-time, but the decision whether or not the
 | 
			
		||||
		machine code will be executed is taken solely on CPU
 | 
			
		||||
		capability vector. This means that if you happen to run OS
 | 
			
		||||
		kernel which does not support SSE2 extension on Intel P4
 | 
			
		||||
		processor, then your application might be exposed to
 | 
			
		||||
		"illegal instruction" exception. There might be a way
 | 
			
		||||
		to enable support in kernel, e.g. FreeBSD kernel can be
 | 
			
		||||
		compiled with CPU_ENABLE_SSE, and there is a way to
 | 
			
		||||
		disengage SSE2 code pathes upon application start-up,
 | 
			
		||||
		but if you aim for wider "audience" running such kernel,
 | 
			
		||||
		consider no-sse2. Both 386 and no-asm options above imply
 | 
			
		||||
		no-sse2.
 | 
			
		||||
                more efficient, but requires at least a 486).
 | 
			
		||||
 | 
			
		||||
  no-<cipher>   Build without the specified cipher (bf, cast, des, dh, dsa,
 | 
			
		||||
                hmac, md2, md5, mdc2, rc2, rc4, rc5, rsa, sha).
 | 
			
		||||
                The crypto/<cipher> directory can be removed after running
 | 
			
		||||
                "make depend".
 | 
			
		||||
 | 
			
		||||
  -Dxxx, -lxxx, -Lxxx, -fxxx, -mxxx, -Kxxx These system specific options will
 | 
			
		||||
  -Dxxx, -lxxx, -Lxxx, -fxxx, -Kxxx These system specific options will
 | 
			
		||||
                be passed through to the compiler to allow you to
 | 
			
		||||
                define preprocessor symbols, specify additional libraries,
 | 
			
		||||
                library directories or other compiler options.
 | 
			
		||||
@@ -153,15 +117,9 @@
 | 
			
		||||
     OpenSSL binary ("openssl"). The libraries will be built in the top-level
 | 
			
		||||
     directory, and the binary will be in the "apps" directory.
 | 
			
		||||
 | 
			
		||||
     If "make" fails, look at the output.  There may be reasons for
 | 
			
		||||
     the failure that aren't problems in OpenSSL itself (like missing
 | 
			
		||||
     standard headers).  If it is a problem with OpenSSL itself, please
 | 
			
		||||
     report the problem to <openssl-bugs@openssl.org> (note that your
 | 
			
		||||
     message will be recorded in the request tracker publicly readable
 | 
			
		||||
     via http://www.openssl.org/support/rt2.html and will be forwarded to a
 | 
			
		||||
     public mailing list). Include the output of "make report" in your message.
 | 
			
		||||
     Please check out the request tracker. Maybe the bug was already
 | 
			
		||||
     reported or has already been fixed.
 | 
			
		||||
     If "make" fails, please report the problem to <openssl-bugs@openssl.org>
 | 
			
		||||
     (note that your message will be forwarded to a public mailing list).
 | 
			
		||||
     Include the output of "make report" in your message.
 | 
			
		||||
 | 
			
		||||
     [If you encounter assembler error messages, try the "no-asm"
 | 
			
		||||
     configuration option as an immediate fix.]
 | 
			
		||||
@@ -173,14 +131,10 @@
 | 
			
		||||
 | 
			
		||||
       $ make test
 | 
			
		||||
 | 
			
		||||
     If a test fails, look at the output.  There may be reasons for
 | 
			
		||||
     the failure that isn't a problem in OpenSSL itself (like a missing
 | 
			
		||||
     or malfunctioning bc).  If it is a problem with OpenSSL itself,
 | 
			
		||||
     try removing any compiler optimization flags from the CFLAG line
 | 
			
		||||
     in Makefile.ssl and run "make clean; make". Please send a bug
 | 
			
		||||
     report to <openssl-bugs@openssl.org>, including the output of
 | 
			
		||||
     "make report" in order to be added to the request tracker at
 | 
			
		||||
     http://www.openssl.org/support/rt2.html.
 | 
			
		||||
    If a test fails, try removing any compiler optimization flags from
 | 
			
		||||
    the CFLAGS line in Makefile.ssl and run "make clean; make". Please
 | 
			
		||||
    send a bug report to <openssl-bugs@openssl.org>, including the
 | 
			
		||||
    output of "make report".
 | 
			
		||||
 | 
			
		||||
  4. If everything tests ok, install OpenSSL with
 | 
			
		||||
 | 
			
		||||
@@ -298,53 +252,3 @@
 | 
			
		||||
 you can still use "no-threads" to suppress an annoying warning message
 | 
			
		||||
 from the Configure script.)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 Note on shared libraries
 | 
			
		||||
 ------------------------
 | 
			
		||||
 | 
			
		||||
 Shared libraries have certain caveats.  Binary backward compatibility
 | 
			
		||||
 can't be guaranteed before OpenSSL version 1.0.  The only reason to
 | 
			
		||||
 use them would be to conserve memory on systems where several programs
 | 
			
		||||
 are using OpenSSL.
 | 
			
		||||
 | 
			
		||||
 For some systems, the OpenSSL Configure script knows what is needed to
 | 
			
		||||
 build shared libraries for libcrypto and libssl.  On these systems,
 | 
			
		||||
 the shared libraries are currently not created by default, but giving
 | 
			
		||||
 the option "shared" will get them created.  This method supports Makefile
 | 
			
		||||
 targets for shared library creation, like linux-shared.  Those targets
 | 
			
		||||
 can currently be used on their own just as well, but this is expected
 | 
			
		||||
 to change in future versions of OpenSSL.
 | 
			
		||||
 | 
			
		||||
 Note on random number generation
 | 
			
		||||
 --------------------------------
 | 
			
		||||
 | 
			
		||||
 Availability of cryptographically secure random numbers is required for
 | 
			
		||||
 secret key generation. OpenSSL provides several options to seed the
 | 
			
		||||
 internal PRNG. If not properly seeded, the internal PRNG will refuse
 | 
			
		||||
 to deliver random bytes and a "PRNG not seeded error" will occur.
 | 
			
		||||
 On systems without /dev/urandom (or similar) device, it may be necessary
 | 
			
		||||
 to install additional support software to obtain random seed.
 | 
			
		||||
 Please check out the manual pages for RAND_add(), RAND_bytes(), RAND_egd(),
 | 
			
		||||
 and the FAQ for more information.
 | 
			
		||||
 | 
			
		||||
 Note on support for multiple builds
 | 
			
		||||
 -----------------------------------
 | 
			
		||||
 | 
			
		||||
 OpenSSL is usually built in its source tree.  Unfortunately, this doesn't
 | 
			
		||||
 support building for multiple platforms from the same source tree very well.
 | 
			
		||||
 It is however possible to build in a separate tree through the use of lots
 | 
			
		||||
 of symbolic links, which should be prepared like this:
 | 
			
		||||
 | 
			
		||||
	mkdir -p objtree/"`uname -s`-`uname -r`-`uname -m`"
 | 
			
		||||
	cd objtree/"`uname -s`-`uname -r`-`uname -m`"
 | 
			
		||||
	(cd $OPENSSL_SOURCE; find . -type f) | while read F; do
 | 
			
		||||
		mkdir -p `dirname $F`
 | 
			
		||||
		rm -f $F; ln -s $OPENSSL_SOURCE/$F $F
 | 
			
		||||
		echo $F '->' $OPENSSL_SOURCE/$F
 | 
			
		||||
	done
 | 
			
		||||
	make -f Makefile.org clean
 | 
			
		||||
 | 
			
		||||
 OPENSSL_SOURCE is an environment variable that contains the absolute (this
 | 
			
		||||
 is important!) path to the OpenSSL source tree.
 | 
			
		||||
 | 
			
		||||
 Also, operations like 'make update' should still be made in the source tree.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,47 +0,0 @@
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
 INSTALLATION ON THE DOS PLATFORM WITH DJGPP
 | 
			
		||||
 -------------------------------------------
 | 
			
		||||
 | 
			
		||||
 OpenSSL has been ported to DJGPP, a Unix look-alike 32-bit run-time
 | 
			
		||||
 environment for 16-bit DOS, but only with long filename support.
 | 
			
		||||
 If you wish to compile on native DOS with 8+3 filenames, you will
 | 
			
		||||
 have to tweak the installation yourself, including renaming files
 | 
			
		||||
 with illegal or duplicate names.
 | 
			
		||||
 | 
			
		||||
 You should have a full DJGPP environment installed, including the
 | 
			
		||||
 latest versions of DJGPP, GCC, BINUTILS, BASH, etc. This package
 | 
			
		||||
 requires that PERL and BC also be installed.
 | 
			
		||||
 | 
			
		||||
 All of these can be obtained from the usual DJGPP mirror sites or
 | 
			
		||||
 directly at "http://www.delorie.com/pub/djgpp". For help on which
 | 
			
		||||
 files to download, see the DJGPP "ZIP PICKER" page at
 | 
			
		||||
 "http://www.delorie.com/djgpp/zip-picker.html". You also need to have
 | 
			
		||||
 the WATT-32 networking package installed before you try to compile
 | 
			
		||||
 OpenSSL. This can be obtained from "http://www.bgnett.no/~giva/".
 | 
			
		||||
 The Makefile assumes that the WATT-32 code is in the directory
 | 
			
		||||
 specified by the environment variable WATT_ROOT. If you have watt-32
 | 
			
		||||
 in directory "watt32" under your main DJGPP directory, specify
 | 
			
		||||
 WATT_ROOT="/dev/env/DJDIR/watt32".
 | 
			
		||||
 | 
			
		||||
 To compile OpenSSL, start your BASH shell, then configure for DJGPP by
 | 
			
		||||
 running "./Configure" with appropriate arguments:
 | 
			
		||||
 | 
			
		||||
	./Configure no-threads --prefix=/dev/env/DJDIR DJGPP
 | 
			
		||||
 
 | 
			
		||||
 And finally fire up "make". You may run out of DPMI selectors when
 | 
			
		||||
 running in a DOS box under Windows. If so, just close the BASH
 | 
			
		||||
 shell, go back to Windows, and restart BASH. Then run "make" again.
 | 
			
		||||
 | 
			
		||||
 RUN-TIME CAVEAT LECTOR
 | 
			
		||||
 --------------
 | 
			
		||||
 | 
			
		||||
 Quoting FAQ:
 | 
			
		||||
 | 
			
		||||
  "Cryptographic software needs a source of unpredictable data to work
 | 
			
		||||
   correctly.  Many open source operating systems provide a "randomness
 | 
			
		||||
   device" (/dev/urandom or /dev/random) that serves this purpose."
 | 
			
		||||
 | 
			
		||||
 As of version 0.9.7f DJGPP port checks upon /dev/urandom$ for a 3rd
 | 
			
		||||
 party "randomness" DOS driver. One such driver, NOISE.SYS, can be
 | 
			
		||||
 obtained from "http://www.rahul.net/dkaufman/index.html".
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
OpenSSL - Port To The Macintosh OS 9 or Earlier
 | 
			
		||||
===============================================
 | 
			
		||||
OpenSSL - Port To The Macintosh
 | 
			
		||||
===============================
 | 
			
		||||
 | 
			
		||||
Thanks to Roy Wood <roy@centricsystems.ca> initial support for Mac OS (pre
 | 
			
		||||
Thanks to Roy Wood <roy@centricsystems.ca> initial support for MacOS (pre
 | 
			
		||||
X) is now provided. "Initial" means that unlike other platforms where you
 | 
			
		||||
get an SDK and a "swiss army" openssl application, on Macintosh you only
 | 
			
		||||
get one sample application which fetches a page over HTTPS(*) and dumps it
 | 
			
		||||
@@ -32,17 +32,17 @@ Installation procedure:
 | 
			
		||||
        to 42, change appropriately.
 | 
			
		||||
(**)	If you use SUNtar, then it might have already unbinhexed the files
 | 
			
		||||
	in question.
 | 
			
		||||
(***)	The project file was saved with CW Pro 5.3. If you have an earlier
 | 
			
		||||
(***)	The project file was saved with CW Pro 5.3. If you have earlier
 | 
			
		||||
	version and it refuses to open it, then download
 | 
			
		||||
	http://www.openssl.org/~appro/OpenSSL.mcp.xml and import it
 | 
			
		||||
	overwriting the original OpenSSL.mcp.
 | 
			
		||||
(****)	Other targets are works in progress. If you feel like giving 'em a
 | 
			
		||||
(****)	Other targets are work in progress. If you feel like giving 'em a
 | 
			
		||||
	shot, then you should know that OpenSSL* and Lib* targets are
 | 
			
		||||
	supposed to be built with the GUSI, MacOS library which mimics
 | 
			
		||||
	BSD sockets and some other POSIX APIs. The GUSI distribution is
 | 
			
		||||
	expected to be found in the same directory as the openssl source tree,
 | 
			
		||||
	i.e., in the parent directory to the one where this very file,
 | 
			
		||||
	namely INSTALL.MacOS, resides. For more information about GUSI, see
 | 
			
		||||
	expected to be found in the same directory as openssl source tree,
 | 
			
		||||
	i.e. in the parent directory to the one where this very file,
 | 
			
		||||
	namely INSTALL.MacOS. For more informations about GUSI, see
 | 
			
		||||
	http://www.iis.ee.ethz.ch/~neeri/macintosh/gusi-qa.html
 | 
			
		||||
 | 
			
		||||
Finally some essential comments from our generous contributor:-)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										444
									
								
								INSTALL.NW
									
									
									
									
									
								
							
							
						
						
									
										444
									
								
								INSTALL.NW
									
									
									
									
									
								
							@@ -1,444 +0,0 @@
 | 
			
		||||
 | 
			
		||||
INSTALLATION ON THE NETWARE PLATFORM
 | 
			
		||||
------------------------------------
 | 
			
		||||
 | 
			
		||||
Notes about building OpenSSL for NetWare.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
BUILD PLATFORM:
 | 
			
		||||
---------------
 | 
			
		||||
The build scripts (batch files, perl scripts, etc) have been developed and
 | 
			
		||||
tested on W2K.  The scripts should run fine on other Windows
 | 
			
		||||
platforms (NT, Win9x, WinXP) but they haven't been tested.  They may require 
 | 
			
		||||
some modifications.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Supported NetWare Platforms - NetWare 5.x, NetWare 6.x:
 | 
			
		||||
------------------------------------------
 | 
			
		||||
OpenSSL uses the WinSock interfaces introduced in NetWare 5.  Therefore,
 | 
			
		||||
previous versions of NetWare, 4.x and 3.x, are not supported.
 | 
			
		||||
 | 
			
		||||
On NetWare there are two c-runtime libraries.  There is the legacy CLIB 
 | 
			
		||||
interfaces and the newer LibC interfaces.  Being ANSI-C libraries, the 
 | 
			
		||||
functionality in CLIB and LibC is similar but the LibC interfaces are built 
 | 
			
		||||
using Novell Kernal Services (NKS) which is designed to leverage 
 | 
			
		||||
multi-processor environments.
 | 
			
		||||
 | 
			
		||||
The NetWare port of OpenSSL can configured to build using CLIB or LibC.  The 
 | 
			
		||||
CLIB build was developed and tested using NetWare 5.0 sp6.0a.  The LibC 
 | 
			
		||||
build was developed and tested using the NetWare 6.0 FCS.  
 | 
			
		||||
 | 
			
		||||
The necessary LibC functionality ships with NetWare 6.  However, earlier 
 | 
			
		||||
NetWare 5.x versions will require updates in order to run the OpenSSL LibC
 | 
			
		||||
build.
 | 
			
		||||
 | 
			
		||||
As of June 2005, the LibC build can be configured to use BSD sockets instead
 | 
			
		||||
of WinSock sockets. Call Configure (usually through netware\build.bat) using
 | 
			
		||||
a target of "netware-libc-bsdsock" instead of "netware-libc".
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
REQUIRED TOOLS:
 | 
			
		||||
---------------
 | 
			
		||||
Based upon the configuration and build options used, some or all of the
 | 
			
		||||
following tools may be required:
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Perl for Win32 - required (http://www.activestate.com/ActivePerl)
 | 
			
		||||
   Used to run the various perl scripts on the build platform.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Perl 5.8.0 for NetWare v3.20 (or later) - required 
 | 
			
		||||
   (http://developer.novell.com) Used to run the test script on NetWare 
 | 
			
		||||
   after building.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Metrowerks CodeWarrior PDK 2.1 (or later) for NetWare - required:
 | 
			
		||||
   Provides command line tools used for building.
 | 
			
		||||
 | 
			
		||||
   Tools:
 | 
			
		||||
   mwccnlm.exe  - C/C++ Compiler for NetWare
 | 
			
		||||
   mwldnlm.exe  - Linker for NetWare
 | 
			
		||||
   mwasmnlm.exe - x86 assembler for NetWare (if using assembly option)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Assemblers - optional:
 | 
			
		||||
   If you intend to build using the assembly options you will need an
 | 
			
		||||
   assembler.  Work has been completed to support two assemblers, Metrowerks
 | 
			
		||||
   and NASM.  However, during development, a bug was found in the Metrowerks
 | 
			
		||||
   assembler which generates incorrect code.  Until this problem is fixed,
 | 
			
		||||
   the Metrowerks assembler cannot be used.
 | 
			
		||||
 | 
			
		||||
   mwasmnlm.exe - Metrowerks x86 assembler - part of CodeWarrior tools.
 | 
			
		||||
         (version 2.2 Built Aug 23, 1999 - not useable due to code
 | 
			
		||||
          generation bug)
 | 
			
		||||
 | 
			
		||||
   nasmw.exe - Netwide Assembler NASM
 | 
			
		||||
         version 0.98 was used in development and testing
 | 
			
		||||
 | 
			
		||||
* Make Tool - required:
 | 
			
		||||
   In order to build you will need a make tool.  Two make tools are
 | 
			
		||||
   supported, GNU make (gmake.exe) or Microsoft nmake.exe.
 | 
			
		||||
 | 
			
		||||
   gmake.exe - GNU make for Windows (version 3.75 used for development)
 | 
			
		||||
         http://www.gnu.org/software/make/make.html
 | 
			
		||||
 | 
			
		||||
   nmake.exe - Microsoft make (Version 6.00.8168.0 used for development)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Novell Developer Kit (NDK) - required: (http://developer.novell.com)
 | 
			
		||||
 | 
			
		||||
   CLIB - BUILDS:
 | 
			
		||||
 | 
			
		||||
      WinSock2 Developer Components for NetWare:
 | 
			
		||||
         For initial development, the October 27, 2000 version was used.
 | 
			
		||||
         However, future versions should also work.
 | 
			
		||||
 | 
			
		||||
         NOTE:  The WinSock2 components include headers & import files for
 | 
			
		||||
         NetWare, but you will also need the winsock2.h and supporting
 | 
			
		||||
         headers (pshpack4.h, poppack.h, qos.h) delivered in the
 | 
			
		||||
         Microsoft SDK.  Note: The winsock2.h support headers may change
 | 
			
		||||
         with various versions of winsock2.h.  Check the dependencies
 | 
			
		||||
         section on the NDK WinSock2 download page for the latest
 | 
			
		||||
         information on dependencies. These components are unsupported by
 | 
			
		||||
         Novell. They are provided as a courtesy, but it is strongly
 | 
			
		||||
         suggested that all development be done using LIBC, not CLIB.
 | 
			
		||||
 | 
			
		||||
         As of June 2005, the WinSock2 components are available at:
 | 
			
		||||
         http://forgeftp.novell.com//ws2comp/
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
      NLM and NetWare libraries for C (including CLIB and XPlat):
 | 
			
		||||
         If you are going to build a CLIB version of OpenSSL, you will
 | 
			
		||||
         need the CLIB headers and imports.  The March, 2001 NDK release or 
 | 
			
		||||
         later is recommended.
 | 
			
		||||
 | 
			
		||||
         Earlier versions should work but haven't been tested.  In recent
 | 
			
		||||
         versions the import files have been consolidated and function
 | 
			
		||||
         names moved.  This means you may run into link problems
 | 
			
		||||
         (undefined symbols) when using earlier versions.   The functions
 | 
			
		||||
         are available in earlier versions, but you will have to modifiy
 | 
			
		||||
         the make files to include additional import files (see
 | 
			
		||||
         openssl\util\pl\netware.pl).
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
   LIBC - BUILDS:
 | 
			
		||||
   
 | 
			
		||||
      Libraries for C (LibC) - LibC headers and import files
 | 
			
		||||
         If you are going to build a LibC version of OpenSSL, you will
 | 
			
		||||
         need the LibC headers and imports.  The March 14, 2002 NDK release or
 | 
			
		||||
         later is required.  
 | 
			
		||||
         
 | 
			
		||||
         NOTE: The LibC SDK includes the necessary WinSock2 support.  It
 | 
			
		||||
         It is not necessary to download the WinSock2 Developer when building
 | 
			
		||||
         for LibC. The LibC SDK also includes the appropriate BSD socket support
 | 
			
		||||
         if configuring to use BSD sockets.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
BUILDING:
 | 
			
		||||
---------
 | 
			
		||||
Before building, you will need to set a few environment variables.  You can
 | 
			
		||||
set them manually or you can modify the "netware\set_env.bat" file.
 | 
			
		||||
 | 
			
		||||
The set_env.bat file is a template you can use to set up the path
 | 
			
		||||
and environment variables you will need to build.  Modify the
 | 
			
		||||
various lines to point to YOUR tools and run set_env.bat.
 | 
			
		||||
 | 
			
		||||
   netware\set_env.bat [target]
 | 
			
		||||
 | 
			
		||||
      target        - "netware-clib" - CLib NetWare build
 | 
			
		||||
                    - "netware-libc" - LibC NetWare build
 | 
			
		||||
 | 
			
		||||
If you don't use set_env.bat, you will need to set up the following
 | 
			
		||||
environment variables:
 | 
			
		||||
 | 
			
		||||
   path - Set path to point to the tools you will use.
 | 
			
		||||
 | 
			
		||||
   MWCIncludes - The location of the NDK include files.
 | 
			
		||||
         
 | 
			
		||||
            CLIB ex: set MWCIncludes=c:\ndk\nwsdk\include\nlm
 | 
			
		||||
            LibC ex: set MWCIncludes=c:\ndk\libc\include
 | 
			
		||||
 | 
			
		||||
   PRELUDE - The absolute path of the prelude object to link with.  For
 | 
			
		||||
            a CLIB build it is recommended you use the "clibpre.o" files shipped
 | 
			
		||||
            with the Metrowerks PDK for NetWare.  For a LibC build you should 
 | 
			
		||||
            use the "libcpre.o" file delivered with the LibC NDK components.
 | 
			
		||||
 | 
			
		||||
            CLIB ex: set PRELUDE=c:\ndk\nwsdk\imports\clibpre.o
 | 
			
		||||
            LibC ex: set PRELUDE=c:\ndk\libc\imports\libcpre.o
 | 
			
		||||
 | 
			
		||||
   IMPORTS - The locaton of the NDK import files.
 | 
			
		||||
 | 
			
		||||
            CLIB ex: set IMPORTS=c:\ndk\nwsdk\imports
 | 
			
		||||
            LibC ex: set IMPORTS=c:\ndk\libc\imports
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
In order to build, you need to run the Perl scripts to configure the build
 | 
			
		||||
process and generate a make file.  There is a batch file,
 | 
			
		||||
"netware\build.bat", to automate the process.
 | 
			
		||||
 | 
			
		||||
Build.bat runs the build configuration scripts and generates a make file.
 | 
			
		||||
If an assembly option is specified, it also runs the scripts to generate 
 | 
			
		||||
the assembly code.  Always run build.bat from the "openssl" directory.
 | 
			
		||||
 | 
			
		||||
   netware\build [target] [debug opts] [assembly opts] [configure opts]
 | 
			
		||||
 | 
			
		||||
      target        - "netware-clib" - CLib NetWare build (WinSock Sockets)
 | 
			
		||||
                    - "netware-libc" - LibC NetWare build (WinSock Sockets)
 | 
			
		||||
                    - "netware-libc-bsdsock" - LibC NetWare build (BSD Sockets)
 | 
			
		||||
 
 | 
			
		||||
      debug opts    - "debug"  - build debug
 | 
			
		||||
 | 
			
		||||
      assembly opts - "nw-mwasm" - use Metrowerks assembler
 | 
			
		||||
                      "nw-nasm"  - use NASM assembler
 | 
			
		||||
                      "no-asm"   - don't use assembly
 | 
			
		||||
 | 
			
		||||
      configure opts- all unrecognized arguments are passed to the
 | 
			
		||||
                      perl configure script
 | 
			
		||||
 | 
			
		||||
   examples:
 | 
			
		||||
 | 
			
		||||
      CLIB build, debug, without assembly:
 | 
			
		||||
         netware\build.bat netware-clib debug no-asm
 | 
			
		||||
 | 
			
		||||
      LibC build, non-debug, using NASM assembly:
 | 
			
		||||
         netware\build.bat netware-libc nw-nasm
 | 
			
		||||
 | 
			
		||||
      LibC build, BSD sockets, non-debug, without assembly:
 | 
			
		||||
         netware\build.bat netware-libc-bsdsock no-asm
 | 
			
		||||
 | 
			
		||||
Running build.bat generates a make file to be processed by your make 
 | 
			
		||||
tool (gmake or nmake):
 | 
			
		||||
 | 
			
		||||
   CLIB ex: gmake -f netware\nlm_clib_dbg.mak 
 | 
			
		||||
   LibC ex: gmake -f netware\nlm_libc.mak 
 | 
			
		||||
   LibC ex: gmake -f netware\nlm_libc_bsdsock.mak 
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
You can also run the build scripts manually if you do not want to use the
 | 
			
		||||
build.bat file.  Run the following scripts in the "\openssl"
 | 
			
		||||
subdirectory (in the order listed below):
 | 
			
		||||
 | 
			
		||||
   perl configure no-asm [other config opts] [netware-clib|netware-libc|netware-libc-bsdsock]
 | 
			
		||||
      configures no assembly build for specified netware environment
 | 
			
		||||
      (CLIB or LibC).
 | 
			
		||||
 | 
			
		||||
   perl util\mkfiles.pl >MINFO
 | 
			
		||||
      generates a listing of source files (used by mk1mf)
 | 
			
		||||
 | 
			
		||||
   perl util\mk1mf.pl no-asm [other config opts] [netware-clib|netware-libc|netware-libc-bsdsock >netware\nlm.mak
 | 
			
		||||
      generates the makefile for NetWare
 | 
			
		||||
 | 
			
		||||
   gmake -f netware\nlm.mak
 | 
			
		||||
      build with the make tool (nmake.exe also works)
 | 
			
		||||
 | 
			
		||||
NOTE:  If you are building using the assembly option, you must also run the
 | 
			
		||||
various Perl scripts to generate the assembly files.  See build.bat
 | 
			
		||||
for an example of running the various assembly scripts.  You must use the
 | 
			
		||||
"no-asm" option to build without assembly.  The configure and mk1mf scripts
 | 
			
		||||
also have various other options.  See the scripts for more information.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
The output from the build is placed in the following directories:
 | 
			
		||||
 | 
			
		||||
   CLIB Debug build:
 | 
			
		||||
      out_nw_clib.dbg     - static libs & test nlm(s)
 | 
			
		||||
      tmp_nw_clib.dbg     - temporary build files
 | 
			
		||||
      outinc_nw_clib      - necessary include files
 | 
			
		||||
 | 
			
		||||
   CLIB Non-debug build:
 | 
			
		||||
      out_nw_clib         - static libs & test nlm(s)
 | 
			
		||||
      tmp_nw_clib         - temporary build files
 | 
			
		||||
      outinc_nw_clib      - necesary include files
 | 
			
		||||
 | 
			
		||||
   LibC Debug build:
 | 
			
		||||
      out_nw_libc.dbg     - static libs & test nlm(s)
 | 
			
		||||
      tmp_nw_libc.dbg     - temporary build files
 | 
			
		||||
      outinc_nw_libc      - necessary include files
 | 
			
		||||
 | 
			
		||||
   LibC Non-debug build:
 | 
			
		||||
      out_nw_libc         - static libs & test nlm(s)
 | 
			
		||||
      tmp_nw_libc         - temporary build files
 | 
			
		||||
      outinc_nw_libc      - necesary include files
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
TESTING:
 | 
			
		||||
--------
 | 
			
		||||
The build process creates the OpenSSL static libs ( crypto.lib, ssl.lib,
 | 
			
		||||
rsaglue.lib ) and several test programs.  You should copy the test programs
 | 
			
		||||
to your NetWare server and run the tests.
 | 
			
		||||
 | 
			
		||||
The batch file "netware\cpy_tests.bat" will copy all the necessary files
 | 
			
		||||
to your server for testing.  In order to run the batch file, you need a
 | 
			
		||||
drive mapped to your target server.  It will create an "OpenSSL" directory
 | 
			
		||||
on the drive and copy the test files to it.  CAUTION: If a directory with the
 | 
			
		||||
name of "OpenSSL" already exists, it will be deleted.
 | 
			
		||||
 | 
			
		||||
To run cpy_tests.bat:
 | 
			
		||||
 | 
			
		||||
   netware\cpy_tests [output directory] [NetWare drive]
 | 
			
		||||
 | 
			
		||||
      output directory - "out_nw_clib.dbg", "out_nw_libc", etc.
 | 
			
		||||
      NetWare drive    - drive letter of mapped drive
 | 
			
		||||
 | 
			
		||||
      CLIB ex: netware\cpy_tests out_nw_clib m:
 | 
			
		||||
      LibC ex: netware\cpy_tests out_nw_libc m:
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
The Perl script, "do_tests.pl", in the "OpenSSL" directory on the server
 | 
			
		||||
should be used to execute the tests.  Before running the script, make sure
 | 
			
		||||
your SEARCH PATH includes the "OpenSSL" directory.  For example, if you
 | 
			
		||||
copied the files to the "sys:" volume you use the command:
 | 
			
		||||
 | 
			
		||||
   SEARCH ADD SYS:\OPENSSL
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
To run do_tests.pl type (at the console prompt):
 | 
			
		||||
 | 
			
		||||
   perl \openssl\do_tests.pl [options]
 | 
			
		||||
 | 
			
		||||
      options:
 | 
			
		||||
         -p    - pause after executing each test
 | 
			
		||||
 | 
			
		||||
The do_tests.pl script generates a log file "\openssl\test_out\tests.log"
 | 
			
		||||
which should be reviewed for errors.  Any errors will be denoted by the word
 | 
			
		||||
"ERROR" in the log.
 | 
			
		||||
 | 
			
		||||
DEVELOPING WITH THE OPENSSL SDK:
 | 
			
		||||
--------------------------------
 | 
			
		||||
Now that everything is built and tested, you are ready to use the OpenSSL
 | 
			
		||||
libraries in your development.
 | 
			
		||||
 | 
			
		||||
There is no real installation procedure, just copy the static libs and
 | 
			
		||||
headers to your build location.  The libs (crypto.lib & ssl.lib) are
 | 
			
		||||
located in the appropriate "out_nw_XXXX" directory 
 | 
			
		||||
(out_nw_clib, out_nw_libc, etc).  
 | 
			
		||||
 | 
			
		||||
The headers are located in the appropriate "outinc_nw_XXX" directory 
 | 
			
		||||
(outinc_nw_clib, outinc_nw_libc).  
 | 
			
		||||
 | 
			
		||||
One suggestion is to create the following directory 
 | 
			
		||||
structure for the OpenSSL SDK:
 | 
			
		||||
 | 
			
		||||
   \openssl
 | 
			
		||||
      |- bin
 | 
			
		||||
      |   |- openssl.nlm
 | 
			
		||||
      |   |- (other tests you want)
 | 
			
		||||
      |
 | 
			
		||||
      |- lib
 | 
			
		||||
      |   | - crypto.lib
 | 
			
		||||
      |   | - ssl.lib
 | 
			
		||||
      |
 | 
			
		||||
      |- include
 | 
			
		||||
      |   | - openssl
 | 
			
		||||
      |   |    | - (all the headers in "outinc_nw\openssl")
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
The program "openssl.nlm" can be very useful.  It has dozens of
 | 
			
		||||
options and you may want to keep it handy for debugging, testing, etc.
 | 
			
		||||
 | 
			
		||||
When building your apps using OpenSSL, define "NETWARE".  It is needed by
 | 
			
		||||
some of the OpenSSL headers.  One way to do this is with a compile option,
 | 
			
		||||
for example "-DNETWARE".
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
NOTES:
 | 
			
		||||
------
 | 
			
		||||
 | 
			
		||||
Resource leaks in Tests
 | 
			
		||||
------------------------
 | 
			
		||||
Some OpenSSL tests do not clean up resources and NetWare reports
 | 
			
		||||
the resource leaks when the tests unload.  If this really bugs you,
 | 
			
		||||
you can stop the messages by setting the developer option off at the console
 | 
			
		||||
prompt (set developer option = off).  Or better yet, fix the tests to
 | 
			
		||||
clean up the resources!
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Multi-threaded Development
 | 
			
		||||
---------------------------
 | 
			
		||||
The NetWare version of OpenSSL is thread-safe however, multi-threaded
 | 
			
		||||
applications must provide the necessary locking function callbacks.  This
 | 
			
		||||
is described in doc\threads.doc.  The file "openssl\crypto\threads\mttest.c"
 | 
			
		||||
is a multi-threaded test program and demonstrates the locking functions.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
What is openssl2.nlm?
 | 
			
		||||
---------------------
 | 
			
		||||
The openssl program has numerous options and can be used for many different
 | 
			
		||||
things.  Many of the options operate in an interactive mode requiring the
 | 
			
		||||
user to enter data.  Because of this, a default screen is created for the
 | 
			
		||||
program.  However, when running the test script it is not desirable to
 | 
			
		||||
have a seperate screen.  Therefore, the build also creates openssl2.nlm.
 | 
			
		||||
Openssl2.nlm is functionally identical but uses the console screen.
 | 
			
		||||
Openssl2 can be used when a non-interactive mode is desired.
 | 
			
		||||
 | 
			
		||||
NOTE:  There are may other possibilities (command line options, etc)
 | 
			
		||||
which could have been used to address the screen issue.  The openssl2.nlm
 | 
			
		||||
option was chosen because it impacted only the build not the code.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Why only static libraries?
 | 
			
		||||
--------------------------
 | 
			
		||||
Globals, globals, and more globals.  The OpenSSL code uses many global
 | 
			
		||||
variables that are allocated and initialized when used for the first time.
 | 
			
		||||
 | 
			
		||||
On NetWare, most applications (at least historically) run in the kernel.
 | 
			
		||||
When running in the kernel, there is one instance of global variables.
 | 
			
		||||
For regular application type NLM(s) this isn't a problem because they are
 | 
			
		||||
the only ones using the globals.  However, for a library NLM (an NLM which
 | 
			
		||||
exposes functions and has no threads of execution), the globals cause
 | 
			
		||||
problems.  Applications could inadvertently step on each other if they
 | 
			
		||||
change some globals.  Even worse, the first application that triggers a
 | 
			
		||||
global to be allocated and initialized has the allocated memory charged to
 | 
			
		||||
itself.  Now when that application unloads, NetWare will clean up all the
 | 
			
		||||
applicaton's memory.  The global pointer variables inside OpenSSL now
 | 
			
		||||
point to freed memory.  An abend waiting to happen!
 | 
			
		||||
 | 
			
		||||
To work correctly in the kernel, library NLM(s) that use globals need to
 | 
			
		||||
provide a set of globals (instance data) for each application.  Another
 | 
			
		||||
option is to require the library only be loaded in a protected address
 | 
			
		||||
space along with the application using it.
 | 
			
		||||
 | 
			
		||||
Modifying the OpenSSL code to provide a set of globals (instance data) for
 | 
			
		||||
each application isn't technically difficult, but due to the large number
 | 
			
		||||
globals it would require substantial code changes and it wasn't done.  Hence,
 | 
			
		||||
the build currently only builds static libraries which are then linked
 | 
			
		||||
into each application.
 | 
			
		||||
 | 
			
		||||
NOTE:  If you are building a library NLM that uses the OpenSSL static
 | 
			
		||||
libraries, you will still have to deal with the global variable issue.
 | 
			
		||||
This is because when you link in the OpenSSL code you bring in all the
 | 
			
		||||
globals.  One possible solution for the global pointer variables is to
 | 
			
		||||
register memory functions with OpenSSL which allocate memory and charge it
 | 
			
		||||
to your library NLM (see the function CRYPTO_set_mem_functions).  However,
 | 
			
		||||
be aware that now all memory allocated by OpenSSL is charged to your NLM.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
CodeWarrior Tools and W2K
 | 
			
		||||
---------------------------
 | 
			
		||||
There have been problems reported with the CodeWarrior Linker
 | 
			
		||||
(mwldnlm.exe) in the PDK 2.1 for NetWare when running on Windows 2000.  The
 | 
			
		||||
problems cause the link step to fail.  The only work around is to obtain an
 | 
			
		||||
updated linker from Metrowerks.  It is expected Metrowerks will release
 | 
			
		||||
PDK 3.0 (in beta testing at this time - May, 2001) in the near future which
 | 
			
		||||
will fix these problems.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Makefile "vclean"
 | 
			
		||||
------------------
 | 
			
		||||
The generated makefile has a "vclean" target which cleans up the build
 | 
			
		||||
directories.  If you have been building successfully and suddenly
 | 
			
		||||
experience problems, use "vclean" (gmake -f netware\nlm.mak vclean) and retry.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
"Undefined Symbol" Linker errors
 | 
			
		||||
--------------------------------
 | 
			
		||||
There have been linker errors reported when doing a CLIB build.  The problems
 | 
			
		||||
occur because some versions of the CLIB SDK import files inadvertently 
 | 
			
		||||
left out some symbols.  One symbol in particular is "_lrotl".  The missing
 | 
			
		||||
functions are actually delivered in the binaries, but they were left out of
 | 
			
		||||
the import files.  The issues should be fixed in the September 2001 release 
 | 
			
		||||
of the NDK.  If you experience the problems you can temporarily
 | 
			
		||||
work around it by manually adding the missing symbols to your version of 
 | 
			
		||||
"clib.imp".
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										31
									
								
								INSTALL.OS2
									
									
									
									
									
								
							
							
						
						
									
										31
									
								
								INSTALL.OS2
									
									
									
									
									
								
							@@ -1,31 +0,0 @@
 | 
			
		||||
 
 | 
			
		||||
 Installation on OS/2
 | 
			
		||||
 --------------------
 | 
			
		||||
 | 
			
		||||
 You need to have the following tools installed:
 | 
			
		||||
 | 
			
		||||
  * EMX GCC
 | 
			
		||||
  * PERL
 | 
			
		||||
  * GNU make
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 To build the makefile, run
 | 
			
		||||
 | 
			
		||||
 > os2\os2-emx
 | 
			
		||||
 | 
			
		||||
 This will configure OpenSSL and create OS2-EMX.mak which you then use to 
 | 
			
		||||
 build the OpenSSL libraries & programs by running
 | 
			
		||||
 | 
			
		||||
 > make -f os2-emx.mak
 | 
			
		||||
 | 
			
		||||
 If that finishes successfully you will find the libraries and programs in the
 | 
			
		||||
 "out" directory.
 | 
			
		||||
 | 
			
		||||
 Alternatively, you can make a dynamic build that puts the library code into
 | 
			
		||||
 crypto.dll and ssl.dll by running
 | 
			
		||||
 | 
			
		||||
 > make -f os2-emx-dll.mak
 | 
			
		||||
 | 
			
		||||
 This will build the above mentioned dlls and a matching pair of import
 | 
			
		||||
 libraries in the "out_dll" directory along with the set of test programs
 | 
			
		||||
 and the openssl application.
 | 
			
		||||
							
								
								
									
										39
									
								
								INSTALL.VMS
									
									
									
									
									
								
							
							
						
						
									
										39
									
								
								INSTALL.VMS
									
									
									
									
									
								
							@@ -8,7 +8,6 @@ Intro:
 | 
			
		||||
 | 
			
		||||
This file is divided in the following parts:
 | 
			
		||||
 | 
			
		||||
  Requirements			- Mandatory reading.
 | 
			
		||||
  Checking the distribution	- Mandatory reading.
 | 
			
		||||
  Compilation			- Mandatory reading.
 | 
			
		||||
  Logical names			- Mandatory reading.
 | 
			
		||||
@@ -20,24 +19,15 @@ This file is divided in the following parts:
 | 
			
		||||
  TODO				- Things that are to come.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Requirements:
 | 
			
		||||
=============
 | 
			
		||||
 | 
			
		||||
To build and install OpenSSL, you will need:
 | 
			
		||||
 | 
			
		||||
 * DEC C or some other ANSI C compiler.  VAX C is *not* supported.
 | 
			
		||||
   [Note: OpenSSL has only been tested with DEC C.  Compiling with 
 | 
			
		||||
    a different ANSI C compiler may require some work]
 | 
			
		||||
 | 
			
		||||
Checking the distribution:
 | 
			
		||||
==========================
 | 
			
		||||
 | 
			
		||||
There have been reports of places where the distribution didn't quite get
 | 
			
		||||
through, for example if you've copied the tree from a NFS-mounted Unix
 | 
			
		||||
through, for example if you've copied the tree from a NFS-mounted unix
 | 
			
		||||
mount point.
 | 
			
		||||
 | 
			
		||||
The easiest way to check if everything got through as it should is to check
 | 
			
		||||
for one of the following files:
 | 
			
		||||
for oen of the following files:
 | 
			
		||||
 | 
			
		||||
	[.CRYPTO]OPENSSLCONF.H_IN
 | 
			
		||||
	[.CRYPTO]OPENSSLCONF_H.IN
 | 
			
		||||
@@ -69,7 +59,7 @@ for a command procedure name xxx-LIB.COM (in the library directories)
 | 
			
		||||
or MAKExxx.COM (in the program directories) and read the comments at
 | 
			
		||||
the top to understand how to use them.  However, if you want to
 | 
			
		||||
compile all you can get, the simplest is to use MAKEVMS.COM in the top
 | 
			
		||||
directory.  The syntax is the following:
 | 
			
		||||
directory.  The syntax is trhe following:
 | 
			
		||||
 | 
			
		||||
  @MAKEVMS <option> <rsaref-p> <debug-p> [<compiler>]
 | 
			
		||||
 | 
			
		||||
@@ -79,7 +69,7 @@ directory.  The syntax is the following:
 | 
			
		||||
      CONFIG    Just build the "[.CRYPTO]OPENSSLCONF.H" file.
 | 
			
		||||
      BUILDINF  Just build the "[.INCLUDE]BUILDINF.H" file.
 | 
			
		||||
      SOFTLINKS Just copies some files, to simulate Unix soft links.
 | 
			
		||||
      BUILDALL  Same as ALL, except CONFIG, BUILDINF and SOFTLINKS aren't done.
 | 
			
		||||
      BUILDALL  Same as ALL, except CONFIG, BUILDINF and SOFTILNKS aren't done.
 | 
			
		||||
      RSAREF    Just build the "[.xxx.EXE.RSAREF]LIBRSAGLUE.OLB" library.
 | 
			
		||||
      CRYPTO    Just build the "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library.
 | 
			
		||||
      SSL       Just build the "[.xxx.EXE.SSL]LIBSSL.OLB" library.
 | 
			
		||||
@@ -92,17 +82,12 @@ directory.  The syntax is the following:
 | 
			
		||||
      RSAREF    compile using the RSAREF Library
 | 
			
		||||
      NORSAREF  compile without using RSAREF
 | 
			
		||||
 | 
			
		||||
Note 0: The RSAREF library IS NO LONGER NEEDED.  The RSA patent
 | 
			
		||||
        expires September 20, 2000, and RSA Security chose to make
 | 
			
		||||
        the algorithm public domain two weeks before that.
 | 
			
		||||
 | 
			
		||||
Note 1: If you still want to use RSAREF, the library is NOT INCLUDED
 | 
			
		||||
        and you have to download it.  RSA Security doesn't carry it
 | 
			
		||||
        any more, but there are a number of places where you can find
 | 
			
		||||
        it.  You have to get the ".tar-Z" file as the ".zip" file
 | 
			
		||||
        doesn't have the directory structure stored.  You have to
 | 
			
		||||
        extract the file into the [.RSAREF] directory as that is where
 | 
			
		||||
        the scripts will look for the files.
 | 
			
		||||
Note 1: The RSAREF libraries are NOT INCLUDED and you have to
 | 
			
		||||
        download it from "ftp://ftp.rsa.com/rsaref".  You have to
 | 
			
		||||
        get the ".tar-Z" file as the ".zip" file doesn't have the
 | 
			
		||||
        directory structure stored.  You have to extract the file
 | 
			
		||||
        into the [.RSAREF] directory as that is where the scripts
 | 
			
		||||
        will look for the files.
 | 
			
		||||
 | 
			
		||||
Note 2: I have never done this, so I've no idea if it works or not.
 | 
			
		||||
 | 
			
		||||
@@ -144,7 +129,7 @@ Currently, the logical names supported are:
 | 
			
		||||
                        used.  This is good to try if something doesn't work.
 | 
			
		||||
      OPENSSL_NO_'alg'  with value YES, the corresponding crypto algorithm
 | 
			
		||||
                        will not be implemented.  Supported algorithms to
 | 
			
		||||
                        do this with are: RSA, DSA, DH, MD2, MD4, MD5, RIPEMD,
 | 
			
		||||
                        do this with are: RSA, DSA, DH, MD2, MD5, RIPEMD,
 | 
			
		||||
                        SHA, DES, MDC2, CR2, RC4, RC5, IDEA, BF, CAST, HMAC,
 | 
			
		||||
                        SSL2.  So, for example, having the logical name
 | 
			
		||||
                        OPENSSL_NO_RSA with the value YES means that the
 | 
			
		||||
@@ -264,7 +249,7 @@ following before you start compiling:
 | 
			
		||||
The USER_CCDISABLEWARNINGS is there because otherwise, DEC C will complain
 | 
			
		||||
that those macros have been changed.
 | 
			
		||||
 | 
			
		||||
Note: Currently, this is only useful for library compilation.  The
 | 
			
		||||
Note: Currently, this is only usefull for library compilation.  The
 | 
			
		||||
      programs will still be linked with the current version of the
 | 
			
		||||
      C library shareable image, and will thus complain if they are
 | 
			
		||||
      faced with an older version of the same C library shareable image.
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										208
									
								
								INSTALL.W32
									
									
									
									
									
								
							
							
						
						
									
										208
									
								
								INSTALL.W32
									
									
									
									
									
								
							@@ -2,29 +2,16 @@
 | 
			
		||||
 INSTALLATION ON THE WIN32 PLATFORM
 | 
			
		||||
 ----------------------------------
 | 
			
		||||
 | 
			
		||||
 [Instructions for building for Windows CE can be found in INSTALL.WCE]
 | 
			
		||||
 [Instructions for building for Win64 can be found in INSTALL.W64]
 | 
			
		||||
 | 
			
		||||
 Heres a few comments about building OpenSSL in Windows environments.  Most
 | 
			
		||||
 of this is tested on Win32 but it may also work in Win 3.1 with some
 | 
			
		||||
 Heres a few comments about building OpenSSL in Windows environments. Most of
 | 
			
		||||
 this is tested on Win32 but it may also work in Win 3.1 with some
 | 
			
		||||
 modification.
 | 
			
		||||
 | 
			
		||||
 You need Perl for Win32.  Unless you will build on Cygwin, you will need
 | 
			
		||||
 ActiveState Perl, available from http://www.activestate.com/ActivePerl.
 | 
			
		||||
 | 
			
		||||
 You need Perl for Win32 (available from http://www.activestate.com/ActivePerl)
 | 
			
		||||
 and one of the following C compilers:
 | 
			
		||||
 | 
			
		||||
  * Visual C++
 | 
			
		||||
  * Borland C
 | 
			
		||||
  * GNU C (Cygwin or MinGW)
 | 
			
		||||
 | 
			
		||||
 If you are compiling from a tarball or a CVS snapshot then the Win32 files
 | 
			
		||||
 may well be not up to date. This may mean that some "tweaking" is required to
 | 
			
		||||
 get it all to work. See the trouble shooting section later on for if (when?)
 | 
			
		||||
 it goes wrong.
 | 
			
		||||
 | 
			
		||||
 Visual C++
 | 
			
		||||
 ----------
 | 
			
		||||
  * GNU C (Mingw32 or Cygwin32)
 | 
			
		||||
 | 
			
		||||
 If you want to compile in the assembly language routines with Visual C++ then
 | 
			
		||||
 you will need an assembler. This is worth doing because it will result in
 | 
			
		||||
@@ -34,24 +21,29 @@
 | 
			
		||||
  * Microsoft MASM (aka "ml")
 | 
			
		||||
  * Free Netwide Assembler NASM.
 | 
			
		||||
 | 
			
		||||
 MASM is distributed with most versions of VC++. For the versions where it is
 | 
			
		||||
 not included in VC++, it is also distributed with some Microsoft DDKs, for
 | 
			
		||||
 example the Windows NT 4.0 DDK and the Windows 98 DDK. If you do not have
 | 
			
		||||
 either of these DDKs then you can just download the binaries for the Windows
 | 
			
		||||
 98 DDK and extract and rename the two files XXXXXml.exe and XXXXXml.err, to
 | 
			
		||||
 ml.exe and ml.err and install somewhere on your PATH. Both DDKs can be
 | 
			
		||||
 downloaded from the Microsoft developers site www.msdn.com.
 | 
			
		||||
 MASM was at one point distributed with VC++. It is now distributed with some
 | 
			
		||||
 Microsoft DDKs, for example the Windows NT 4.0 DDK and the Windows 98 DDK. If
 | 
			
		||||
 you do not have either of these DDKs then you can just download the binaries
 | 
			
		||||
 for the Windows 98 DDK and extract and rename the two files XXXXXml.exe and
 | 
			
		||||
 XXXXXml.err, to ml.exe and ml.err and install somewhere on your PATH. Both
 | 
			
		||||
 DDKs can be downloaded from the Microsoft developers site www.msdn.com.
 | 
			
		||||
 | 
			
		||||
 NASM is freely available. Version 0.98 was used during testing: other versions
 | 
			
		||||
 may also work. It is available from many places, see for example:
 | 
			
		||||
 http://www.kernel.org/pub/software/devel/nasm/binaries/win32/
 | 
			
		||||
 The NASM binary nasmw.exe needs to be installed anywhere on your PATH.
 | 
			
		||||
 | 
			
		||||
 If you are compiling from a tarball or a CVS snapshot then the Win32 files
 | 
			
		||||
 may well be not up to date. This may mean that some "tweaking" is required to
 | 
			
		||||
 get it all to work. See the trouble shooting section later on for if (when?)
 | 
			
		||||
 it goes wrong.
 | 
			
		||||
 | 
			
		||||
 Visual C++
 | 
			
		||||
 ----------
 | 
			
		||||
 | 
			
		||||
 Firstly you should run Configure:
 | 
			
		||||
 | 
			
		||||
 > perl Configure VC-WIN32 --prefix=c:/some/openssl/dir
 | 
			
		||||
 | 
			
		||||
Where the prefix argument specifies where OpenSSL will be installed to.
 | 
			
		||||
 > perl Configure VC-WIN32
 | 
			
		||||
 | 
			
		||||
 Next you need to build the Makefiles and optionally the assembly language
 | 
			
		||||
 files:
 | 
			
		||||
@@ -79,26 +71,15 @@ Where the prefix argument specifies where OpenSSL will be installed to.
 | 
			
		||||
 If all is well it should compile and you will have some DLLs and executables
 | 
			
		||||
 in out32dll. If you want to try the tests then do:
 | 
			
		||||
 
 | 
			
		||||
 > nmake -f ms\ntdll.mak test
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
To install OpenSSL to the specified location do:
 | 
			
		||||
 | 
			
		||||
> nmake -f ms\ntdll.mak install
 | 
			
		||||
 > cd out32dll
 | 
			
		||||
 > ..\ms\test
 | 
			
		||||
 | 
			
		||||
 Tweaks:
 | 
			
		||||
 | 
			
		||||
 There are various changes you can make to the Win32 compile environment. By
 | 
			
		||||
 default the library is not compiled with debugging symbols. If you add 'debug'
 | 
			
		||||
 to the mk1mf.pl lines in the do_* batch file then debugging symbols will be
 | 
			
		||||
 compiled in. Note that mk1mf.pl expects the platform to be the last argument
 | 
			
		||||
 on the command line, so 'debug' must appear before that, as all other options.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 By default in 0.9.8 OpenSSL will compile builtin ENGINES into the libeay32.dll
 | 
			
		||||
 shared library. If you specify the "no-static-engine" option on the command
 | 
			
		||||
 line to Configure the shared library build (ms\ntdll.mak) will compile the
 | 
			
		||||
 engines as separate DLLs.
 | 
			
		||||
 to the mk1mk.pl lines in the do_* batch file then debugging symbols will be
 | 
			
		||||
 compiled in.
 | 
			
		||||
 | 
			
		||||
 The default Win32 environment is to leave out any Windows NT specific
 | 
			
		||||
 features.
 | 
			
		||||
@@ -110,20 +91,6 @@ To install OpenSSL to the specified location do:
 | 
			
		||||
 You can also build a static version of the library using the Makefile
 | 
			
		||||
 ms\nt.mak
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 Borland C++ builder 5
 | 
			
		||||
 ---------------------
 | 
			
		||||
 | 
			
		||||
 * Configure for building with Borland Builder:
 | 
			
		||||
   > perl Configure BC-32
 | 
			
		||||
 | 
			
		||||
 * Create the appropriate makefile
 | 
			
		||||
   > ms\do_nasm
 | 
			
		||||
 | 
			
		||||
 * Build
 | 
			
		||||
   > make -f ms\bcb.mak
 | 
			
		||||
 | 
			
		||||
 Borland C++ builder 3 and 4
 | 
			
		||||
 ---------------------------
 | 
			
		||||
 | 
			
		||||
@@ -134,81 +101,25 @@ To install OpenSSL to the specified location do:
 | 
			
		||||
 * Run make:
 | 
			
		||||
   > make -f bcb.mak
 | 
			
		||||
 | 
			
		||||
 GNU C (Cygwin)
 | 
			
		||||
 --------------
 | 
			
		||||
 GNU C (Mingw32)
 | 
			
		||||
 ---------------
 | 
			
		||||
 | 
			
		||||
 Cygwin provides a bash shell and GNU tools environment running
 | 
			
		||||
 on NT 4.0, Windows 9x, Windows ME, Windows 2000, and Windows XP.
 | 
			
		||||
 Consequently, a make of OpenSSL with Cygwin is closer to a GNU
 | 
			
		||||
 bash environment such as Linux than to other the other Win32
 | 
			
		||||
 makes.
 | 
			
		||||
 | 
			
		||||
 Cygwin implements a Posix/Unix runtime system (cygwin1.dll).
 | 
			
		||||
 It is also possible to create Win32 binaries that only use the
 | 
			
		||||
 Microsoft C runtime system (msvcrt.dll or crtdll.dll) using
 | 
			
		||||
 MinGW. MinGW can be used in the Cygwin development environment
 | 
			
		||||
 or in a standalone setup as described in the following section.
 | 
			
		||||
 | 
			
		||||
 To build OpenSSL using Cygwin:
 | 
			
		||||
 | 
			
		||||
 * Install Cygwin (see http://cygwin.com/)
 | 
			
		||||
 | 
			
		||||
 * Install Perl and ensure it is in the path. Both Cygwin perl
 | 
			
		||||
   (5.6.1-2 or newer) and ActivePerl work.
 | 
			
		||||
 | 
			
		||||
 * Run the Cygwin bash shell
 | 
			
		||||
 | 
			
		||||
 * $ tar zxvf openssl-x.x.x.tar.gz
 | 
			
		||||
   $ cd openssl-x.x.x
 | 
			
		||||
 | 
			
		||||
   To build the Cygwin version of OpenSSL:
 | 
			
		||||
 | 
			
		||||
   $ ./config
 | 
			
		||||
   [...]
 | 
			
		||||
   $ make
 | 
			
		||||
   [...]
 | 
			
		||||
   $ make test
 | 
			
		||||
   $ make install
 | 
			
		||||
 | 
			
		||||
   This will create a default install in /usr/local/ssl.
 | 
			
		||||
 | 
			
		||||
   To build the MinGW version (native Windows) in Cygwin:
 | 
			
		||||
 | 
			
		||||
   $ ./Configure mingw
 | 
			
		||||
   [...]
 | 
			
		||||
   $ make
 | 
			
		||||
   [...]
 | 
			
		||||
   $ make test
 | 
			
		||||
   $ make install
 | 
			
		||||
 | 
			
		||||
 Cygwin Notes:
 | 
			
		||||
 | 
			
		||||
 "make test" and normal file operations may fail in directories
 | 
			
		||||
 mounted as text (i.e. mount -t c:\somewhere /home) due to Cygwin
 | 
			
		||||
 stripping of carriage returns. To avoid this ensure that a binary
 | 
			
		||||
 mount is used, e.g. mount -b c:\somewhere /home.
 | 
			
		||||
 | 
			
		||||
 "bc" is not provided in older Cygwin distribution.  This causes a
 | 
			
		||||
 non-fatal error in "make test" but is otherwise harmless.  If
 | 
			
		||||
 desired and needed, GNU bc can be built with Cygwin without change.
 | 
			
		||||
 | 
			
		||||
 GNU C (MinGW)
 | 
			
		||||
 -------------
 | 
			
		||||
 To build OpenSSL, you need the Mingw32 package and GNU make.
 | 
			
		||||
 | 
			
		||||
 * Compiler installation:
 | 
			
		||||
 | 
			
		||||
   MinGW is available from http://www.mingw.org. Run the installer and
 | 
			
		||||
   set the MinGW bin directory to the PATH in "System Properties" or
 | 
			
		||||
   autoexec.bat.
 | 
			
		||||
   Mingw32 is available from <ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/
 | 
			
		||||
   mingw32/egcs-1.1.2/egcs-1.1.2-mingw32.zip>. GNU make is at
 | 
			
		||||
   <ftp://agnes.dida.physik.uni-essen.de/home/janjaap/mingw32/binaries/
 | 
			
		||||
   make-3.76.1.zip>. Install both of them in C:\egcs-1.1.2 and run
 | 
			
		||||
   C:\egcs-1.1.2\mingw32.bat to set the PATH.
 | 
			
		||||
 | 
			
		||||
 * Compile OpenSSL:
 | 
			
		||||
 | 
			
		||||
   > ms\mingw32
 | 
			
		||||
   > perl Configure Mingw32
 | 
			
		||||
   > ms\mw.bat
 | 
			
		||||
 | 
			
		||||
   This will create the library and binaries in out. In case any problems
 | 
			
		||||
   occur, try
 | 
			
		||||
   > ms\mingw32 no-asm
 | 
			
		||||
   instead.
 | 
			
		||||
   This will create the library and binaries in out.
 | 
			
		||||
 | 
			
		||||
   libcrypto.a and libssl.a are the static libraries. To use the DLLs,
 | 
			
		||||
   link with libeay32.a and libssl32.a instead.
 | 
			
		||||
@@ -221,37 +132,6 @@ To install OpenSSL to the specified location do:
 | 
			
		||||
   > cd out
 | 
			
		||||
   > ..\ms\test
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 Installation
 | 
			
		||||
 ------------
 | 
			
		||||
 | 
			
		||||
 If you used the Cygwin procedure above, you have already installed and
 | 
			
		||||
 can skip this section.  For all other procedures, there's currently no real
 | 
			
		||||
 installation procedure for Win32.  There are, however, some suggestions:
 | 
			
		||||
 | 
			
		||||
    - do nothing.  The include files are found in the inc32/ subdirectory,
 | 
			
		||||
      all binaries are found in out32dll/ or out32/ depending if you built
 | 
			
		||||
      dynamic or static libraries.
 | 
			
		||||
 | 
			
		||||
    - do as is written in INSTALL.Win32 that comes with modssl:
 | 
			
		||||
 | 
			
		||||
	$ md c:\openssl 
 | 
			
		||||
	$ md c:\openssl\bin
 | 
			
		||||
	$ md c:\openssl\lib
 | 
			
		||||
	$ md c:\openssl\include
 | 
			
		||||
	$ md c:\openssl\include\openssl
 | 
			
		||||
	$ copy /b inc32\openssl\*       c:\openssl\include\openssl
 | 
			
		||||
	$ copy /b out32dll\ssleay32.lib c:\openssl\lib
 | 
			
		||||
	$ copy /b out32dll\libeay32.lib c:\openssl\lib
 | 
			
		||||
	$ copy /b out32dll\ssleay32.dll c:\openssl\bin
 | 
			
		||||
	$ copy /b out32dll\libeay32.dll c:\openssl\bin
 | 
			
		||||
	$ copy /b out32dll\openssl.exe  c:\openssl\bin
 | 
			
		||||
 | 
			
		||||
      Of course, you can choose another device than c:.  C: is used here
 | 
			
		||||
      because that's usually the first (and often only) harddisk device.
 | 
			
		||||
      Note: in the modssl INSTALL.Win32, p: is used rather than c:.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 Troubleshooting
 | 
			
		||||
 ---------------
 | 
			
		||||
 | 
			
		||||
@@ -299,23 +179,5 @@ To install OpenSSL to the specified location do:
 | 
			
		||||
 malloc(), free() and realloc() as the application.  However there are many
 | 
			
		||||
 standard library functions used by OpenSSL that call malloc() internally
 | 
			
		||||
 (e.g. fopen()), and OpenSSL cannot change these; so in general you cannot
 | 
			
		||||
 rely on CRYPTO_malloc_init() solving your problem, and you should
 | 
			
		||||
 rely on CYRPTO_malloc_init() solving your problem, and you should
 | 
			
		||||
 consistently use the multithreaded library.
 | 
			
		||||
 | 
			
		||||
 Linking your application
 | 
			
		||||
 ------------------------
 | 
			
		||||
 | 
			
		||||
 If you link with static OpenSSL libraries [those built with ms/nt.mak],
 | 
			
		||||
 then you're expected to additionally link your application with
 | 
			
		||||
 WSOCK32.LIB, ADVAPI32.LIB, GDI32.LIB and USER32.LIB. Those developing
 | 
			
		||||
 non-interactive service applications might feel concerned about linking
 | 
			
		||||
 with latter two, as they are justly associated with interactive desktop,
 | 
			
		||||
 which is not available to service processes. The toolkit is designed
 | 
			
		||||
 to detect in which context it's currently executed, GUI, console app
 | 
			
		||||
 or service, and act accordingly, namely whether or not to actually make
 | 
			
		||||
 GUI calls.
 | 
			
		||||
 | 
			
		||||
 If you link with OpenSSL .DLLs, then you're expected to include into
 | 
			
		||||
 your application code small "shim" snippet, which provides glue between
 | 
			
		||||
 OpenSSL BIO layer and your compiler run-time. Look up OPENSSL_Applink
 | 
			
		||||
 reference page for further details.
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										66
									
								
								INSTALL.W64
									
									
									
									
									
								
							
							
						
						
									
										66
									
								
								INSTALL.W64
									
									
									
									
									
								
							@@ -1,66 +0,0 @@
 | 
			
		||||
 | 
			
		||||
 INSTALLATION ON THE WIN64 PLATFORM
 | 
			
		||||
 ----------------------------------
 | 
			
		||||
 | 
			
		||||
 Caveat lector
 | 
			
		||||
 -------------
 | 
			
		||||
 | 
			
		||||
 As of moment of this writing Win64 support is classified "initial"
 | 
			
		||||
 for the following reasons.
 | 
			
		||||
 | 
			
		||||
 - No assembler modules are engaged upon initial 0.9.8 release.
 | 
			
		||||
 - API might change within 0.9.8 life-span, *but* in a manner which
 | 
			
		||||
   doesn't break backward binary compatibility. Or in other words,
 | 
			
		||||
   application programs compiled with initial 0.9.8 headers will
 | 
			
		||||
   be expected to work with future minor release .DLL without need
 | 
			
		||||
   to re-compile, even if future minor release features modified API.
 | 
			
		||||
 - Above mentioned API modifications have everything to do with
 | 
			
		||||
   elimination of a number of limitations, which are normally
 | 
			
		||||
   considered inherent to 32-bit platforms. Which in turn is why they
 | 
			
		||||
   are treated as limitations on 64-bit platform such as Win64:-)
 | 
			
		||||
   The current list comprises [but not necessarily limited to]:
 | 
			
		||||
 | 
			
		||||
   - null-terminated strings may not be longer than 2G-1 bytes,
 | 
			
		||||
     longer strings are treated as zero-length;
 | 
			
		||||
   - dynamically and *internally* allocated chunks can't be larger
 | 
			
		||||
     than 2G-1 bytes;
 | 
			
		||||
   - inability to encrypt/decrypt chunks of data larger than 4GB
 | 
			
		||||
     [it's possibly to *hash* chunks of arbitrary size through];
 | 
			
		||||
 | 
			
		||||
   Neither of these is actually big deal and hardly encountered
 | 
			
		||||
   in real-life applications.
 | 
			
		||||
 | 
			
		||||
 Compiling procedure
 | 
			
		||||
 -------------------
 | 
			
		||||
 | 
			
		||||
 You will need Perl. You can run under Cygwin or you can download
 | 
			
		||||
 ActiveState Perl from http://www.activestate.com/ActivePerl.
 | 
			
		||||
 | 
			
		||||
 You will need Microsoft Platform SDK, available for download at
 | 
			
		||||
 http://www.microsoft.com/msdownload/platformsdk/sdkupdate/. As per
 | 
			
		||||
 April 2005 Platform SDK is equipped with Win64 compilers, as well
 | 
			
		||||
 as assemblers, but it might change in the future.
 | 
			
		||||
 | 
			
		||||
 To build for Win64/x64:
 | 
			
		||||
 | 
			
		||||
 > perl Configure VC-WIN64A
 | 
			
		||||
 > ms\do_win64a
 | 
			
		||||
 > nmake -f ms\ntdll.mak
 | 
			
		||||
 > cd out32dll
 | 
			
		||||
 > ..\ms\test
 | 
			
		||||
 | 
			
		||||
 To build for Win64/IA64:
 | 
			
		||||
 | 
			
		||||
 > perl Configure VC-WIN64I
 | 
			
		||||
 > ms\do_win64i
 | 
			
		||||
 > nmake -f ms\ntdll.mak
 | 
			
		||||
 > cd out32dll
 | 
			
		||||
 > ..\ms\test
 | 
			
		||||
 | 
			
		||||
 Naturally test-suite itself has to be executed on the target platform.
 | 
			
		||||
 | 
			
		||||
 Installation
 | 
			
		||||
 ------------
 | 
			
		||||
 | 
			
		||||
 TBD, for now see INSTALL.W32.
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										74
									
								
								INSTALL.WCE
									
									
									
									
									
								
							
							
						
						
									
										74
									
								
								INSTALL.WCE
									
									
									
									
									
								
							@@ -1,74 +0,0 @@
 | 
			
		||||
 
 | 
			
		||||
 INSTALLATION FOR THE WINDOWS CE PLATFORM
 | 
			
		||||
 ----------------------------------------
 | 
			
		||||
 | 
			
		||||
 Building OpenSSL for Windows CE requires the following external tools:
 | 
			
		||||
 | 
			
		||||
  * Microsoft eMbedded Visual C++ 3.0
 | 
			
		||||
  * wcecompat compatibility library (www.essemer.com.au)
 | 
			
		||||
  * Optionally ceutils for running automated tests (www.essemer.com.au)
 | 
			
		||||
 | 
			
		||||
 You also need Perl for Win32.  You will need ActiveState Perl, available
 | 
			
		||||
 from http://www.activestate.com/ActivePerl.
 | 
			
		||||
 | 
			
		||||
 Windows CE support in OpenSSL relies on wcecompat and therefore it's
 | 
			
		||||
 appropriate to check http://www.essemer.com.au/windowsce/ for updates in
 | 
			
		||||
 case of compilation problems. As for the moment of this writing version
 | 
			
		||||
 1.1 is available and actually required for WCE 4.2 and newer platforms.
 | 
			
		||||
 All Windows CE specific issues should be directed to www.essemer.com.au.
 | 
			
		||||
 | 
			
		||||
 The C Runtime Library implementation for Windows CE that is included with
 | 
			
		||||
 Microsoft eMbedded Visual C++ 3.0 is incomplete and in some places
 | 
			
		||||
 incorrect.  wcecompat plugs the holes and tries to bring the Windows CE
 | 
			
		||||
 CRT to a level that is more compatible with ANSI C.  wcecompat goes further
 | 
			
		||||
 and provides low-level IO and stream IO support for stdin/stdout/stderr
 | 
			
		||||
 (which Windows CE does not provide).  This IO functionality is not needed
 | 
			
		||||
 by the OpenSSL library itself but is used for the tests and openssl.exe.
 | 
			
		||||
 More information is available at www.essemer.com.au.
 | 
			
		||||
 | 
			
		||||
 Building
 | 
			
		||||
 --------
 | 
			
		||||
 | 
			
		||||
 Setup the eMbedded Visual C++ environment.  There are batch files for doing
 | 
			
		||||
 this installed with eVC++.  For an ARM processor, for example, execute:
 | 
			
		||||
 | 
			
		||||
 > "C:\Program Files\Microsoft eMbedded Tools\EVC\WCE300\BIN\WCEARM.BAT"
 | 
			
		||||
 | 
			
		||||
 Next indicate where wcecompat is located:
 | 
			
		||||
 | 
			
		||||
 > set WCECOMPAT=C:\wcecompat
 | 
			
		||||
 | 
			
		||||
 Next you should run Configure:
 | 
			
		||||
 | 
			
		||||
 > perl Configure VC-CE
 | 
			
		||||
 | 
			
		||||
 Next you need to build the Makefiles:
 | 
			
		||||
 | 
			
		||||
 > ms\do_ms
 | 
			
		||||
 | 
			
		||||
 If you get errors about things not having numbers assigned then check the
 | 
			
		||||
 troubleshooting section in INSTALL.W32: you probably won't be able to compile
 | 
			
		||||
 it as it stands.
 | 
			
		||||
 | 
			
		||||
 Then from the VC++ environment at a prompt do:
 | 
			
		||||
 | 
			
		||||
 - to build static libraries:
 | 
			
		||||
 | 
			
		||||
   > nmake -f ms\ce.mak
 | 
			
		||||
 | 
			
		||||
 - or to build DLLs:
 | 
			
		||||
 | 
			
		||||
   > nmake -f ms\cedll.mak
 | 
			
		||||
 | 
			
		||||
 If all is well it should compile and you will have some static libraries and
 | 
			
		||||
 executables in out32, or some DLLs and executables in out32dll.  If you want
 | 
			
		||||
 to try the tests then make sure the ceutils are in the path and do:
 | 
			
		||||
 
 | 
			
		||||
 > cd out32
 | 
			
		||||
 > ..\ms\testce
 | 
			
		||||
 | 
			
		||||
 This will copy each of the test programs to the Windows CE device and execute
 | 
			
		||||
 them, displaying the output of the tests on this computer.  The output should
 | 
			
		||||
 look similar to the output produced by running the tests for a regular Windows
 | 
			
		||||
 build.
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										2
									
								
								LICENSE
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								LICENSE
									
									
									
									
									
								
							@@ -12,7 +12,7 @@
 | 
			
		||||
  ---------------
 | 
			
		||||
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * Redistribution and use in source and binary forms, with or without
 | 
			
		||||
 * modification, are permitted provided that the following conditions
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,6 @@
 | 
			
		||||
 *				are installed!  Use the AppleScript applet in the "openssl-0.9.4" folder to do this!
 | 
			
		||||
 */
 | 
			
		||||
/* modified to seed the PRNG */
 | 
			
		||||
/* modified to use CRandomizer for seeding */
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
//	Include some funky libs I've developed over time
 | 
			
		||||
@@ -27,13 +26,14 @@
 | 
			
		||||
#include "CPStringUtils.hpp"
 | 
			
		||||
#include "ErrorHandling.hpp"
 | 
			
		||||
#include "MacSocket.h"
 | 
			
		||||
#include "Randomizer.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
//	We use the OpenSSL implementation of SSL....
 | 
			
		||||
//	This was a lot of work to finally get going, though you wouldn't know it by the results!
 | 
			
		||||
 | 
			
		||||
#include <openssl/ssl.h>
 | 
			
		||||
#include <openssl/err.h>
 | 
			
		||||
#include <openssl/rand.h>
 | 
			
		||||
 | 
			
		||||
#include <timer.h>
 | 
			
		||||
 | 
			
		||||
@@ -48,6 +48,10 @@
 | 
			
		||||
 | 
			
		||||
OSErr MyMacSocket_IdleWaitCallback(void *inUserRefPtr);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
//	My idle-wait callback.  Doesn't do much, does it?  Silly cooperative multitasking.
 | 
			
		||||
 | 
			
		||||
OSErr MyMacSocket_IdleWaitCallback(void *inUserRefPtr)
 | 
			
		||||
@@ -55,32 +59,30 @@ OSErr MyMacSocket_IdleWaitCallback(void *inUserRefPtr)
 | 
			
		||||
#pragma unused(inUserRefPtr)
 | 
			
		||||
 | 
			
		||||
EventRecord		theEvent;
 | 
			
		||||
	::EventAvail(everyEvent,&theEvent);
 | 
			
		||||
 | 
			
		||||
	CRandomizer *randomizer = (CRandomizer*)inUserRefPtr;
 | 
			
		||||
	if (randomizer)
 | 
			
		||||
		randomizer->PeriodicAction();
 | 
			
		||||
	::EventAvail(everyEvent,&theEvent);
 | 
			
		||||
 | 
			
		||||
	return(noErr);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
//	Finally!
 | 
			
		||||
 | 
			
		||||
void main(void)
 | 
			
		||||
{
 | 
			
		||||
	OSErr				errCode;
 | 
			
		||||
	int					theSocket = -1;
 | 
			
		||||
	int					theTimeout = 30;
 | 
			
		||||
OSErr				errCode;
 | 
			
		||||
int					theSocket = -1;
 | 
			
		||||
int					theTimeout = 30;
 | 
			
		||||
 | 
			
		||||
	SSL_CTX				*ssl_ctx = nil;
 | 
			
		||||
	SSL					*ssl = nil;
 | 
			
		||||
SSL_CTX				*ssl_ctx = nil;
 | 
			
		||||
SSL					*ssl = nil;
 | 
			
		||||
 | 
			
		||||
	char				tempString[256];
 | 
			
		||||
	UnsignedWide		microTickCount;
 | 
			
		||||
char				tempString[256];
 | 
			
		||||
UnsignedWide		microTickCount;
 | 
			
		||||
	
 | 
			
		||||
 | 
			
		||||
	CRandomizer randomizer;
 | 
			
		||||
#warning   -- USE A TRUE RANDOM SEED, AND ADD ENTROPY WHENEVER POSSIBLE. --
 | 
			
		||||
const char seed[] = "uyq9,7-b(VHGT^%$&^F/,876;,;./lkJHGFUY{PO*";	// Just gobbledygook
 | 
			
		||||
 | 
			
		||||
	printf("OpenSSL Demo by Roy Wood, roy@centricsystems.ca\n\n");
 | 
			
		||||
	
 | 
			
		||||
@@ -90,7 +92,7 @@ void main(void)
 | 
			
		||||
 | 
			
		||||
	//	Create a socket-like object
 | 
			
		||||
	
 | 
			
		||||
	BailIfError(errCode = MacSocket_socket(&theSocket,false,theTimeout * 60,MyMacSocket_IdleWaitCallback,&randomizer));
 | 
			
		||||
	BailIfError(errCode = MacSocket_socket(&theSocket,false,theTimeout * 60,MyMacSocket_IdleWaitCallback,nil));
 | 
			
		||||
 | 
			
		||||
	
 | 
			
		||||
	//	Set up the connect string and try to connect
 | 
			
		||||
@@ -116,6 +118,10 @@ void main(void)
 | 
			
		||||
//	ssl_ctx = SSL_CTX_new(SSLv3_client_method());
 | 
			
		||||
			
 | 
			
		||||
 | 
			
		||||
	RAND_seed (seed, sizeof (seed));
 | 
			
		||||
	Microseconds (µTickCount);
 | 
			
		||||
	RAND_add (µTickCount, sizeof (microTickCount), 0);		// Entropy is actually > 0, needs an estimate
 | 
			
		||||
 | 
			
		||||
	//	Create an SSL thingey and try to negotiate the connection
 | 
			
		||||
	
 | 
			
		||||
	ssl = SSL_new(ssl_ctx);
 | 
			
		||||
@@ -167,7 +173,7 @@ void main(void)
 | 
			
		||||
		
 | 
			
		||||
		tempString[bytesRead] = '\0';
 | 
			
		||||
		
 | 
			
		||||
		printf("%s", tempString);
 | 
			
		||||
		printf(tempString);
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	printf("\n\n\n");
 | 
			
		||||
@@ -201,7 +207,7 @@ EXITPOINT:
 | 
			
		||||
	{
 | 
			
		||||
		printf("An error occurred:\n");
 | 
			
		||||
		
 | 
			
		||||
		printf("%s",GetErrorMessage());
 | 
			
		||||
		printf(GetErrorMessage());
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	
 | 
			
		||||
 
 | 
			
		||||
@@ -1287,7 +1287,7 @@ EXITPOINT:
 | 
			
		||||
 | 
			
		||||
//	Send some bytes
 | 
			
		||||
 | 
			
		||||
int MacSocket_send(const int inSocketNum,const void *inBuff,int inBuffLength)
 | 
			
		||||
int MacSocket_send(const int inSocketNum,void *inBuff,int inBuffLength)
 | 
			
		||||
{
 | 
			
		||||
OSErr			errCode = noErr;
 | 
			
		||||
int				bytesSent = 0;
 | 
			
		||||
 
 | 
			
		||||
@@ -62,7 +62,7 @@ int MacSocket_recv(const int inSocketNum,void *outBuff,int outBuffLength,const B
 | 
			
		||||
 | 
			
		||||
//	Call this to send data on a socket
 | 
			
		||||
 | 
			
		||||
int MacSocket_send(const int inSocketNum,const void *inBuff,int inBuffLength);
 | 
			
		||||
int MacSocket_send(const int inSocketNum,void *inBuff,int inBuffLength);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
//	If zero bytes were read in a call to MacSocket_recv(), it may be that the remote end has done a half-close
 | 
			
		||||
 
 | 
			
		||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -1,476 +0,0 @@
 | 
			
		||||
/* 
 | 
			
		||||
------- Strong random data generation on a Macintosh (pre - OS X) ------
 | 
			
		||||
		
 | 
			
		||||
--	GENERAL: We aim to generate unpredictable bits without explicit
 | 
			
		||||
	user interaction. A general review of the problem may be found
 | 
			
		||||
	in RFC 1750, "Randomness Recommendations for Security", and some
 | 
			
		||||
	more discussion, of general and Mac-specific issues has appeared
 | 
			
		||||
	in "Using and Creating Cryptographic- Quality Random Numbers" by
 | 
			
		||||
	Jon Callas (www.merrymeet.com/jon/usingrandom.html).
 | 
			
		||||
 | 
			
		||||
	The data and entropy estimates provided below are based on my
 | 
			
		||||
	limited experimentation and estimates, rather than by any
 | 
			
		||||
	rigorous study, and the entropy estimates tend to be optimistic.
 | 
			
		||||
	They should not be considered absolute.
 | 
			
		||||
 | 
			
		||||
	Some of the information being collected may be correlated in
 | 
			
		||||
	subtle ways. That includes mouse positions, timings, and disk
 | 
			
		||||
	size measurements. Some obvious correlations will be eliminated
 | 
			
		||||
	by the programmer, but other, weaker ones may remain. The
 | 
			
		||||
	reliability of the code depends on such correlations being
 | 
			
		||||
	poorly understood, both by us and by potential interceptors.
 | 
			
		||||
 | 
			
		||||
	This package has been planned to be used with OpenSSL, v. 0.9.5.
 | 
			
		||||
	It requires the OpenSSL function RAND_add. 
 | 
			
		||||
 | 
			
		||||
--	OTHER WORK: Some source code and other details have been
 | 
			
		||||
	published elsewhere, but I haven't found any to be satisfactory
 | 
			
		||||
	for the Mac per se:
 | 
			
		||||
 | 
			
		||||
	* The Linux random number generator (by Theodore Ts'o, in
 | 
			
		||||
	  drivers/char/random.c), is a carefully designed open-source
 | 
			
		||||
	  crypto random number package. It collects data from a variety
 | 
			
		||||
	  of sources, including mouse, keyboard and other interrupts.
 | 
			
		||||
	  One nice feature is that it explicitly estimates the entropy
 | 
			
		||||
	  of the data it collects. Some of its features (e.g. interrupt
 | 
			
		||||
	  timing) cannot be reliably exported to the Mac without using
 | 
			
		||||
	  undocumented APIs.
 | 
			
		||||
 | 
			
		||||
	* Truerand by Don P. Mitchell and Matt Blaze uses variations
 | 
			
		||||
	  between different timing mechanisms on the same system. This
 | 
			
		||||
	  has not been tested on the Mac, but requires preemptive
 | 
			
		||||
	  multitasking, and is hardware-dependent, and can't be relied
 | 
			
		||||
	  on to work well if only one oscillator is present.
 | 
			
		||||
 | 
			
		||||
	* Cryptlib's RNG for the Mac (RNDMAC.C by Peter Gutmann),
 | 
			
		||||
	  gathers a lot of information about the machine and system
 | 
			
		||||
	  environment. Unfortunately, much of it is constant from one
 | 
			
		||||
	  startup to the next. In other words, the random seed could be
 | 
			
		||||
	  the same from one day to the next. Some of the APIs are
 | 
			
		||||
	  hardware-dependent, and not all are compatible with Carbon (OS
 | 
			
		||||
	  X). Incidentally, the EGD library is based on the UNIX entropy
 | 
			
		||||
	  gathering methods in cryptlib, and isn't suitable for MacOS
 | 
			
		||||
	  either.
 | 
			
		||||
 | 
			
		||||
	* Mozilla (and perhaps earlier versions of Netscape) uses the
 | 
			
		||||
	  time of day (in seconds) and an uninitialized local variable
 | 
			
		||||
	  to seed the random number generator. The time of day is known
 | 
			
		||||
	  to an outside interceptor (to within the accuracy of the
 | 
			
		||||
	  system clock). The uninitialized variable could easily be
 | 
			
		||||
	  identical between subsequent launches of an application, if it
 | 
			
		||||
	  is reached through the same path.
 | 
			
		||||
 | 
			
		||||
	* OpenSSL provides the function RAND_screen(), by G. van
 | 
			
		||||
	  Oosten, which hashes the contents of the screen to generate a
 | 
			
		||||
	  seed. This is not useful for an extension or for an
 | 
			
		||||
	  application which launches at startup time, since the screen
 | 
			
		||||
	  is likely to look identical from one launch to the next. This
 | 
			
		||||
	  method is also rather slow.
 | 
			
		||||
 | 
			
		||||
	* Using variations in disk drive seek times has been proposed
 | 
			
		||||
	  (Davis, Ihaka and Fenstermacher, world.std.com/~dtd/;
 | 
			
		||||
	  Jakobsson, Shriver, Hillyer and Juels,
 | 
			
		||||
	  www.bell-labs.com/user/shriver/random.html). These variations
 | 
			
		||||
	  appear to be due to air turbulence inside the disk drive
 | 
			
		||||
	  mechanism, and are very strongly unpredictable. Unfortunately
 | 
			
		||||
	  this technique is slow, and some implementations of it may be
 | 
			
		||||
	  patented (see Shriver's page above.) It of course cannot be
 | 
			
		||||
	  used with a RAM disk.
 | 
			
		||||
 | 
			
		||||
--	TIMING: On the 601 PowerPC the time base register is guaranteed
 | 
			
		||||
	to change at least once every 10 addi instructions, i.e. 10
 | 
			
		||||
	cycles. On a 60 MHz machine (slowest PowerPC) this translates to
 | 
			
		||||
	a resolution of 1/6 usec. Newer machines seem to be using a 10
 | 
			
		||||
	cycle resolution as well.
 | 
			
		||||
	
 | 
			
		||||
	For 68K Macs, the Microseconds() call may be used. See Develop
 | 
			
		||||
	issue 29 on the Apple developer site
 | 
			
		||||
	(developer.apple.com/dev/techsupport/develop/issue29/minow.html)
 | 
			
		||||
	for information on its accuracy and resolution. The code below
 | 
			
		||||
	has been tested only on PowerPC based machines.
 | 
			
		||||
 | 
			
		||||
	The time from machine startup to the launch of an application in
 | 
			
		||||
	the startup folder has a variance of about 1.6 msec on a new G4
 | 
			
		||||
	machine with a defragmented and optimized disk, most extensions
 | 
			
		||||
	off and no icons on the desktop. This can be reasonably taken as
 | 
			
		||||
	a lower bound on the variance. Most of this variation is likely
 | 
			
		||||
	due to disk seek time variability. The distribution of startup
 | 
			
		||||
	times is probably not entirely even or uncorrelated. This needs
 | 
			
		||||
	to be investigated, but I am guessing that it not a majpor
 | 
			
		||||
	problem. Entropy = log2 (1600/0.166) ~= 13 bits on a 60 MHz
 | 
			
		||||
	machine, ~16 bits for a 450 MHz machine.
 | 
			
		||||
 | 
			
		||||
	User-launched application startup times will have a variance of
 | 
			
		||||
	a second or more relative to machine startup time. Entropy >~22
 | 
			
		||||
	bits.
 | 
			
		||||
 | 
			
		||||
	Machine startup time is available with a 1-second resolution. It
 | 
			
		||||
	is predictable to no better a minute or two, in the case of
 | 
			
		||||
	people who show up punctually to work at the same time and
 | 
			
		||||
	immediately start their computer. Using the scheduled startup
 | 
			
		||||
	feature (when available) will cause the machine to start up at
 | 
			
		||||
	the same time every day, making the value predictable. Entropy
 | 
			
		||||
	>~7 bits, or 0 bits with scheduled startup.
 | 
			
		||||
 | 
			
		||||
	The time of day is of course known to an outsider and thus has 0
 | 
			
		||||
	entropy if the system clock is regularly calibrated.
 | 
			
		||||
 | 
			
		||||
--	KEY TIMING: A  very fast typist (120 wpm) will have a typical
 | 
			
		||||
	inter-key timing interval of 100 msec. We can assume a variance
 | 
			
		||||
	of no less than 2 msec -- maybe. Do good typists have a constant
 | 
			
		||||
	rhythm, like drummers? Since what we measure is not the
 | 
			
		||||
	key-generated interrupt but the time at which the key event was
 | 
			
		||||
	taken off the event queue, our resolution is roughly the time
 | 
			
		||||
	between process switches, at best 1 tick (17 msec). I  therefore
 | 
			
		||||
	consider this technique questionable and not very useful for
 | 
			
		||||
	obtaining high entropy data on the Mac.
 | 
			
		||||
 | 
			
		||||
--	MOUSE POSITION AND TIMING: The high bits of the mouse position
 | 
			
		||||
	are far from arbitrary, since the mouse tends to stay in a few
 | 
			
		||||
	limited areas of the screen. I am guessing that the position of
 | 
			
		||||
	the mouse is arbitrary within a 6 pixel square. Since the mouse
 | 
			
		||||
	stays still for long periods of time, it should be sampled only
 | 
			
		||||
	after it was moved, to avoid correlated data. This gives an
 | 
			
		||||
	entropy of log2(6*6) ~= 5 bits per measurement.
 | 
			
		||||
 | 
			
		||||
	The time during which the mouse stays still can vary from zero
 | 
			
		||||
	to, say, 5 seconds (occasionally longer). If the still time is
 | 
			
		||||
	measured by sampling the mouse during null events, and null
 | 
			
		||||
	events are received once per tick, its resolution is 1/60th of a
 | 
			
		||||
	second, giving an entropy of log2 (60*5) ~= 8 bits per
 | 
			
		||||
	measurement. Since the distribution of still times is uneven,
 | 
			
		||||
	this estimate is on the high side.
 | 
			
		||||
 | 
			
		||||
	For simplicity and compatibility across system versions, the
 | 
			
		||||
	mouse is to be sampled explicitly (e.g. in the event loop),
 | 
			
		||||
	rather than in a time manager task.
 | 
			
		||||
 | 
			
		||||
--	STARTUP DISK TOTAL FILE SIZE: Varies typically by at least 20k
 | 
			
		||||
	from one startup to the next, with 'minimal' computer use. Won't
 | 
			
		||||
	vary at all if machine is started again immediately after
 | 
			
		||||
	startup (unless virtual memory is on), but any application which
 | 
			
		||||
	uses the web and caches information to disk is likely to cause
 | 
			
		||||
	this much variation or more. The variation is probably not
 | 
			
		||||
	random, but I don't know in what way. File sizes tend to be
 | 
			
		||||
	divisible by 4 bytes since file format fields are often
 | 
			
		||||
	long-aligned. Entropy > log2 (20000/4) ~= 12 bits.
 | 
			
		||||
	
 | 
			
		||||
--	STARTUP DISK FIRST AVAILABLE ALLOCATION BLOCK: As the volume
 | 
			
		||||
	gets fragmented this could be anywhere in principle. In a
 | 
			
		||||
	perfectly unfragmented volume this will be strongly correlated
 | 
			
		||||
	with the total file size on the disk. With more fragmentation
 | 
			
		||||
	comes less certainty. I took the variation in this value to be
 | 
			
		||||
	1/8 of the total file size on the volume.
 | 
			
		||||
 | 
			
		||||
--	SYSTEM REQUIREMENTS: The code here requires System 7.0 and above
 | 
			
		||||
	(for Gestalt and Microseconds calls). All the calls used are
 | 
			
		||||
	Carbon-compatible.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
/*------------------------------ Includes ----------------------------*/
 | 
			
		||||
 | 
			
		||||
#include "Randomizer.h"
 | 
			
		||||
 | 
			
		||||
// Mac OS API
 | 
			
		||||
#include <Files.h>
 | 
			
		||||
#include <Folders.h>
 | 
			
		||||
#include <Events.h>
 | 
			
		||||
#include <Processes.h>
 | 
			
		||||
#include <Gestalt.h>
 | 
			
		||||
#include <Resources.h>
 | 
			
		||||
#include <LowMem.h>
 | 
			
		||||
 | 
			
		||||
// Standard C library
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <math.h>
 | 
			
		||||
 | 
			
		||||
/*---------------------- Function declarations -----------------------*/
 | 
			
		||||
 | 
			
		||||
// declared in OpenSSL/crypto/rand/rand.h
 | 
			
		||||
extern "C" void RAND_add (const void *buf, int num, double entropy);
 | 
			
		||||
 | 
			
		||||
unsigned long GetPPCTimer (bool is601);	// Make it global if needed
 | 
			
		||||
					// elsewhere
 | 
			
		||||
 | 
			
		||||
/*---------------------------- Constants -----------------------------*/
 | 
			
		||||
 | 
			
		||||
#define kMouseResolution 6		// Mouse position has to differ
 | 
			
		||||
					// from the last one by this
 | 
			
		||||
					// much to be entered
 | 
			
		||||
#define kMousePositionEntropy 5.16	// log2 (kMouseResolution**2)
 | 
			
		||||
#define kTypicalMouseIdleTicks 300.0	// I am guessing that a typical
 | 
			
		||||
					// amount of time between mouse
 | 
			
		||||
					// moves is 5 seconds
 | 
			
		||||
#define kVolumeBytesEntropy 12.0	// about log2 (20000/4),
 | 
			
		||||
					// assuming a variation of 20K
 | 
			
		||||
					// in total file size and
 | 
			
		||||
					// long-aligned file formats.
 | 
			
		||||
#define kApplicationUpTimeEntropy 6.0	// Variance > 1 second, uptime
 | 
			
		||||
					// in ticks  
 | 
			
		||||
#define kSysStartupEntropy 7.0		// Entropy for machine startup
 | 
			
		||||
					// time
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*------------------------ Function definitions ----------------------*/
 | 
			
		||||
 | 
			
		||||
CRandomizer::CRandomizer (void)
 | 
			
		||||
{
 | 
			
		||||
	long	result;
 | 
			
		||||
	
 | 
			
		||||
	mSupportsLargeVolumes =
 | 
			
		||||
		(Gestalt(gestaltFSAttr, &result) == noErr) &&
 | 
			
		||||
		((result & (1L << gestaltFSSupports2TBVols)) != 0);
 | 
			
		||||
	
 | 
			
		||||
	if (Gestalt (gestaltNativeCPUtype, &result) != noErr)
 | 
			
		||||
	{
 | 
			
		||||
		mIsPowerPC = false;
 | 
			
		||||
		mIs601 = false;
 | 
			
		||||
	}
 | 
			
		||||
	else
 | 
			
		||||
	{
 | 
			
		||||
		mIs601 = (result == gestaltCPU601);
 | 
			
		||||
		mIsPowerPC = (result >= gestaltCPU601);
 | 
			
		||||
	}
 | 
			
		||||
	mLastMouse.h = mLastMouse.v = -10;	// First mouse will
 | 
			
		||||
						// always be recorded
 | 
			
		||||
	mLastPeriodicTicks = TickCount();
 | 
			
		||||
	GetTimeBaseResolution ();
 | 
			
		||||
	
 | 
			
		||||
	// Add initial entropy
 | 
			
		||||
	AddTimeSinceMachineStartup ();
 | 
			
		||||
	AddAbsoluteSystemStartupTime ();
 | 
			
		||||
	AddStartupVolumeInfo ();
 | 
			
		||||
	AddFiller ();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void CRandomizer::PeriodicAction (void)
 | 
			
		||||
{
 | 
			
		||||
	AddCurrentMouse ();
 | 
			
		||||
	AddNow (0.0);	// Should have a better entropy estimate here
 | 
			
		||||
	mLastPeriodicTicks = TickCount();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*------------------------- Private Methods --------------------------*/
 | 
			
		||||
 | 
			
		||||
void CRandomizer::AddCurrentMouse (void)
 | 
			
		||||
{
 | 
			
		||||
	Point mouseLoc;
 | 
			
		||||
	unsigned long lastCheck;	// Ticks since mouse was last
 | 
			
		||||
					// sampled
 | 
			
		||||
 | 
			
		||||
#if TARGET_API_MAC_CARBON
 | 
			
		||||
	GetGlobalMouse (&mouseLoc);
 | 
			
		||||
#else
 | 
			
		||||
	mouseLoc = LMGetMouseLocation();
 | 
			
		||||
#endif
 | 
			
		||||
	
 | 
			
		||||
	if (labs (mLastMouse.h - mouseLoc.h) > kMouseResolution/2 &&
 | 
			
		||||
	    labs (mLastMouse.v - mouseLoc.v) > kMouseResolution/2)
 | 
			
		||||
		AddBytes (&mouseLoc, sizeof (mouseLoc),
 | 
			
		||||
				kMousePositionEntropy);
 | 
			
		||||
	
 | 
			
		||||
	if (mLastMouse.h == mouseLoc.h && mLastMouse.v == mouseLoc.v)
 | 
			
		||||
		mMouseStill ++;
 | 
			
		||||
	else
 | 
			
		||||
	{
 | 
			
		||||
		double entropy;
 | 
			
		||||
		
 | 
			
		||||
		// Mouse has moved. Add the number of measurements for
 | 
			
		||||
		// which it's been still. If the resolution is too
 | 
			
		||||
		// coarse, assume the entropy is 0.
 | 
			
		||||
 | 
			
		||||
		lastCheck = TickCount() - mLastPeriodicTicks;
 | 
			
		||||
		if (lastCheck <= 0)
 | 
			
		||||
			lastCheck = 1;
 | 
			
		||||
		entropy = log2l
 | 
			
		||||
			(kTypicalMouseIdleTicks/(double)lastCheck);
 | 
			
		||||
		if (entropy < 0.0)
 | 
			
		||||
			entropy = 0.0;
 | 
			
		||||
		AddBytes (&mMouseStill, sizeof (mMouseStill), entropy);
 | 
			
		||||
		mMouseStill = 0;
 | 
			
		||||
	}
 | 
			
		||||
	mLastMouse = mouseLoc;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void CRandomizer::AddAbsoluteSystemStartupTime (void)
 | 
			
		||||
{
 | 
			
		||||
	unsigned long	now;		// Time in seconds since
 | 
			
		||||
					// 1/1/1904
 | 
			
		||||
	GetDateTime (&now);
 | 
			
		||||
	now -= TickCount() / 60;	// Time in ticks since machine
 | 
			
		||||
					// startup
 | 
			
		||||
	AddBytes (&now, sizeof (now), kSysStartupEntropy);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void CRandomizer::AddTimeSinceMachineStartup (void)
 | 
			
		||||
{
 | 
			
		||||
	AddNow (1.5);			// Uncertainty in app startup
 | 
			
		||||
					// time is > 1.5 msec (for
 | 
			
		||||
					// automated app startup).
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void CRandomizer::AddAppRunningTime (void)
 | 
			
		||||
{
 | 
			
		||||
	ProcessSerialNumber PSN;
 | 
			
		||||
	ProcessInfoRec		ProcessInfo;
 | 
			
		||||
	
 | 
			
		||||
	ProcessInfo.processInfoLength = sizeof (ProcessInfoRec);
 | 
			
		||||
	ProcessInfo.processName = nil;
 | 
			
		||||
	ProcessInfo.processAppSpec = nil;
 | 
			
		||||
	
 | 
			
		||||
	GetCurrentProcess (&PSN);
 | 
			
		||||
	GetProcessInformation (&PSN, &ProcessInfo);
 | 
			
		||||
 | 
			
		||||
	// Now add the amount of time in ticks that the current process
 | 
			
		||||
	// has been active
 | 
			
		||||
 | 
			
		||||
	AddBytes (&ProcessInfo, sizeof (ProcessInfoRec),
 | 
			
		||||
			kApplicationUpTimeEntropy);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void CRandomizer::AddStartupVolumeInfo (void)
 | 
			
		||||
{
 | 
			
		||||
	short			vRefNum;
 | 
			
		||||
	long			dirID;
 | 
			
		||||
	XVolumeParam	pb;
 | 
			
		||||
	OSErr			err;
 | 
			
		||||
	
 | 
			
		||||
	if (!mSupportsLargeVolumes)
 | 
			
		||||
		return;
 | 
			
		||||
		
 | 
			
		||||
	FindFolder (kOnSystemDisk, kSystemFolderType, kDontCreateFolder,
 | 
			
		||||
			&vRefNum, &dirID);
 | 
			
		||||
	pb.ioVRefNum = vRefNum;
 | 
			
		||||
	pb.ioCompletion = 0;
 | 
			
		||||
	pb.ioNamePtr = 0;
 | 
			
		||||
	pb.ioVolIndex = 0;
 | 
			
		||||
	err = PBXGetVolInfoSync (&pb);
 | 
			
		||||
	if (err != noErr)
 | 
			
		||||
		return;
 | 
			
		||||
		
 | 
			
		||||
	// Base the entropy on the amount of space used on the disk and
 | 
			
		||||
	// on the next available allocation block. A lot else might be
 | 
			
		||||
	// unpredictable, so might as well toss the whole block in. See
 | 
			
		||||
	// comments for entropy estimate justifications.
 | 
			
		||||
 | 
			
		||||
	AddBytes (&pb, sizeof (pb),
 | 
			
		||||
		kVolumeBytesEntropy +
 | 
			
		||||
		log2l (((pb.ioVTotalBytes.hi - pb.ioVFreeBytes.hi)
 | 
			
		||||
				* 4294967296.0D +
 | 
			
		||||
			(pb.ioVTotalBytes.lo - pb.ioVFreeBytes.lo))
 | 
			
		||||
				/ pb.ioVAlBlkSiz - 3.0));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
	On a typical startup CRandomizer will come up with about 60
 | 
			
		||||
	bits of good, unpredictable data. Assuming no more input will
 | 
			
		||||
	be available, we'll need some more lower-quality data to give
 | 
			
		||||
	OpenSSL the 128 bits of entropy it desires. AddFiller adds some
 | 
			
		||||
	relatively predictable data into the soup.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
void CRandomizer::AddFiller (void)
 | 
			
		||||
{
 | 
			
		||||
	struct
 | 
			
		||||
	{
 | 
			
		||||
		ProcessSerialNumber psn;	// Front process serial
 | 
			
		||||
						// number
 | 
			
		||||
		RGBColor	hiliteRGBValue;	// User-selected
 | 
			
		||||
						// highlight color
 | 
			
		||||
		long		processCount;	// Number of active
 | 
			
		||||
						// processes
 | 
			
		||||
		long		cpuSpeed;	// Processor speed
 | 
			
		||||
		long		totalMemory;	// Total logical memory
 | 
			
		||||
						// (incl. virtual one)
 | 
			
		||||
		long		systemVersion;	// OS version
 | 
			
		||||
		short		resFile;	// Current resource file
 | 
			
		||||
	} data;
 | 
			
		||||
	
 | 
			
		||||
	GetNextProcess ((ProcessSerialNumber*) kNoProcess);
 | 
			
		||||
	while (GetNextProcess (&data.psn) == noErr)
 | 
			
		||||
		data.processCount++;
 | 
			
		||||
	GetFrontProcess (&data.psn);
 | 
			
		||||
	LMGetHiliteRGB (&data.hiliteRGBValue);
 | 
			
		||||
	Gestalt (gestaltProcClkSpeed, &data.cpuSpeed);
 | 
			
		||||
	Gestalt (gestaltLogicalRAMSize, &data.totalMemory);
 | 
			
		||||
	Gestalt (gestaltSystemVersion, &data.systemVersion);
 | 
			
		||||
	data.resFile = CurResFile ();
 | 
			
		||||
	
 | 
			
		||||
	// Here we pretend to feed the PRNG completely random data. This
 | 
			
		||||
	// is of course false, as much of the above data is predictable
 | 
			
		||||
	// by an outsider. At this point we don't have any more
 | 
			
		||||
	// randomness to add, but with OpenSSL we must have a 128 bit
 | 
			
		||||
	// seed before we can start. We just add what we can, without a
 | 
			
		||||
	// real entropy estimate, and hope for the best.
 | 
			
		||||
 | 
			
		||||
	AddBytes (&data, sizeof(data), 8.0 * sizeof(data));
 | 
			
		||||
	AddCurrentMouse ();
 | 
			
		||||
	AddNow (1.0);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
//-------------------  LOW LEVEL ---------------------
 | 
			
		||||
 | 
			
		||||
void CRandomizer::AddBytes (void *data, long size, double entropy)
 | 
			
		||||
{
 | 
			
		||||
	RAND_add (data, size, entropy * 0.125);	// Convert entropy bits
 | 
			
		||||
						// to bytes
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void CRandomizer::AddNow (double millisecondUncertainty)
 | 
			
		||||
{
 | 
			
		||||
	long time = SysTimer();
 | 
			
		||||
	AddBytes (&time, sizeof (time), log2l (millisecondUncertainty *
 | 
			
		||||
			mTimebaseTicksPerMillisec));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
//----------------- TIMING SUPPORT ------------------
 | 
			
		||||
 | 
			
		||||
void CRandomizer::GetTimeBaseResolution (void)
 | 
			
		||||
{	
 | 
			
		||||
#ifdef __powerc
 | 
			
		||||
	long speed;
 | 
			
		||||
	
 | 
			
		||||
	// gestaltProcClkSpeed available on System 7.5.2 and above
 | 
			
		||||
	if (Gestalt (gestaltProcClkSpeed, &speed) != noErr)
 | 
			
		||||
		// Only PowerPCs running pre-7.5.2 are 60-80 MHz
 | 
			
		||||
		// machines.
 | 
			
		||||
		mTimebaseTicksPerMillisec =  6000.0D;
 | 
			
		||||
	// Assume 10 cycles per clock update, as in 601 spec. Seems true
 | 
			
		||||
	// for later chips as well.
 | 
			
		||||
	mTimebaseTicksPerMillisec = speed / 1.0e4D;
 | 
			
		||||
#else
 | 
			
		||||
	// 68K VIA-based machines (see Develop Magazine no. 29)
 | 
			
		||||
	mTimebaseTicksPerMillisec = 783.360D;
 | 
			
		||||
#endif
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
unsigned long CRandomizer::SysTimer (void)	// returns the lower 32
 | 
			
		||||
						// bit of the chip timer
 | 
			
		||||
{
 | 
			
		||||
#ifdef __powerc
 | 
			
		||||
	return GetPPCTimer (mIs601);
 | 
			
		||||
#else
 | 
			
		||||
	UnsignedWide usec;
 | 
			
		||||
	Microseconds (&usec);
 | 
			
		||||
	return usec.lo;
 | 
			
		||||
#endif
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#ifdef __powerc
 | 
			
		||||
// The timebase is available through mfspr on 601, mftb on later chips.
 | 
			
		||||
// Motorola recommends that an 601 implementation map mftb to mfspr
 | 
			
		||||
// through an exception, but I haven't tested to see if MacOS actually
 | 
			
		||||
// does this. We only sample the lower 32 bits of the timer (i.e. a
 | 
			
		||||
// few minutes of resolution)
 | 
			
		||||
 | 
			
		||||
asm unsigned long GetPPCTimer (register bool is601)
 | 
			
		||||
{
 | 
			
		||||
	cmplwi	is601, 0	// Check if 601
 | 
			
		||||
	bne	_601		// if non-zero goto _601
 | 
			
		||||
	mftb  	r3		// Available on 603 and later.
 | 
			
		||||
	blr			// return with result in r3
 | 
			
		||||
_601:
 | 
			
		||||
	mfspr r3, spr5  	// Available on 601 only.
 | 
			
		||||
				// blr inserted automatically
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
@@ -1,43 +0,0 @@
 | 
			
		||||
 | 
			
		||||
//	Gathers unpredictable system data to be used for generating
 | 
			
		||||
//	random bits
 | 
			
		||||
 | 
			
		||||
#include <MacTypes.h>
 | 
			
		||||
 | 
			
		||||
class CRandomizer
 | 
			
		||||
{
 | 
			
		||||
public:
 | 
			
		||||
	CRandomizer (void);
 | 
			
		||||
	void PeriodicAction (void);
 | 
			
		||||
	
 | 
			
		||||
private:
 | 
			
		||||
 | 
			
		||||
	// Private calls
 | 
			
		||||
 | 
			
		||||
	void		AddTimeSinceMachineStartup (void);
 | 
			
		||||
	void		AddAbsoluteSystemStartupTime (void);
 | 
			
		||||
	void		AddAppRunningTime (void);
 | 
			
		||||
	void		AddStartupVolumeInfo (void);
 | 
			
		||||
	void		AddFiller (void);
 | 
			
		||||
 | 
			
		||||
	void		AddCurrentMouse (void);
 | 
			
		||||
	void		AddNow (double millisecondUncertainty);
 | 
			
		||||
	void		AddBytes (void *data, long size, double entropy);
 | 
			
		||||
	
 | 
			
		||||
	void		GetTimeBaseResolution (void);
 | 
			
		||||
	unsigned long	SysTimer (void);
 | 
			
		||||
 | 
			
		||||
	// System Info	
 | 
			
		||||
	bool		mSupportsLargeVolumes;
 | 
			
		||||
	bool		mIsPowerPC;
 | 
			
		||||
	bool		mIs601;
 | 
			
		||||
	
 | 
			
		||||
	// Time info
 | 
			
		||||
	double		mTimebaseTicksPerMillisec;
 | 
			
		||||
	unsigned long	mLastPeriodicTicks;
 | 
			
		||||
	
 | 
			
		||||
	// Mouse info
 | 
			
		||||
	long		mSamplePeriod;
 | 
			
		||||
	Point		mLastMouse;
 | 
			
		||||
	long		mMouseStill;
 | 
			
		||||
};
 | 
			
		||||
							
								
								
									
										761
									
								
								Makefile.org
									
									
									
									
									
								
							
							
						
						
									
										761
									
								
								Makefile.org
									
									
									
									
									
								
							@@ -5,21 +5,8 @@
 | 
			
		||||
VERSION=
 | 
			
		||||
MAJOR=
 | 
			
		||||
MINOR=
 | 
			
		||||
SHLIB_VERSION_NUMBER=
 | 
			
		||||
SHLIB_VERSION_HISTORY=
 | 
			
		||||
SHLIB_MAJOR=
 | 
			
		||||
SHLIB_MINOR=
 | 
			
		||||
SHLIB_EXT=
 | 
			
		||||
PLATFORM=dist
 | 
			
		||||
OPTIONS=
 | 
			
		||||
CONFIGURE_ARGS=
 | 
			
		||||
SHLIB_TARGET=
 | 
			
		||||
 | 
			
		||||
# HERE indicates where this Makefile lives.  This can be used to indicate
 | 
			
		||||
# where sub-Makefiles are expected to be.  Currently has very limited usage,
 | 
			
		||||
# and should probably not be bothered with at all.
 | 
			
		||||
HERE=.
 | 
			
		||||
 | 
			
		||||
# INSTALL_PREFIX is for package builders so that they can configure
 | 
			
		||||
# for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
 | 
			
		||||
# Normally it is left empty.
 | 
			
		||||
@@ -29,6 +16,7 @@ INSTALLTOP=/usr/local/ssl
 | 
			
		||||
# Do not edit this manually. Use Configure --openssldir=DIR do change this!
 | 
			
		||||
OPENSSLDIR=/usr/local/ssl
 | 
			
		||||
 | 
			
		||||
# RSAref  - Define if we are to link with RSAref.
 | 
			
		||||
# NO_IDEA - Define to build without the IDEA algorithm
 | 
			
		||||
# NO_RC4  - Define to build without the RC4 algorithm
 | 
			
		||||
# NO_RC2  - Define to build without the RC2 algorithm
 | 
			
		||||
@@ -40,6 +28,8 @@ OPENSSLDIR=/usr/local/ssl
 | 
			
		||||
# DEVRANDOM - Give this the value of the 'random device' if your OS supports
 | 
			
		||||
#           one.  32 bytes will be read from this when the random
 | 
			
		||||
#           number generator is initalised.
 | 
			
		||||
# SSL_ALLOW_ADH - define if you want the server to be able to use the
 | 
			
		||||
#           SSLv3 anon-DH ciphers.
 | 
			
		||||
# SSL_FORBID_ENULL - define if you want the server to be not able to use the
 | 
			
		||||
#           NULL encryption ciphers.
 | 
			
		||||
#
 | 
			
		||||
@@ -57,105 +47,120 @@ OPENSSLDIR=/usr/local/ssl
 | 
			
		||||
# equal 4.
 | 
			
		||||
# PKCS1_CHECK - pkcs1 tests.
 | 
			
		||||
 | 
			
		||||
CC= cc
 | 
			
		||||
CFLAG= -O
 | 
			
		||||
CC= gcc
 | 
			
		||||
#CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
 | 
			
		||||
CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
 | 
			
		||||
DEPFLAG= 
 | 
			
		||||
PEX_LIBS= 
 | 
			
		||||
PEX_LIBS= -L. -L.. -L../.. -L../../..
 | 
			
		||||
EX_LIBS= 
 | 
			
		||||
EXE_EXT= 
 | 
			
		||||
ARFLAGS=
 | 
			
		||||
AR=ar $(ARFLAGS) r
 | 
			
		||||
ARD=ar $(ARFLAGS) d
 | 
			
		||||
AR=ar r
 | 
			
		||||
RANLIB= ranlib
 | 
			
		||||
PERL= perl
 | 
			
		||||
TAR= tar
 | 
			
		||||
TARFLAGS= --no-recursion
 | 
			
		||||
MAKEDEPPROG=makedepend
 | 
			
		||||
TARFLAGS= --norecurse
 | 
			
		||||
 | 
			
		||||
# We let the C compiler driver to take care of .s files. This is done in
 | 
			
		||||
# order to be excused from maintaining a separate set of architecture
 | 
			
		||||
# dependent assembler flags. E.g. if you throw -mcpu=ultrasparc at SPARC
 | 
			
		||||
# gcc, then the driver will automatically translate it to -xarch=v8plus
 | 
			
		||||
# and pass it down to assembler.
 | 
			
		||||
AS=$(CC) -c
 | 
			
		||||
ASFLAG=$(CFLAG)
 | 
			
		||||
# Set BN_ASM to bn_asm.o if you want to use the C version
 | 
			
		||||
BN_ASM= bn_asm.o
 | 
			
		||||
#BN_ASM= bn_asm.o
 | 
			
		||||
#BN_ASM= asm/bn86-elf.o	# elf, linux-elf
 | 
			
		||||
#BN_ASM= asm/bn86-sol.o # solaris
 | 
			
		||||
#BN_ASM= asm/bn86-out.o # a.out, FreeBSD
 | 
			
		||||
#BN_ASM= asm/bn86bsdi.o # bsdi
 | 
			
		||||
#BN_ASM= asm/alpha.o    # DEC Alpha
 | 
			
		||||
#BN_ASM= asm/pa-risc2.o # HP-UX PA-RISC
 | 
			
		||||
#BN_ASM= asm/r3000.o    # SGI MIPS cpu
 | 
			
		||||
#BN_ASM= asm/sparc.o    # Sun solaris/SunOS
 | 
			
		||||
#BN_ASM= asm/bn-win32.o # Windows 95/NT
 | 
			
		||||
#BN_ASM= asm/x86w16.o   # 16 bit code for Windows 3.1/DOS
 | 
			
		||||
#BN_ASM= asm/x86w32.o   # 32 bit code for Windows 3.1
 | 
			
		||||
 | 
			
		||||
# For x86 assembler: Set PROCESSOR to 386 if you want to support
 | 
			
		||||
# the 80386.
 | 
			
		||||
PROCESSOR=
 | 
			
		||||
 | 
			
		||||
# CPUID module collects small commonly used assembler snippets
 | 
			
		||||
CPUID_OBJ= 
 | 
			
		||||
BN_ASM= bn_asm.o
 | 
			
		||||
DES_ENC= des_enc.o fcrypt_b.o
 | 
			
		||||
AES_ASM_OBJ=aes_core.o aes_cbc.o
 | 
			
		||||
BF_ENC= bf_enc.o
 | 
			
		||||
CAST_ENC= c_enc.o
 | 
			
		||||
RC4_ENC= rc4_enc.o
 | 
			
		||||
RC5_ENC= rc5_enc.o
 | 
			
		||||
MD5_ASM_OBJ= 
 | 
			
		||||
SHA1_ASM_OBJ= 
 | 
			
		||||
RMD160_ASM_OBJ= 
 | 
			
		||||
# Set DES_ENC to des_enc.o if you want to use the C version
 | 
			
		||||
#There are 4 x86 assember options.
 | 
			
		||||
DES_ENC= asm/dx86-out.o asm/yx86-out.o
 | 
			
		||||
#DES_ENC= des_enc.o fcrypt_b.o          # C
 | 
			
		||||
#DES_ENC= asm/dx86-elf.o asm/yx86-elf.o # elf
 | 
			
		||||
#DES_ENC= asm/dx86-sol.o asm/yx86-sol.o # solaris
 | 
			
		||||
#DES_ENC= asm/dx86-out.o asm/yx86-out.o # a.out, FreeBSD
 | 
			
		||||
#DES_ENC= asm/dx86bsdi.o asm/yx86bsdi.o # bsdi
 | 
			
		||||
 | 
			
		||||
# KRB5 stuff
 | 
			
		||||
KRB5_INCLUDES=
 | 
			
		||||
LIBKRB5=
 | 
			
		||||
# Set BF_ENC to bf_enc.o if you want to use the C version
 | 
			
		||||
#There are 4 x86 assember options.
 | 
			
		||||
BF_ENC= asm/bx86-out.o
 | 
			
		||||
#BF_ENC= bf_enc.o
 | 
			
		||||
#BF_ENC= asm/bx86-elf.o # elf
 | 
			
		||||
#BF_ENC= asm/bx86-sol.o # solaris
 | 
			
		||||
#BF_ENC= asm/bx86-out.o # a.out, FreeBSD
 | 
			
		||||
#BF_ENC= asm/bx86bsdi.o # bsdi
 | 
			
		||||
 | 
			
		||||
# Zlib stuff
 | 
			
		||||
ZLIB_INCLUDE=
 | 
			
		||||
LIBZLIB=
 | 
			
		||||
# Set CAST_ENC to c_enc.o if you want to use the C version
 | 
			
		||||
#There are 4 x86 assember options.
 | 
			
		||||
CAST_ENC= asm/cx86-out.o
 | 
			
		||||
#CAST_ENC= c_enc.o
 | 
			
		||||
#CAST_ENC= asm/cx86-elf.o # elf
 | 
			
		||||
#CAST_ENC= asm/cx86-sol.o # solaris
 | 
			
		||||
#CAST_ENC= asm/cx86-out.o # a.out, FreeBSD
 | 
			
		||||
#CAST_ENC= asm/cx86bsdi.o # bsdi
 | 
			
		||||
 | 
			
		||||
# This is the location of fipscanister.o and friends.
 | 
			
		||||
# The FIPS module build will place it $(INSTALLTOP)/lib
 | 
			
		||||
# but since $(INSTALLTOP) can only take the default value
 | 
			
		||||
# when the module is built it will be in /usr/local/ssl/lib
 | 
			
		||||
# $(INSTALLTOP) for this build make be different so hard
 | 
			
		||||
# code the path.
 | 
			
		||||
# Set RC4_ENC to rc4_enc.o if you want to use the C version
 | 
			
		||||
#There are 4 x86 assember options.
 | 
			
		||||
RC4_ENC= asm/rx86-out.o
 | 
			
		||||
#RC4_ENC= rc4_enc.o
 | 
			
		||||
#RC4_ENC= asm/rx86-elf.o # elf
 | 
			
		||||
#RC4_ENC= asm/rx86-sol.o # solaris
 | 
			
		||||
#RC4_ENC= asm/rx86-out.o # a.out, FreeBSD
 | 
			
		||||
#RC4_ENC= asm/rx86bsdi.o # bsdi
 | 
			
		||||
 | 
			
		||||
FIPSLIBDIR=/usr/local/ssl/lib/
 | 
			
		||||
# Set RC5_ENC to rc5_enc.o if you want to use the C version
 | 
			
		||||
#There are 4 x86 assember options.
 | 
			
		||||
RC5_ENC= asm/r586-out.o
 | 
			
		||||
#RC5_ENC= rc5_enc.o
 | 
			
		||||
#RC5_ENC= asm/r586-elf.o # elf
 | 
			
		||||
#RC5_ENC= asm/r586-sol.o # solaris
 | 
			
		||||
#RC5_ENC= asm/r586-out.o # a.out, FreeBSD
 | 
			
		||||
#RC5_ENC= asm/r586bsdi.o # bsdi
 | 
			
		||||
 | 
			
		||||
# This is set to "y" if fipscanister.o is compiled internally as
 | 
			
		||||
# opposed to coming from an external validated location.
 | 
			
		||||
# Also need MD5_ASM defined
 | 
			
		||||
MD5_ASM_OBJ= asm/mx86-out.o
 | 
			
		||||
#MD5_ASM_OBJ= asm/mx86-elf.o        # elf
 | 
			
		||||
#MD5_ASM_OBJ= asm/mx86-sol.o        # solaris
 | 
			
		||||
#MD5_ASM_OBJ= asm/mx86-out.o        # a.out, FreeBSD
 | 
			
		||||
#MD5_ASM_OBJ= asm/mx86bsdi.o        # bsdi
 | 
			
		||||
 | 
			
		||||
FIPSCANISTERINTERNAL=n
 | 
			
		||||
# Also need SHA1_ASM defined
 | 
			
		||||
SHA1_ASM_OBJ= asm/sx86-out.o
 | 
			
		||||
#SHA1_ASM_OBJ= asm/sx86-elf.o       # elf
 | 
			
		||||
#SHA1_ASM_OBJ= asm/sx86-sol.o       # solaris
 | 
			
		||||
#SHA1_ASM_OBJ= asm/sx86-out.o       # a.out, FreeBSD
 | 
			
		||||
#SHA1_ASM_OBJ= asm/sx86bsdi.o       # bsdi
 | 
			
		||||
 | 
			
		||||
# The location of the library which contains fipscanister.o
 | 
			
		||||
# normally it will be libcrypto unless fipsdso is set in which
 | 
			
		||||
# case it will be libfips. If not compiling in FIPS mode at all
 | 
			
		||||
# this is empty making it a useful test for a FIPS compile.
 | 
			
		||||
# Also need RMD160_ASM defined
 | 
			
		||||
RMD160_ASM_OBJ= asm/rm86-out.o
 | 
			
		||||
#RMD160_ASM_OBJ= asm/rm86-elf.o       # elf
 | 
			
		||||
#RMD160_ASM_OBJ= asm/rm86-sol.o       # solaris
 | 
			
		||||
#RMD160_ASM_OBJ= asm/rm86-out.o       # a.out, FreeBSD
 | 
			
		||||
#RMD160_ASM_OBJ= asm/rm86bsdi.o       # bsdi
 | 
			
		||||
 | 
			
		||||
FIPSCANLIB=
 | 
			
		||||
 | 
			
		||||
# Shared library base address. Currently only used on Windows.
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
BASEADDR=
 | 
			
		||||
 | 
			
		||||
DIRS=   crypto fips ssl engines apps test tools
 | 
			
		||||
SHLIBDIRS= crypto ssl fips
 | 
			
		||||
DIRS=   crypto ssl rsaref apps test tools
 | 
			
		||||
SHLIBDIRS= crypto ssl
 | 
			
		||||
 | 
			
		||||
# dirs in crypto to build
 | 
			
		||||
SDIRS=  \
 | 
			
		||||
	objects \
 | 
			
		||||
	md2 md4 md5 sha mdc2 hmac ripemd \
 | 
			
		||||
	des aes rc2 rc4 rc5 idea bf cast camellia seed \
 | 
			
		||||
	bn ec rsa dsa ecdsa dh ecdh dso engine \
 | 
			
		||||
	buffer bio stack lhash rand err \
 | 
			
		||||
	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
 | 
			
		||||
	store pqueue
 | 
			
		||||
# keep in mind that the above list is adjusted by ./Configure
 | 
			
		||||
# according to no-xxx arguments...
 | 
			
		||||
	md2 md5 sha mdc2 hmac ripemd \
 | 
			
		||||
	des rc2 rc4 rc5 idea bf cast \
 | 
			
		||||
	bn rsa dsa dh \
 | 
			
		||||
	buffer bio stack lhash rand err objects \
 | 
			
		||||
	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp
 | 
			
		||||
 | 
			
		||||
# tests to perform.  "alltests" is a special word indicating that all tests
 | 
			
		||||
# should be performed.
 | 
			
		||||
TESTS = alltests
 | 
			
		||||
 | 
			
		||||
MAKEFILE= Makefile
 | 
			
		||||
MAKEFILE= Makefile.ssl
 | 
			
		||||
MAKE=     make -f Makefile.ssl
 | 
			
		||||
 | 
			
		||||
MANDIR=$(OPENSSLDIR)/man
 | 
			
		||||
MAN1=1
 | 
			
		||||
MAN3=3
 | 
			
		||||
MANSUFFIX=
 | 
			
		||||
SHELL=/bin/sh
 | 
			
		||||
 | 
			
		||||
TOP=    .
 | 
			
		||||
@@ -163,329 +168,67 @@ ONEDIRS=out tmp
 | 
			
		||||
EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
 | 
			
		||||
WDIRS=  windows
 | 
			
		||||
LIBS=   libcrypto.a libssl.a 
 | 
			
		||||
SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
 | 
			
		||||
SHARED_SSL=libssl$(SHLIB_EXT)
 | 
			
		||||
SHARED_FIPS=
 | 
			
		||||
SHARED_LIBS=
 | 
			
		||||
SHARED_LIBS_LINK_EXTS=
 | 
			
		||||
SHARED_LDFLAGS=
 | 
			
		||||
 | 
			
		||||
GENERAL=        Makefile
 | 
			
		||||
BASENAME=       openssl
 | 
			
		||||
NAME=           $(BASENAME)-fips-$(VERSION)
 | 
			
		||||
NAME=           $(BASENAME)-$(VERSION)
 | 
			
		||||
TARFILE=        $(NAME).tar
 | 
			
		||||
WTARFILE=       $(NAME)-win.tar
 | 
			
		||||
EXHEADER=       e_os2.h
 | 
			
		||||
EXHEADER=       e_os.h e_os2.h
 | 
			
		||||
HEADER=         e_os.h
 | 
			
		||||
 | 
			
		||||
all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
 | 
			
		||||
 | 
			
		||||
# as we stick to -e, CLEARENV ensures that local variables in lower
 | 
			
		||||
# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
 | 
			
		||||
# shell, which [annoyingly enough] terminates unset with error if VAR
 | 
			
		||||
# is not present:-( TOP= && unset TOP is tribute to HP-UX /bin/sh,
 | 
			
		||||
# which terminates unset with error if no variable was present:-(
 | 
			
		||||
CLEARENV=	TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}	\
 | 
			
		||||
		$${INCLUDE+INCLUDE} $${INCLUDES+INCLUDES}	\
 | 
			
		||||
		$${DIR+DIR} $${DIRS+DIRS} $${SRC+SRC}		\
 | 
			
		||||
		$${LIBSRC+LIBSRC} $${LIBOBJ+LIBOBJ} $${ALL+ALL}	\
 | 
			
		||||
		$${EXHEADER+EXHEADER} $${HEADER+HEADER}		\
 | 
			
		||||
		$${GENERAL+GENERAL} $${CFLAGS+CFLAGS}		\
 | 
			
		||||
		$${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS}		\
 | 
			
		||||
		$${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS}		\
 | 
			
		||||
		$${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS}	\
 | 
			
		||||
		$${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS}
 | 
			
		||||
 | 
			
		||||
BUILDENV=	PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
 | 
			
		||||
		CC='${CC}' CFLAG='${CFLAG}' 			\
 | 
			
		||||
		AS='${CC}' ASFLAG='${CFLAG} -c'			\
 | 
			
		||||
		AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'	\
 | 
			
		||||
		SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib'	\
 | 
			
		||||
		INSTALL_PREFIX='${INSTALL_PREFIX}'		\
 | 
			
		||||
		INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}'	\
 | 
			
		||||
		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \
 | 
			
		||||
		DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}'	\
 | 
			
		||||
		MAKEDEPPROG='${MAKEDEPPROG}'			\
 | 
			
		||||
		SHARED_LDFLAGS='${SHARED_LDFLAGS}'		\
 | 
			
		||||
		KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}'	\
 | 
			
		||||
		EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}'	\
 | 
			
		||||
		SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}'	\
 | 
			
		||||
		PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}'	\
 | 
			
		||||
		CPUID_OBJ='${CPUID_OBJ}'			\
 | 
			
		||||
		BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' 	\
 | 
			
		||||
		AES_ASM_OBJ='${AES_ASM_OBJ}'			\
 | 
			
		||||
		BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}'	\
 | 
			
		||||
		RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}'	\
 | 
			
		||||
		SHA1_ASM_OBJ='${SHA1_ASM_OBJ}'			\
 | 
			
		||||
		MD5_ASM_OBJ='${MD5_ASM_OBJ}'			\
 | 
			
		||||
		RMD160_ASM_OBJ='${RMD160_ASM_OBJ}'		\
 | 
			
		||||
		FIPSLIBDIR='${FIPSLIBDIR}' FIPSCANLIB='${FIPSCANLIB}' \
 | 
			
		||||
		FIPSCANISTERINTERNAL='${FIPSCANISTERINTERNAL}'	\
 | 
			
		||||
		FIPS_EX_OBJ='${FIPS_EX_OBJ}'	\
 | 
			
		||||
		THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES=
 | 
			
		||||
# MAKEOVERRIDES= effectively "equalizes" GNU-ish and SysV-ish make flavors,
 | 
			
		||||
# which in turn eliminates ambiguities in variable treatment with -e.
 | 
			
		||||
 | 
			
		||||
# BUILD_CMD is a generic macro to build a given target in a given
 | 
			
		||||
# subdirectory.  The target must be given through the shell variable
 | 
			
		||||
# `target' and the subdirectory to build in must be given through `dir'.
 | 
			
		||||
# This macro shouldn't be used directly, use RECURSIVE_BUILD_CMD or
 | 
			
		||||
# BUILD_ONE_CMD instead.
 | 
			
		||||
#
 | 
			
		||||
# BUILD_ONE_CMD is a macro to build a given target in a given
 | 
			
		||||
# subdirectory if that subdirectory is part of $(DIRS).  It requires
 | 
			
		||||
# exactly the same shell variables as BUILD_CMD.
 | 
			
		||||
#
 | 
			
		||||
# RECURSIVE_BUILD_CMD is a macro to build a given target in all
 | 
			
		||||
# subdirectories defined in $(DIRS).  It requires that the target
 | 
			
		||||
# is given through the shell variable `target'.
 | 
			
		||||
BUILD_CMD=  if [ -d "$$dir" ]; then \
 | 
			
		||||
	    (	cd $$dir && echo "making $$target in $$dir..." && \
 | 
			
		||||
		$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. DIR=$$dir $$target \
 | 
			
		||||
	    ) || exit 1; \
 | 
			
		||||
	    fi
 | 
			
		||||
RECURSIVE_BUILD_CMD=for dir in $(DIRS); do $(BUILD_CMD); done
 | 
			
		||||
BUILD_ONE_CMD=\
 | 
			
		||||
	if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \
 | 
			
		||||
		$(BUILD_CMD); \
 | 
			
		||||
	fi
 | 
			
		||||
 | 
			
		||||
reflect:
 | 
			
		||||
	@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
 | 
			
		||||
 | 
			
		||||
FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
 | 
			
		||||
	../crypto/aes/aes_ecb.o \
 | 
			
		||||
	../crypto/aes/aes_ofb.o \
 | 
			
		||||
	../crypto/bn/bn_add.o \
 | 
			
		||||
	../crypto/bn/bn_blind.o \
 | 
			
		||||
	../crypto/bn/bn_ctx.o \
 | 
			
		||||
	../crypto/bn/bn_div.o \
 | 
			
		||||
	../crypto/bn/bn_exp2.o \
 | 
			
		||||
	../crypto/bn/bn_exp.o \
 | 
			
		||||
	../crypto/bn/bn_gcd.o \
 | 
			
		||||
	../crypto/bn/bn_lib.o \
 | 
			
		||||
	../crypto/bn/bn_mod.o \
 | 
			
		||||
	../crypto/bn/bn_mont.o \
 | 
			
		||||
	../crypto/bn/bn_mul.o \
 | 
			
		||||
	../crypto/bn/bn_prime.o \
 | 
			
		||||
	../crypto/bn/bn_rand.o \
 | 
			
		||||
	../crypto/bn/bn_recp.o \
 | 
			
		||||
	../crypto/bn/bn_shift.o \
 | 
			
		||||
	../crypto/bn/bn_sqr.o \
 | 
			
		||||
	../crypto/bn/bn_word.o \
 | 
			
		||||
	../crypto/bn/bn_x931p.o \
 | 
			
		||||
	../crypto/buffer/buf_str.o \
 | 
			
		||||
	../crypto/cryptlib.o \
 | 
			
		||||
	../crypto/des/cfb64ede.o \
 | 
			
		||||
	../crypto/des/cfb64enc.o \
 | 
			
		||||
	../crypto/des/cfb_enc.o \
 | 
			
		||||
	../crypto/des/ecb3_enc.o \
 | 
			
		||||
	../crypto/des/ecb_enc.o \
 | 
			
		||||
	../crypto/des/ofb64ede.o \
 | 
			
		||||
	../crypto/des/ofb64enc.o \
 | 
			
		||||
	../crypto/des/fcrypt.o \
 | 
			
		||||
	../crypto/des/set_key.o \
 | 
			
		||||
	../crypto/dsa/dsa_utl.o \
 | 
			
		||||
	../crypto/dsa/dsa_sign.o \
 | 
			
		||||
	../crypto/dsa/dsa_vrf.o \
 | 
			
		||||
	../crypto/err/err.o \
 | 
			
		||||
	../crypto/evp/digest.o \
 | 
			
		||||
	../crypto/evp/enc_min.o \
 | 
			
		||||
	../crypto/evp/e_aes.o \
 | 
			
		||||
	../crypto/evp/e_des3.o \
 | 
			
		||||
	../crypto/evp/p_sign.o \
 | 
			
		||||
	../crypto/evp/p_verify.o \
 | 
			
		||||
	../crypto/mem_clr.o \
 | 
			
		||||
	../crypto/mem.o \
 | 
			
		||||
	../crypto/rand/md_rand.o \
 | 
			
		||||
	../crypto/rand/rand_egd.o \
 | 
			
		||||
	../crypto/rand/randfile.o \
 | 
			
		||||
	../crypto/rand/rand_lib.o \
 | 
			
		||||
	../crypto/rand/rand_os2.o \
 | 
			
		||||
	../crypto/rand/rand_unix.o \
 | 
			
		||||
	../crypto/rand/rand_win.o \
 | 
			
		||||
	../crypto/rsa/rsa_lib.o \
 | 
			
		||||
	../crypto/rsa/rsa_none.o \
 | 
			
		||||
	../crypto/rsa/rsa_oaep.o \
 | 
			
		||||
	../crypto/rsa/rsa_pk1.o \
 | 
			
		||||
	../crypto/rsa/rsa_pss.o \
 | 
			
		||||
	../crypto/rsa/rsa_ssl.o \
 | 
			
		||||
	../crypto/rsa/rsa_x931.o \
 | 
			
		||||
	../crypto/sha/sha1dgst.o \
 | 
			
		||||
	../crypto/sha/sha256.o \
 | 
			
		||||
	../crypto/sha/sha512.o \
 | 
			
		||||
	../crypto/uid.o
 | 
			
		||||
 | 
			
		||||
sub_all: build_all
 | 
			
		||||
build_all: build_libs build_apps build_tests build_tools
 | 
			
		||||
 | 
			
		||||
build_libs: build_crypto build_fips build_ssl build_shared build_engines
 | 
			
		||||
 | 
			
		||||
build_crypto:
 | 
			
		||||
	if [ -n "$(FIPSCANLIB)" ]; then \
 | 
			
		||||
		EXCL_OBJ='$(AES_ASM_OBJ) $(BN_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA1_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \
 | 
			
		||||
		ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \
 | 
			
		||||
	else \
 | 
			
		||||
		ARX='${AR}' ; \
 | 
			
		||||
	fi ; export ARX ; \
 | 
			
		||||
		dir=crypto; target=all; $(BUILD_ONE_CMD)
 | 
			
		||||
build_fips:
 | 
			
		||||
	@dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
 | 
			
		||||
build_ssl:
 | 
			
		||||
	@dir=ssl; target=all; $(BUILD_ONE_CMD)
 | 
			
		||||
build_engines:
 | 
			
		||||
	@dir=engines; target=all; $(BUILD_ONE_CMD)
 | 
			
		||||
build_apps:
 | 
			
		||||
	@dir=apps; target=all; $(BUILD_ONE_CMD)
 | 
			
		||||
build_tests:
 | 
			
		||||
	@dir=test; target=all; $(BUILD_ONE_CMD)
 | 
			
		||||
build_tools:
 | 
			
		||||
	@dir=tools; target=all; $(BUILD_ONE_CMD)
 | 
			
		||||
 | 
			
		||||
all_testapps: build_libs build_testapps
 | 
			
		||||
build_testapps:
 | 
			
		||||
	@dir=crypto; target=testapps; $(BUILD_ONE_CMD)
 | 
			
		||||
 | 
			
		||||
build_shared:	$(SHARED_LIBS)
 | 
			
		||||
libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
 | 
			
		||||
	@if [ "$(SHLIB_TARGET)" != "" ]; then \
 | 
			
		||||
		if [ "$(FIPSCANLIB)" = "libfips" ]; then \
 | 
			
		||||
			$(ARD) libcrypto.a fipscanister.o ; \
 | 
			
		||||
			$(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
 | 
			
		||||
			$(AR) libcrypto.a fips/fipscanister.o ; \
 | 
			
		||||
		else \
 | 
			
		||||
			if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
 | 
			
		||||
				FIPSLD_CC=$(CC); CC=fips/fipsld; \
 | 
			
		||||
				export CC FIPSLD_CC; \
 | 
			
		||||
			fi; \
 | 
			
		||||
			$(MAKE) -e SHLIBDIRS='crypto' build-shared; \
 | 
			
		||||
		fi \
 | 
			
		||||
	else \
 | 
			
		||||
		echo "There's no support for shared libraries on this platform" >&2; \
 | 
			
		||||
		exit 1; \
 | 
			
		||||
	fi
 | 
			
		||||
 | 
			
		||||
libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
 | 
			
		||||
	@if [ "$(SHLIB_TARGET)" != "" ]; then \
 | 
			
		||||
		shlibdeps=-lcrypto; \
 | 
			
		||||
		[ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \
 | 
			
		||||
		$(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
 | 
			
		||||
	else \
 | 
			
		||||
		echo "There's no support for shared libraries on this platform" >&2 ; \
 | 
			
		||||
		exit 1; \
 | 
			
		||||
	fi
 | 
			
		||||
 | 
			
		||||
fips/fipscanister.o:	build_fips
 | 
			
		||||
libfips$(SHLIB_EXT):		fips/fipscanister.o
 | 
			
		||||
	@if [ "$(SHLIB_TARGET)" != "" ]; then \
 | 
			
		||||
		FIPSLD_CC=$(CC); CC=fips/fipsld; export CC FIPSLD_CC; \
 | 
			
		||||
		$(MAKE) -f Makefile.shared -e $(BUILDENV) \
 | 
			
		||||
			CC=$${CC} LIBNAME=fips THIS=$@ \
 | 
			
		||||
			LIBEXTRAS=fips/fipscanister.o \
 | 
			
		||||
			LIBDEPS="$(EX_LIBS)" \
 | 
			
		||||
			LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
 | 
			
		||||
			link_o.$(SHLIB_TARGET) || { rm -f $@; exit 1; } \
 | 
			
		||||
	else \
 | 
			
		||||
		echo "There's no support for shared libraries on this platform" >&2; \
 | 
			
		||||
		exit 1; \
 | 
			
		||||
	fi
 | 
			
		||||
 | 
			
		||||
libfips.a:
 | 
			
		||||
	dir=fips; target=all; $(BUILD_ONE_CMD)
 | 
			
		||||
 | 
			
		||||
clean-shared:
 | 
			
		||||
	@set -e; for i in $(SHLIBDIRS); do \
 | 
			
		||||
		if [ -n "$(SHARED_LIBS_LINK_EXTS)" ]; then \
 | 
			
		||||
			tmp="$(SHARED_LIBS_LINK_EXTS)"; \
 | 
			
		||||
			for j in $${tmp:-x}; do \
 | 
			
		||||
				( set -x; rm -f lib$$i$$j ); \
 | 
			
		||||
			done; \
 | 
			
		||||
		fi; \
 | 
			
		||||
		( set -x; rm -f lib$$i$(SHLIB_EXT) ); \
 | 
			
		||||
		if [ "$(PLATFORM)" = "Cygwin" ]; then \
 | 
			
		||||
			( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
 | 
			
		||||
		fi; \
 | 
			
		||||
all: Makefile.ssl
 | 
			
		||||
	@for i in $(DIRS) ;\
 | 
			
		||||
	do \
 | 
			
		||||
	(cd $$i && echo "making all in $$i..." && \
 | 
			
		||||
	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
 | 
			
		||||
	done
 | 
			
		||||
	-@# cd crypto; $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' testapps
 | 
			
		||||
	-@# cd perl; $(PERL) Makefile.PL; make
 | 
			
		||||
 | 
			
		||||
link-shared:
 | 
			
		||||
	@ set -e; for i in ${SHLIBDIRS}; do \
 | 
			
		||||
		$(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \
 | 
			
		||||
			LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
 | 
			
		||||
			LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
 | 
			
		||||
			symlink.$(SHLIB_TARGET); \
 | 
			
		||||
		libs="$$libs -l$$i"; \
 | 
			
		||||
	done
 | 
			
		||||
sub_all:
 | 
			
		||||
	@for i in $(DIRS) ;\
 | 
			
		||||
	do \
 | 
			
		||||
	(cd $$i && echo "making all in $$i..." && \
 | 
			
		||||
	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
 | 
			
		||||
	done;
 | 
			
		||||
 | 
			
		||||
build-shared: do_$(SHLIB_TARGET) link-shared
 | 
			
		||||
linux-shared:
 | 
			
		||||
	for i in ${SHLIBDIRS}; do \
 | 
			
		||||
	rm -f lib$$i.a lib$$i.so \
 | 
			
		||||
		lib$$i.so.${MAJOR} lib$$i.so.${MAJOR}.${MINOR}; \
 | 
			
		||||
	${MAKE} CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='-fPIC ${CFLAG}' SDIRS='${SDIRS}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' DIRS=$$i clean all || exit 1; \
 | 
			
		||||
	( set -x; ${CC}  -shared -o lib$$i.so.${MAJOR}.${MINOR} \
 | 
			
		||||
		-Wl,-S,-soname=lib$$i.so.${MAJOR} \
 | 
			
		||||
		-Wl,--whole-archive lib$$i.a \
 | 
			
		||||
		-Wl,--no-whole-archive -lc ) || exit 1; \
 | 
			
		||||
	rm -f lib$$i.a; make -C $$i clean || exit 1 ;\
 | 
			
		||||
	done;
 | 
			
		||||
	@set -x; \
 | 
			
		||||
	for i in ${SHLIBDIRS}; do \
 | 
			
		||||
	ln -s lib$$i.so.${MAJOR}.${MINOR} lib$$i.so.${MAJOR}; \
 | 
			
		||||
	ln -s lib$$i.so.${MAJOR} lib$$i.so; \
 | 
			
		||||
	done;
 | 
			
		||||
 | 
			
		||||
do_$(SHLIB_TARGET):
 | 
			
		||||
	@ set -e; libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
 | 
			
		||||
		if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
 | 
			
		||||
			libs="$(LIBKRB5) $$libs"; \
 | 
			
		||||
		fi; \
 | 
			
		||||
		$(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \
 | 
			
		||||
			LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
 | 
			
		||||
			LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
 | 
			
		||||
			LIBDEPS="$$libs $(EX_LIBS)" \
 | 
			
		||||
			link_a.$(SHLIB_TARGET); \
 | 
			
		||||
		libs="-l$$i $$libs"; \
 | 
			
		||||
	done
 | 
			
		||||
 | 
			
		||||
libcrypto.pc: Makefile
 | 
			
		||||
	@ ( echo 'prefix=$(INSTALLTOP)'; \
 | 
			
		||||
	    echo 'exec_prefix=$${prefix}'; \
 | 
			
		||||
	    echo 'libdir=$${exec_prefix}/lib'; \
 | 
			
		||||
	    echo 'includedir=$${prefix}/include'; \
 | 
			
		||||
	    echo ''; \
 | 
			
		||||
	    echo 'Name: OpenSSL-libcrypto'; \
 | 
			
		||||
	    echo 'Description: OpenSSL cryptography library'; \
 | 
			
		||||
	    echo 'Version: '$(VERSION); \
 | 
			
		||||
	    echo 'Requires: '; \
 | 
			
		||||
	    echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
 | 
			
		||||
	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
 | 
			
		||||
 | 
			
		||||
libssl.pc: Makefile
 | 
			
		||||
	@ ( echo 'prefix=$(INSTALLTOP)'; \
 | 
			
		||||
	    echo 'exec_prefix=$${prefix}'; \
 | 
			
		||||
	    echo 'libdir=$${exec_prefix}/lib'; \
 | 
			
		||||
	    echo 'includedir=$${prefix}/include'; \
 | 
			
		||||
	    echo ''; \
 | 
			
		||||
	    echo 'Name: OpenSSL'; \
 | 
			
		||||
	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
 | 
			
		||||
	    echo 'Version: '$(VERSION); \
 | 
			
		||||
	    echo 'Requires: '; \
 | 
			
		||||
	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
 | 
			
		||||
	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
 | 
			
		||||
 | 
			
		||||
openssl.pc: Makefile
 | 
			
		||||
	@ ( echo 'prefix=$(INSTALLTOP)'; \
 | 
			
		||||
	    echo 'exec_prefix=$${prefix}'; \
 | 
			
		||||
	    echo 'libdir=$${exec_prefix}/lib'; \
 | 
			
		||||
	    echo 'includedir=$${prefix}/include'; \
 | 
			
		||||
	    echo ''; \
 | 
			
		||||
	    echo 'Name: OpenSSL'; \
 | 
			
		||||
	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
 | 
			
		||||
	    echo 'Version: '$(VERSION); \
 | 
			
		||||
	    echo 'Requires: '; \
 | 
			
		||||
	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
 | 
			
		||||
	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
 | 
			
		||||
 | 
			
		||||
Makefile: Makefile.org Configure config
 | 
			
		||||
	@echo "Makefile is older than Makefile.org, Configure or config."
 | 
			
		||||
Makefile.ssl: Makefile.org
 | 
			
		||||
	@echo "Makefile.ssl is older than Makefile.org."
 | 
			
		||||
	@echo "Reconfigure the source tree (via './config' or 'perl Configure'), please."
 | 
			
		||||
	@false
 | 
			
		||||
 | 
			
		||||
libclean:
 | 
			
		||||
	rm -f *.map *.so *.so.* *.dll engines/*.so engines/*.dll *.a engines/*.a */lib */*/lib
 | 
			
		||||
	rm -f *.a */lib */*/lib
 | 
			
		||||
 | 
			
		||||
clean:	libclean
 | 
			
		||||
	rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
 | 
			
		||||
	@set -e; target=clean; $(RECURSIVE_BUILD_CMD)
 | 
			
		||||
	rm -f $(LIBS)
 | 
			
		||||
	rm -f openssl.pc libssl.pc libcrypto.pc
 | 
			
		||||
	rm -f speed.* .pure
 | 
			
		||||
clean:
 | 
			
		||||
	rm -f shlib/*.o *.o core a.out fluff *.map rehash.time testlog make.log cctest cctest.c
 | 
			
		||||
	@for i in $(DIRS) ;\
 | 
			
		||||
	do \
 | 
			
		||||
	(cd $$i && echo "making clean in $$i..." && \
 | 
			
		||||
	$(MAKE) SDIRS='${SDIRS}' clean ) || exit 1; \
 | 
			
		||||
	rm -f $(LIBS); \
 | 
			
		||||
	done;
 | 
			
		||||
	rm -f *.a *.o speed.* *.map *.so .pure core
 | 
			
		||||
	rm -f $(TARFILE)
 | 
			
		||||
	@set -e; for i in $(ONEDIRS) ;\
 | 
			
		||||
	@for i in $(ONEDIRS) ;\
 | 
			
		||||
	do \
 | 
			
		||||
	rm -fr $$i/*; \
 | 
			
		||||
	done
 | 
			
		||||
@@ -495,183 +238,127 @@ makefile.one: files
 | 
			
		||||
	sh util/do_ms.sh
 | 
			
		||||
 | 
			
		||||
files:
 | 
			
		||||
	$(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO
 | 
			
		||||
	@set -e; target=files; $(RECURSIVE_BUILD_CMD)
 | 
			
		||||
	$(PERL) $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO
 | 
			
		||||
	@for i in $(DIRS) ;\
 | 
			
		||||
	do \
 | 
			
		||||
	(cd $$i && echo "making 'files' in $$i..." && \
 | 
			
		||||
	$(MAKE) SDIRS='${SDIRS}' PERL='${PERL}' files ) || exit 1; \
 | 
			
		||||
	done;
 | 
			
		||||
 | 
			
		||||
links:
 | 
			
		||||
	@$(TOP)/util/point.sh Makefile.ssl Makefile
 | 
			
		||||
	@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
 | 
			
		||||
	@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
 | 
			
		||||
	@set -e; target=links; $(RECURSIVE_BUILD_CMD)
 | 
			
		||||
 | 
			
		||||
gentests:
 | 
			
		||||
	@(cd test && echo "generating dummy tests (if needed)..." && \
 | 
			
		||||
	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on generate );
 | 
			
		||||
	@for i in $(DIRS); do \
 | 
			
		||||
	(cd $$i && echo "making links in $$i..." && \
 | 
			
		||||
	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PERL='${PERL}' links ) || exit 1; \
 | 
			
		||||
	done;
 | 
			
		||||
 | 
			
		||||
dclean:
 | 
			
		||||
	rm -f *.bak
 | 
			
		||||
	@set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
 | 
			
		||||
	@for i in $(DIRS) ;\
 | 
			
		||||
	do \
 | 
			
		||||
	(cd $$i && echo "making dclean in $$i..." && \
 | 
			
		||||
	$(MAKE) SDIRS='${SDIRS}' PERL='${PERL}' dclean ) || exit 1; \
 | 
			
		||||
	done;
 | 
			
		||||
 | 
			
		||||
rehash: rehash.time
 | 
			
		||||
rehash.time: certs apps
 | 
			
		||||
	@if [ -z "$(CROSS_COMPILE)" ]; then \
 | 
			
		||||
		(OPENSSL="`pwd`/util/opensslwrap.sh"; \
 | 
			
		||||
		OPENSSL_DEBUG_MEMORY=on; \
 | 
			
		||||
		export OPENSSL OPENSSL_DEBUG_MEMORY; \
 | 
			
		||||
		$(PERL) tools/c_rehash certs) && \
 | 
			
		||||
		touch rehash.time; \
 | 
			
		||||
	else :; fi
 | 
			
		||||
rehash.time: certs
 | 
			
		||||
	@(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
 | 
			
		||||
	touch rehash.time
 | 
			
		||||
 | 
			
		||||
test:   tests
 | 
			
		||||
 | 
			
		||||
tests: rehash
 | 
			
		||||
	@(cd test && echo "testing..." && \
 | 
			
		||||
	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );
 | 
			
		||||
	util/opensslwrap.sh version -a
 | 
			
		||||
	$(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' tests );
 | 
			
		||||
	@apps/openssl version -a
 | 
			
		||||
 | 
			
		||||
report:
 | 
			
		||||
	@$(PERL) util/selftest.pl
 | 
			
		||||
 | 
			
		||||
depend:
 | 
			
		||||
	@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
 | 
			
		||||
	@for i in $(DIRS) ;\
 | 
			
		||||
	do \
 | 
			
		||||
	(cd $$i && echo "making dependencies $$i..." && \
 | 
			
		||||
	$(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' depend ) || exit 1; \
 | 
			
		||||
	done;
 | 
			
		||||
 | 
			
		||||
lint:
 | 
			
		||||
	@set -e; target=lint; $(RECURSIVE_BUILD_CMD)
 | 
			
		||||
	@for i in $(DIRS) ;\
 | 
			
		||||
	do \
 | 
			
		||||
	(cd $$i && echo "making lint $$i..." && \
 | 
			
		||||
	$(MAKE) SDIRS='${SDIRS}' lint ) || exit 1; \
 | 
			
		||||
	done;
 | 
			
		||||
 | 
			
		||||
tags:
 | 
			
		||||
	rm -f TAGS
 | 
			
		||||
	find . -name '[^.]*.[ch]' | xargs etags -a
 | 
			
		||||
	@for i in $(DIRS) ;\
 | 
			
		||||
	do \
 | 
			
		||||
	(cd $$i && echo "making tags $$i..." && \
 | 
			
		||||
	$(MAKE) SDIRS='${SDIRS}' tags ) || exit 1; \
 | 
			
		||||
	done;
 | 
			
		||||
 | 
			
		||||
errors:
 | 
			
		||||
	$(PERL) util/mkerr.pl -recurse -write
 | 
			
		||||
	(cd engines; $(MAKE) PERL=$(PERL) errors)
 | 
			
		||||
	$(PERL) util/ck_errf.pl */*.c */*/*.c
 | 
			
		||||
 | 
			
		||||
stacks:
 | 
			
		||||
	$(PERL) util/mkstack.pl -write
 | 
			
		||||
	perl util/mkerr.pl -recurse -write
 | 
			
		||||
 | 
			
		||||
util/libeay.num::
 | 
			
		||||
	$(PERL) util/mkdef.pl crypto update
 | 
			
		||||
	perl util/mkdef.pl crypto update
 | 
			
		||||
 | 
			
		||||
util/ssleay.num::
 | 
			
		||||
	$(PERL) util/mkdef.pl ssl update
 | 
			
		||||
 | 
			
		||||
crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h
 | 
			
		||||
	$(PERL) crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h
 | 
			
		||||
crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num
 | 
			
		||||
	$(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h
 | 
			
		||||
 | 
			
		||||
apps/openssl-vms.cnf: apps/openssl.cnf
 | 
			
		||||
	$(PERL) VMS/VMSify-conf.pl < apps/openssl.cnf > apps/openssl-vms.cnf
 | 
			
		||||
 | 
			
		||||
crypto/bn/bn_prime.h: crypto/bn/bn_prime.pl
 | 
			
		||||
	$(PERL) crypto/bn/bn_prime.pl >crypto/bn/bn_prime.h
 | 
			
		||||
	perl util/mkdef.pl ssl update
 | 
			
		||||
 | 
			
		||||
crypto/objects/obj_dat.h: crypto/objects/objects.h crypto/objects/obj_dat.pl
 | 
			
		||||
	perl crypto/objects/obj_dat.pl crypto/objects/objects.h crypto/objects/obj_dat.h
 | 
			
		||||
 | 
			
		||||
TABLE: Configure
 | 
			
		||||
	(echo 'Output of `Configure TABLE'"':"; \
 | 
			
		||||
	$(PERL) Configure TABLE) > TABLE
 | 
			
		||||
	perl Configure TABLE) > TABLE
 | 
			
		||||
 | 
			
		||||
update: errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
 | 
			
		||||
update: depend errors util/libeay.num util/ssleay.num crypto/objects/obj_dat.h TABLE
 | 
			
		||||
 | 
			
		||||
# Build distribution tar-file. As the list of files returned by "find" is
 | 
			
		||||
# pretty long, on several platforms a "too many arguments" error or similar
 | 
			
		||||
# would occur. Therefore the list of files is temporarily stored into a file
 | 
			
		||||
# and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
 | 
			
		||||
# tar does not support the --files-from option.
 | 
			
		||||
tar:
 | 
			
		||||
	find . -type d -print | xargs chmod 755
 | 
			
		||||
	find . -type f -print | xargs chmod a+r
 | 
			
		||||
	find . -type f -perm -0100 -print | xargs chmod a+x
 | 
			
		||||
	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \
 | 
			
		||||
	$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
 | 
			
		||||
	tardy --user_number=0  --user_name=openssl \
 | 
			
		||||
	      --group_number=0 --group_name=openssl \
 | 
			
		||||
	      --prefix=openssl-fips-$(VERSION) - |\
 | 
			
		||||
	gzip --best >../$(TARFILE).gz; \
 | 
			
		||||
	rm -f ../$(TARFILE).list; \
 | 
			
		||||
	ls -l ../$(TARFILE).gz
 | 
			
		||||
 | 
			
		||||
tar-snap:
 | 
			
		||||
	@$(TAR) $(TARFLAGS) -cvf - \
 | 
			
		||||
		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \! -name '*test' \! -name '.#*' \! -name '*~' | sort` |\
 | 
			
		||||
		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort` |\
 | 
			
		||||
	tardy --user_number=0  --user_name=openssl \
 | 
			
		||||
	      --group_number=0 --group_name=openssl \
 | 
			
		||||
	      --prefix=openssl-$(VERSION) - > ../$(TARFILE);\
 | 
			
		||||
	ls -l ../$(TARFILE)
 | 
			
		||||
	      --prefix=openssl-$(VERSION) - |\
 | 
			
		||||
	gzip --best >../$(TARFILE).gz; \
 | 
			
		||||
	ls -l ../$(TARFILE).gz
 | 
			
		||||
 | 
			
		||||
dist:   
 | 
			
		||||
	$(PERL) Configure dist
 | 
			
		||||
	@$(MAKE) dist_pem_h
 | 
			
		||||
	@$(MAKE) SDIRS='${SDIRS}' clean
 | 
			
		||||
	@$(MAKE) TAR='${TAR}' TARFLAGS='${TARFLAGS}' tar
 | 
			
		||||
	@$(MAKE) tar
 | 
			
		||||
 | 
			
		||||
dist_pem_h:
 | 
			
		||||
	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
 | 
			
		||||
	(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
 | 
			
		||||
 | 
			
		||||
install: all install_sw
 | 
			
		||||
 | 
			
		||||
install_sw:
 | 
			
		||||
install: all install_docs
 | 
			
		||||
	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
 | 
			
		||||
		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \
 | 
			
		||||
		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
 | 
			
		||||
		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
 | 
			
		||||
		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
 | 
			
		||||
		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
 | 
			
		||||
		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
 | 
			
		||||
		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
 | 
			
		||||
	@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
 | 
			
		||||
		$(INSTALL_PREFIX)$(OPENSSLDIR)/private \
 | 
			
		||||
		$(INSTALL_PREFIX)$(OPENSSLDIR)/lib
 | 
			
		||||
	@for i in $(EXHEADER) ;\
 | 
			
		||||
	do \
 | 
			
		||||
	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
 | 
			
		||||
	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
 | 
			
		||||
	done;
 | 
			
		||||
	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
 | 
			
		||||
	@set -e; for i in $(LIBS) ;\
 | 
			
		||||
	@for i in $(DIRS) ;\
 | 
			
		||||
	do \
 | 
			
		||||
		if [ -f "$$i" ]; then \
 | 
			
		||||
		(       echo installing $$i; \
 | 
			
		||||
			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
 | 
			
		||||
			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
 | 
			
		||||
			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
 | 
			
		||||
			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
 | 
			
		||||
		fi; \
 | 
			
		||||
	done;
 | 
			
		||||
	@set -e; if [ -n "$(SHARED_LIBS)" ]; then \
 | 
			
		||||
		tmp="$(SHARED_LIBS)"; \
 | 
			
		||||
		for i in $${tmp:-x}; \
 | 
			
		||||
		do \
 | 
			
		||||
			if [ -f "$$i" -o -f "$$i.a" ]; then \
 | 
			
		||||
			(       echo installing $$i; \
 | 
			
		||||
				if [ "$(PLATFORM)" != "Cygwin" ]; then \
 | 
			
		||||
					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
 | 
			
		||||
					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
 | 
			
		||||
					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
 | 
			
		||||
				else \
 | 
			
		||||
					c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
 | 
			
		||||
					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
 | 
			
		||||
					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
 | 
			
		||||
					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
 | 
			
		||||
					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
 | 
			
		||||
					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
 | 
			
		||||
					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
 | 
			
		||||
				fi ); \
 | 
			
		||||
			fi; \
 | 
			
		||||
		done; \
 | 
			
		||||
		(	here="`pwd`"; \
 | 
			
		||||
			cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
 | 
			
		||||
			$(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \
 | 
			
		||||
		if [ "$(INSTALLTOP)" != "/usr" ]; then \
 | 
			
		||||
			echo 'OpenSSL shared libraries have been installed in:'; \
 | 
			
		||||
			echo '  $(INSTALLTOP)'; \
 | 
			
		||||
			echo ''; \
 | 
			
		||||
			sed -e '1,/^$$/d' doc/openssl-shared.txt; \
 | 
			
		||||
		fi; \
 | 
			
		||||
	fi
 | 
			
		||||
	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
 | 
			
		||||
	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libcrypto.pc
 | 
			
		||||
	cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
 | 
			
		||||
	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libssl.pc
 | 
			
		||||
	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
 | 
			
		||||
	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc
 | 
			
		||||
	(cd $$i; echo "installing $$i..."; \
 | 
			
		||||
	$(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' EX_LIBS='${EX_LIBS}' SDIRS='${SDIRS}' RANLIB='${RANLIB}' install ); \
 | 
			
		||||
	done
 | 
			
		||||
	@for i in $(LIBS) ;\
 | 
			
		||||
	do \
 | 
			
		||||
	(       echo installing $$i; \
 | 
			
		||||
		cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
 | 
			
		||||
		$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
 | 
			
		||||
		chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
 | 
			
		||||
	done
 | 
			
		||||
 | 
			
		||||
install_docs:
 | 
			
		||||
	@$(PERL) $(TOP)/util/mkdir-p.pl \
 | 
			
		||||
@@ -679,45 +366,23 @@ install_docs:
 | 
			
		||||
		$(INSTALL_PREFIX)$(MANDIR)/man3 \
 | 
			
		||||
		$(INSTALL_PREFIX)$(MANDIR)/man5 \
 | 
			
		||||
		$(INSTALL_PREFIX)$(MANDIR)/man7
 | 
			
		||||
	@pod2man="`cd util; ./pod2mantest $(PERL)`"; \
 | 
			
		||||
	here="`pwd`"; \
 | 
			
		||||
	filecase=; \
 | 
			
		||||
	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
 | 
			
		||||
		filecase=-i; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	set -e; for i in doc/apps/*.pod; do \
 | 
			
		||||
	@echo installing man 1 and man 5
 | 
			
		||||
	@for i in doc/apps/*.pod; do \
 | 
			
		||||
		(cd `dirname $$i`; \
 | 
			
		||||
		fn=`basename $$i .pod`; \
 | 
			
		||||
		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
 | 
			
		||||
		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
 | 
			
		||||
		(cd `$(PERL) util/dirname.pl $$i`; \
 | 
			
		||||
		sh -c "$$pod2man \
 | 
			
		||||
			--section=$$sec --center=OpenSSL \
 | 
			
		||||
			--release=$(VERSION) `basename $$i`") \
 | 
			
		||||
			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
 | 
			
		||||
		$(PERL) util/extract-names.pl < $$i | \
 | 
			
		||||
			(grep -v $$filecase "^$$fn\$$"; true) | \
 | 
			
		||||
			(grep -v "[	]"; true) | \
 | 
			
		||||
			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
 | 
			
		||||
			 while read n; do \
 | 
			
		||||
				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
 | 
			
		||||
			 done); \
 | 
			
		||||
	done; \
 | 
			
		||||
	set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \
 | 
			
		||||
		sec=`[ "$$fn" = "config" ] && echo 5 || echo 1`; \
 | 
			
		||||
		$(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
 | 
			
		||||
			 --release=$(VERSION) `basename $$i` \
 | 
			
		||||
			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec); \
 | 
			
		||||
	done
 | 
			
		||||
	@echo installing man 3 and man 7
 | 
			
		||||
	@for i in doc/crypto/*.pod doc/ssl/*.pod; do \
 | 
			
		||||
		(cd `dirname $$i`; \
 | 
			
		||||
		fn=`basename $$i .pod`; \
 | 
			
		||||
		sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
 | 
			
		||||
		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
 | 
			
		||||
		(cd `$(PERL) util/dirname.pl $$i`; \
 | 
			
		||||
		sh -c "$$pod2man \
 | 
			
		||||
			--section=$$sec --center=OpenSSL \
 | 
			
		||||
			--release=$(VERSION) `basename $$i`") \
 | 
			
		||||
			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
 | 
			
		||||
		$(PERL) util/extract-names.pl < $$i | \
 | 
			
		||||
			(grep -v $$filecase "^$$fn\$$"; true) | \
 | 
			
		||||
			(grep -v "[	]"; true) | \
 | 
			
		||||
			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
 | 
			
		||||
			 while read n; do \
 | 
			
		||||
				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
 | 
			
		||||
			 done); \
 | 
			
		||||
		sec=`[ "$$fn" = "des_modes" ] && echo 7 || echo 3`; \
 | 
			
		||||
		$(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
 | 
			
		||||
			--release=$(VERSION) `basename $$i` \
 | 
			
		||||
			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec); \
 | 
			
		||||
	done
 | 
			
		||||
 | 
			
		||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										609
									
								
								Makefile.shared
									
									
									
									
									
								
							
							
						
						
									
										609
									
								
								Makefile.shared
									
									
									
									
									
								
							@@ -1,609 +0,0 @@
 | 
			
		||||
#
 | 
			
		||||
# Helper makefile to link shared libraries in a portable way.
 | 
			
		||||
# This is much simpler than libtool, and hopefully not too error-prone.
 | 
			
		||||
#
 | 
			
		||||
# The following variables need to be set on the command line to build
 | 
			
		||||
# properly
 | 
			
		||||
 | 
			
		||||
# CC contains the current compiler.  This one MUST be defined
 | 
			
		||||
CC=cc
 | 
			
		||||
CFLAGS=$(CFLAG)
 | 
			
		||||
# LDFLAGS contains flags to be used when temporary object files (when building
 | 
			
		||||
# shared libraries) are created, or when an application is linked.
 | 
			
		||||
# SHARED_LDFLAGS contains flags to be used when the shared library is created.
 | 
			
		||||
LDFLAGS=
 | 
			
		||||
SHARED_LDFLAGS=
 | 
			
		||||
 | 
			
		||||
# LIBNAME contains just the name of the library, without prefix ("lib"
 | 
			
		||||
# on Unix, "cyg" for certain forms under Cygwin...) or suffix (.a, .so,
 | 
			
		||||
# .dll, ...).  This one MUST have a value when using this makefile to
 | 
			
		||||
# build shared libraries.
 | 
			
		||||
# For example, to build libfoo.so, you need to do the following:
 | 
			
		||||
#LIBNAME=foo
 | 
			
		||||
LIBNAME=
 | 
			
		||||
 | 
			
		||||
# APPNAME contains just the name of the application, without suffix (""
 | 
			
		||||
# on Unix, ".exe" on Windows, ...).  This one MUST have a value when using
 | 
			
		||||
# this makefile to build applications.
 | 
			
		||||
# For example, to build foo, you need to do the following:
 | 
			
		||||
#APPNAME=foo
 | 
			
		||||
APPNAME=
 | 
			
		||||
 | 
			
		||||
# OBJECTS contains all the object files to link together into the application.
 | 
			
		||||
# This must contain at least one object file.
 | 
			
		||||
#OBJECTS=foo.o
 | 
			
		||||
OBJECTS=
 | 
			
		||||
 | 
			
		||||
# LIBEXTRAS contains extra modules to link together with the library.
 | 
			
		||||
# For example, if a second library, say libbar.a needs to be linked into
 | 
			
		||||
# libfoo.so, you need to do the following:
 | 
			
		||||
#LIBEXTRAS=libbar.a
 | 
			
		||||
# Note that this MUST be used when using the link_o targets, to hold the
 | 
			
		||||
# names of all object files that go into the target library.
 | 
			
		||||
LIBEXTRAS=
 | 
			
		||||
 | 
			
		||||
# LIBVERSION contains the current version of the library.
 | 
			
		||||
# For example, to build libfoo.so.1.2, you need to do the following:
 | 
			
		||||
#LIBVERSION=1.2
 | 
			
		||||
LIBVERSION=
 | 
			
		||||
 | 
			
		||||
# LIBCOMPATVERSIONS contains the compatibility versions (a list) of
 | 
			
		||||
# the library.  They MUST be in decreasing order.
 | 
			
		||||
# For example, if libfoo.so.1.2.1 is backward compatible with libfoo.so.1.2
 | 
			
		||||
# and libfoo.so.1, you need to do the following:
 | 
			
		||||
#LIBCOMPATVERSIONS=1.2 1
 | 
			
		||||
# Note that on systems that use sonames, the last number will appear as
 | 
			
		||||
# part of it.
 | 
			
		||||
# It's also possible, for systems that support it (Tru64, for example),
 | 
			
		||||
# to add extra compatibility info with more precision, by adding a second
 | 
			
		||||
# list of versions, separated from the first with a semicolon, like this:
 | 
			
		||||
#LIBCOMPATVERSIONS=1.2 1;1.2.0 1.1.2 1.1.1 1.1.0 1.0.0
 | 
			
		||||
LIBCOMPATVERSIONS=
 | 
			
		||||
 | 
			
		||||
# LIBDEPS contains all the flags necessary to cover all necessary
 | 
			
		||||
# dependencies to other libraries.
 | 
			
		||||
LIBDEPS=
 | 
			
		||||
 | 
			
		||||
#------------------------------------------------------------------------------
 | 
			
		||||
# The rest is private to this makefile.
 | 
			
		||||
 | 
			
		||||
SET_X=:
 | 
			
		||||
#SET_X=set -x
 | 
			
		||||
 | 
			
		||||
top:
 | 
			
		||||
	echo "Trying to use this makefile interactively?  Don't."
 | 
			
		||||
 | 
			
		||||
CALC_VERSIONS=	\
 | 
			
		||||
	SHLIB_COMPAT=; SHLIB_SOVER=; \
 | 
			
		||||
	if [ -n "$(LIBVERSION)$(LIBCOMPATVERSIONS)" ]; then \
 | 
			
		||||
		prev=""; \
 | 
			
		||||
		for v in `echo "$(LIBVERSION) $(LIBCOMPATVERSIONS)" | cut -d';' -f1`; do \
 | 
			
		||||
			SHLIB_SOVER_NODOT=$$v; \
 | 
			
		||||
			SHLIB_SOVER=.$$v; \
 | 
			
		||||
			if [ -n "$$prev" ]; then \
 | 
			
		||||
				SHLIB_COMPAT="$$SHLIB_COMPAT .$$prev"; \
 | 
			
		||||
			fi; \
 | 
			
		||||
			prev=$$v; \
 | 
			
		||||
		done; \
 | 
			
		||||
	fi
 | 
			
		||||
 | 
			
		||||
LINK_APP=	\
 | 
			
		||||
  ( $(SET_X);   \
 | 
			
		||||
    LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
 | 
			
		||||
    LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
 | 
			
		||||
    LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
 | 
			
		||||
    LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
 | 
			
		||||
    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
 | 
			
		||||
    $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
 | 
			
		||||
 | 
			
		||||
LINK_SO=	\
 | 
			
		||||
  ( $(SET_X);   \
 | 
			
		||||
    LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
 | 
			
		||||
    SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \
 | 
			
		||||
    SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
 | 
			
		||||
    LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
 | 
			
		||||
    LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
 | 
			
		||||
    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
 | 
			
		||||
    $${SHAREDCMD} $${SHAREDFLAGS} \
 | 
			
		||||
	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
 | 
			
		||||
	$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
 | 
			
		||||
  ) && $(SYMLINK_SO)
 | 
			
		||||
 | 
			
		||||
SYMLINK_SO=	\
 | 
			
		||||
	if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else \
 | 
			
		||||
		prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
 | 
			
		||||
		if [ -n "$$SHLIB_COMPAT" ]; then \
 | 
			
		||||
			for x in $$SHLIB_COMPAT; do \
 | 
			
		||||
				( $(SET_X); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \
 | 
			
		||||
				  ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \
 | 
			
		||||
				prev=$$SHLIB$$x$$SHLIB_SUFFIX; \
 | 
			
		||||
			done; \
 | 
			
		||||
		fi; \
 | 
			
		||||
		if [ -n "$$SHLIB_SOVER" ]; then \
 | 
			
		||||
			( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
 | 
			
		||||
			  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
 | 
			
		||||
		fi; \
 | 
			
		||||
	fi
 | 
			
		||||
 | 
			
		||||
LINK_SO_A=	SHOBJECTS="lib$(LIBNAME).a $(LIBEXTRAS)"; $(LINK_SO)
 | 
			
		||||
LINK_SO_O=	SHOBJECTS="$(LIBEXTRAS)"; $(LINK_SO)
 | 
			
		||||
 | 
			
		||||
LINK_SO_A_VIA_O=	\
 | 
			
		||||
  SHOBJECTS=lib$(LIBNAME).o; \
 | 
			
		||||
  ALL=$$ALLSYMSFLAGS; ALLSYMSFLAGS=; NOALLSYMSFLAGS=; \
 | 
			
		||||
  ( $(SET_X); \
 | 
			
		||||
    ld $(LDFLAGS) -r -o lib$(LIBNAME).o $$ALL lib$(LIBNAME).a $(LIBEXTRAS) ); \
 | 
			
		||||
  $(LINK_SO) && rm -f $(LIBNAME).o
 | 
			
		||||
 | 
			
		||||
LINK_SO_A_UNPACKED=	\
 | 
			
		||||
  UNPACKDIR=link_tmp.$$$$; rm -rf $$UNPACKDIR; mkdir $$UNPACKDIR; \
 | 
			
		||||
  (cd $$UNPACKDIR; ar x ../lib$(LIBNAME).a) && \
 | 
			
		||||
  ([ -z "$(LIBEXTRAS)" ] || cp $(LIBEXTRAS) $$UNPACKDIR) && \
 | 
			
		||||
  SHOBJECTS=$$UNPACKDIR/*.o; \
 | 
			
		||||
  $(LINK_SO) && rm -rf $$UNPACKDIR
 | 
			
		||||
 | 
			
		||||
DETECT_GNU_LD=(${CC} -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null
 | 
			
		||||
 | 
			
		||||
DO_GNU_SO=$(CALC_VERSIONS); \
 | 
			
		||||
	SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
	SHLIB_SUFFIX=; \
 | 
			
		||||
	ALLSYMSFLAGS='-Wl,--whole-archive'; \
 | 
			
		||||
	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
 | 
			
		||||
	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
 | 
			
		||||
 | 
			
		||||
DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
 | 
			
		||||
 | 
			
		||||
#This is rather special.  It's a special target with which one can link
 | 
			
		||||
#applications without bothering with any features that have anything to
 | 
			
		||||
#do with shared libraries, for example when linking against static
 | 
			
		||||
#libraries.  It's mostly here to avoid a lot of conditionals everywhere
 | 
			
		||||
#else...
 | 
			
		||||
link_app.:
 | 
			
		||||
	$(LINK_APP)
 | 
			
		||||
 | 
			
		||||
link_o.gnu:
 | 
			
		||||
	@ $(DO_GNU_SO); $(LINK_SO_O)
 | 
			
		||||
link_a.gnu:
 | 
			
		||||
	@ $(DO_GNU_SO); $(LINK_SO_A)
 | 
			
		||||
link_app.gnu:
 | 
			
		||||
	@ $(DO_GNU_APP); $(LINK_APP)
 | 
			
		||||
 | 
			
		||||
link_o.bsd:
 | 
			
		||||
	@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
 | 
			
		||||
	$(CALC_VERSIONS); \
 | 
			
		||||
	SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
	SHLIB_SUFFIX=; \
 | 
			
		||||
	LIBDEPS=" "; \
 | 
			
		||||
	ALLSYMSFLAGS="-Wl,-Bforcearchive"; \
 | 
			
		||||
	NOALLSYMSFLAGS=; \
 | 
			
		||||
	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
 | 
			
		||||
	fi; $(LINK_SO_O)
 | 
			
		||||
link_a.bsd:
 | 
			
		||||
	@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
 | 
			
		||||
	$(CALC_VERSIONS); \
 | 
			
		||||
	SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
	SHLIB_SUFFIX=; \
 | 
			
		||||
	LIBDEPS=" "; \
 | 
			
		||||
	ALLSYMSFLAGS="-Wl,-Bforcearchive"; \
 | 
			
		||||
	NOALLSYMSFLAGS=; \
 | 
			
		||||
	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
 | 
			
		||||
	fi; $(LINK_SO_A)
 | 
			
		||||
link_app.bsd:
 | 
			
		||||
	@if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \
 | 
			
		||||
	LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBPATH)"; \
 | 
			
		||||
	fi; $(LINK_APP)
 | 
			
		||||
 | 
			
		||||
# For Darwin AKA Mac OS/X (dyld)
 | 
			
		||||
# link_o.darwin produces .so, because we let it use dso_dlfcn module,
 | 
			
		||||
# which has .so extension hard-coded. One can argue that one should
 | 
			
		||||
# develop special dso module for MacOS X. At least manual encourages
 | 
			
		||||
# to use native NSModule(3) API and refers to dlfcn as termporary hack.
 | 
			
		||||
link_o.darwin:
 | 
			
		||||
	@ $(CALC_VERSIONS); \
 | 
			
		||||
	SHLIB=`expr "$$THIS" : '.*/\([^/\.]*\)\.'`; \
 | 
			
		||||
	SHLIB=$${SHLIB:-lib$(LIBNAME)}; \
 | 
			
		||||
	SHLIB_SUFFIX=`expr "$$THIS" : '.*\(\.[^\.]*\)$$'`; \
 | 
			
		||||
	SHLIB_SUFFIX=$${SHLIB_SUFFIX:-.so}; \
 | 
			
		||||
	ALLSYMSFLAGS='-all_load'; \
 | 
			
		||||
	NOALLSYMSFLAGS=''; \
 | 
			
		||||
	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \
 | 
			
		||||
	if [ -n "$(LIBVERSION)" ]; then \
 | 
			
		||||
		SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	if [ -n "$$SHLIB_SOVER_NODOT" ]; then \
 | 
			
		||||
		SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	$(LINK_SO_O)
 | 
			
		||||
link_a.darwin:
 | 
			
		||||
	@ $(CALC_VERSIONS); \
 | 
			
		||||
	SHLIB=lib$(LIBNAME); \
 | 
			
		||||
	SHLIB_SUFFIX=.dylib; \
 | 
			
		||||
	ALLSYMSFLAGS='-all_load'; \
 | 
			
		||||
	NOALLSYMSFLAGS=''; \
 | 
			
		||||
	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \
 | 
			
		||||
	if [ -n "$(LIBVERSION)" ]; then \
 | 
			
		||||
		SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	if [ -n "$$SHLIB_SOVER_NODOT" ]; then \
 | 
			
		||||
		SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	SHAREDFLAGS="$$SHAREDFLAGS -install_name ${INSTALLTOP}/lib/$$SHLIB${SHLIB_EXT}"; \
 | 
			
		||||
	$(LINK_SO_A)
 | 
			
		||||
link_app.darwin:	# is there run-path on darwin?
 | 
			
		||||
	$(LINK_APP)
 | 
			
		||||
 | 
			
		||||
link_o.cygwin:
 | 
			
		||||
	@ $(CALC_VERSIONS); \
 | 
			
		||||
	INHIBIT_SYMLINKS=yes; \
 | 
			
		||||
	SHLIB=cyg$(LIBNAME); \
 | 
			
		||||
	base=-Wl,--enable-auto-image-base; \
 | 
			
		||||
	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
 | 
			
		||||
		SHLIB=$(LIBNAME)eay32; base=; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	SHLIB_SUFFIX=.dll; \
 | 
			
		||||
	LIBVERSION="$(LIBVERSION)"; \
 | 
			
		||||
	SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \
 | 
			
		||||
	ALLSYMSFLAGS='-Wl,--whole-archive'; \
 | 
			
		||||
	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
 | 
			
		||||
	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
 | 
			
		||||
	$(LINK_SO_O)
 | 
			
		||||
link_a.cygwin:
 | 
			
		||||
	@ $(CALC_VERSIONS); \
 | 
			
		||||
	INHIBIT_SYMLINKS=yes; \
 | 
			
		||||
	SHLIB=cyg$(LIBNAME); \
 | 
			
		||||
	base=-Wl,--enable-auto-image-base; \
 | 
			
		||||
	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
 | 
			
		||||
		SHLIB=$(LIBNAME)eay32; \
 | 
			
		||||
		base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	SHLIB_SUFFIX=.dll; \
 | 
			
		||||
	SHLIB_SOVER=-$(LIBVERSION); \
 | 
			
		||||
	ALLSYMSFLAGS='-Wl,--whole-archive'; \
 | 
			
		||||
	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
 | 
			
		||||
	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
 | 
			
		||||
	[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
 | 
			
		||||
	[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
 | 
			
		||||
	$(LINK_SO_A) || exit 1; \
 | 
			
		||||
	cp -p $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX apps/; \
 | 
			
		||||
	cp -p $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX test/
 | 
			
		||||
link_app.cygwin:
 | 
			
		||||
	$(LINK_APP)
 | 
			
		||||
 | 
			
		||||
link_o.alpha-osf1:
 | 
			
		||||
	@ if ${DETECT_GNU_LD}; then \
 | 
			
		||||
		$(DO_GNU_SO); \
 | 
			
		||||
	else \
 | 
			
		||||
		SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
		SHLIB_SUFFIX=; \
 | 
			
		||||
		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
 | 
			
		||||
		if [ -n "$$SHLIB_HIST" ]; then \
 | 
			
		||||
			SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
 | 
			
		||||
		else \
 | 
			
		||||
			SHLIB_HIST="$(LIBVERSION)"; \
 | 
			
		||||
		fi; \
 | 
			
		||||
		SHLIB_SOVER=; \
 | 
			
		||||
		ALLSYMSFLAGS='-all'; \
 | 
			
		||||
		NOALLSYMSFLAGS='-none'; \
 | 
			
		||||
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic"; \
 | 
			
		||||
		if [ -n "$$SHLIB_HIST" ]; then \
 | 
			
		||||
			SHAREDFLAGS="$$SHAREDFLAGS -set_version $$SHLIB_HIST"; \
 | 
			
		||||
		fi; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	$(LINK_SO_O)
 | 
			
		||||
link_a.alpha-osf1:
 | 
			
		||||
	@ if ${DETECT_GNU_LD}; then \
 | 
			
		||||
		$(DO_GNU_SO); \
 | 
			
		||||
	else \
 | 
			
		||||
		SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
		SHLIB_SUFFIX=; \
 | 
			
		||||
		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
 | 
			
		||||
		if [ -n "$$SHLIB_HIST" ]; then \
 | 
			
		||||
			SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
 | 
			
		||||
		else \
 | 
			
		||||
			SHLIB_HIST="$(LIBVERSION)"; \
 | 
			
		||||
		fi; \
 | 
			
		||||
		SHLIB_SOVER=; \
 | 
			
		||||
		ALLSYMSFLAGS='-all'; \
 | 
			
		||||
		NOALLSYMSFLAGS='-none'; \
 | 
			
		||||
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic"; \
 | 
			
		||||
		if [ -n "$$SHLIB_HIST" ]; then \
 | 
			
		||||
			SHAREDFLAGS="$$SHAREDFLAGS -set_version $$SHLIB_HIST"; \
 | 
			
		||||
		fi; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	$(LINK_SO_A)
 | 
			
		||||
link_app.alpha-osf1:
 | 
			
		||||
	@if ${DETECT_GNU_LD}; then \
 | 
			
		||||
		$(DO_GNU_APP); \
 | 
			
		||||
	else \
 | 
			
		||||
		LDFLAGS="$(CFLAGS) -rpath $(LIBRPATH)"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	$(LINK_APP)
 | 
			
		||||
 | 
			
		||||
link_o.solaris:
 | 
			
		||||
	@ if ${DETECT_GNU_LD}; then \
 | 
			
		||||
		$(DO_GNU_SO); \
 | 
			
		||||
	else \
 | 
			
		||||
		$(CALC_VERSIONS); \
 | 
			
		||||
		MINUSZ='-z '; \
 | 
			
		||||
		($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
 | 
			
		||||
		SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
		SHLIB_SUFFIX=; \
 | 
			
		||||
		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
 | 
			
		||||
		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
 | 
			
		||||
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	$(LINK_SO_O)
 | 
			
		||||
link_a.solaris:
 | 
			
		||||
	@ if ${DETECT_GNU_LD}; then \
 | 
			
		||||
		$(DO_GNU_SO); \
 | 
			
		||||
	else \
 | 
			
		||||
		$(CALC_VERSIONS); \
 | 
			
		||||
		MINUSZ='-z '; \
 | 
			
		||||
		(${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
 | 
			
		||||
		SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
		SHLIB_SUFFIX=;\
 | 
			
		||||
		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
 | 
			
		||||
		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
 | 
			
		||||
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	$(LINK_SO_A)
 | 
			
		||||
link_app.solaris:
 | 
			
		||||
	@ if ${DETECT_GNU_LD}; then \
 | 
			
		||||
		$(DO_GNU_APP); \
 | 
			
		||||
	else \
 | 
			
		||||
		LDFLAGS="$(CFLAGS) -R $(LIBRPATH)"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	$(LINK_APP)
 | 
			
		||||
 | 
			
		||||
# OpenServer 5 native compilers used
 | 
			
		||||
link_o.svr3:
 | 
			
		||||
	@ if ${DETECT_GNU_LD}; then \
 | 
			
		||||
		$(DO_GNU_SO); \
 | 
			
		||||
	else \
 | 
			
		||||
		$(CALC_VERSIONS); \
 | 
			
		||||
		SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
		SHLIB_SUFFIX=; \
 | 
			
		||||
		ALLSYMSFLAGS=''; \
 | 
			
		||||
		NOALLSYMSFLAGS=''; \
 | 
			
		||||
		SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	$(LINK_SO_O)
 | 
			
		||||
link_a.svr3:
 | 
			
		||||
	@ if ${DETECT_GNU_LD}; then \
 | 
			
		||||
		$(DO_GNU_SO); \
 | 
			
		||||
	else \
 | 
			
		||||
		$(CALC_VERSIONS); \
 | 
			
		||||
		SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
		SHLIB_SUFFIX=; \
 | 
			
		||||
		ALLSYMSFLAGS=''; \
 | 
			
		||||
		NOALLSYMSFLAGS=''; \
 | 
			
		||||
		SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	$(LINK_SO_A_UNPACKED)
 | 
			
		||||
link_app.svr3:
 | 
			
		||||
	@${DETECT_GNU_LD} && $(DO_GNU_APP); \
 | 
			
		||||
	$(LINK_APP)
 | 
			
		||||
 | 
			
		||||
# UnixWare 7 and OpenUNIX 8 native compilers used
 | 
			
		||||
link_o.svr5:
 | 
			
		||||
	@ if ${DETECT_GNU_LD}; then \
 | 
			
		||||
		$(DO_GNU_SO); \
 | 
			
		||||
	else \
 | 
			
		||||
		$(CALC_VERSIONS); \
 | 
			
		||||
		SHARE_FLAG='-G'; \
 | 
			
		||||
		($(CC) -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
 | 
			
		||||
		SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
		SHLIB_SUFFIX=; \
 | 
			
		||||
		ALLSYMSFLAGS=''; \
 | 
			
		||||
		NOALLSYMSFLAGS=''; \
 | 
			
		||||
		SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	$(LINK_SO_O)
 | 
			
		||||
link_a.svr5:
 | 
			
		||||
	@ if ${DETECT_GNU_LD}; then \
 | 
			
		||||
		$(DO_GNU_SO); \
 | 
			
		||||
	else \
 | 
			
		||||
		$(CALC_VERSIONS); \
 | 
			
		||||
		SHARE_FLAG='-G'; \
 | 
			
		||||
		(${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
 | 
			
		||||
		SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
		SHLIB_SUFFIX=; \
 | 
			
		||||
		ALLSYMSFLAGS=''; \
 | 
			
		||||
		NOALLSYMSFLAGS=''; \
 | 
			
		||||
		SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	$(LINK_SO_A_UNPACKED)
 | 
			
		||||
link_app.svr5:
 | 
			
		||||
	@${DETECT_GNU_LD} && $(DO_GNU_APP); \
 | 
			
		||||
	$(LINK_APP)
 | 
			
		||||
 | 
			
		||||
link_o.irix:
 | 
			
		||||
	@ if ${DETECT_GNU_LD}; then \
 | 
			
		||||
		$(DO_GNU_SO); \
 | 
			
		||||
	else \
 | 
			
		||||
		$(CALC_VERSIONS); \
 | 
			
		||||
		SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
		SHLIB_SUFFIX=; \
 | 
			
		||||
		MINUSWL=""; \
 | 
			
		||||
		($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \
 | 
			
		||||
		ALLSYMSFLAGS="$${MINUSWL}-all"; \
 | 
			
		||||
		NOALLSYMSFLAGS="$${MINUSWL}-none"; \
 | 
			
		||||
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,-B,symbolic"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	$(LINK_SO_O)
 | 
			
		||||
link_a.irix:
 | 
			
		||||
	@ if ${DETECT_GNU_LD}; then \
 | 
			
		||||
		$(DO_GNU_SO); \
 | 
			
		||||
	else \
 | 
			
		||||
		$(CALC_VERSIONS); \
 | 
			
		||||
		SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
		SHLIB_SUFFIX=; \
 | 
			
		||||
		MINUSWL=""; \
 | 
			
		||||
		($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \
 | 
			
		||||
		ALLSYMSFLAGS="$${MINUSWL}-all"; \
 | 
			
		||||
		NOALLSYMSFLAGS="$${MINUSWL}-none"; \
 | 
			
		||||
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,-B,symbolic"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	$(LINK_SO_A)
 | 
			
		||||
link_app.irix:
 | 
			
		||||
	@LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \
 | 
			
		||||
	$(LINK_APP)
 | 
			
		||||
 | 
			
		||||
# 32-bit PA-RISC HP-UX embeds the -L pathname of libs we link with, so
 | 
			
		||||
# we compensate for it with +cdp ../: and +cdp ./:. Yes, these rewrite
 | 
			
		||||
# rules imply that we can only link one level down in catalog structure,
 | 
			
		||||
# but that's what takes place for the moment of this writing. +cdp option
 | 
			
		||||
# was introduced in HP-UX 11.x and applies in 32-bit PA-RISC link
 | 
			
		||||
# editor context only [it's simply ignored in other cases, which are all
 | 
			
		||||
# ELFs by the way].
 | 
			
		||||
#
 | 
			
		||||
link_o.hpux:
 | 
			
		||||
	@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
 | 
			
		||||
	$(CALC_VERSIONS); \
 | 
			
		||||
	SHLIB=lib$(LIBNAME).sl; \
 | 
			
		||||
	expr "$(CFLAGS)" : '.*DSO_DLFCN' > /dev/null && SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
	SHLIB_SUFFIX=; \
 | 
			
		||||
	ALLSYMSFLAGS='-Wl,-Fl'; \
 | 
			
		||||
	NOALLSYMSFLAGS=''; \
 | 
			
		||||
	expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
 | 
			
		||||
	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+cdp,../:,+cdp,./:"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \
 | 
			
		||||
	$(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 | 
			
		||||
link_a.hpux:
 | 
			
		||||
	@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
 | 
			
		||||
	$(CALC_VERSIONS); \
 | 
			
		||||
	SHLIB=lib$(LIBNAME).sl; \
 | 
			
		||||
	expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
	SHLIB_SUFFIX=; \
 | 
			
		||||
	ALLSYMSFLAGS='-Wl,-Fl'; \
 | 
			
		||||
	NOALLSYMSFLAGS=''; \
 | 
			
		||||
	expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
 | 
			
		||||
	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+cdp,../:,+cdp,./:"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \
 | 
			
		||||
	$(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 | 
			
		||||
link_app.hpux:
 | 
			
		||||
	@if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \
 | 
			
		||||
	LDFLAGS="$(CFLAGS) -Wl,+s,+cdp,../:,+cdp,./:,+b,$(LIBRPATH)"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	$(LINK_APP)
 | 
			
		||||
 | 
			
		||||
link_o.aix:
 | 
			
		||||
	@ $(CALC_VERSIONS); \
 | 
			
		||||
	OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]*\(64\)'` || :; \
 | 
			
		||||
	OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
 | 
			
		||||
	SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
	SHLIB_SUFFIX=; \
 | 
			
		||||
	ALLSYMSFLAGS=''; \
 | 
			
		||||
	NOALLSYMSFLAGS=''; \
 | 
			
		||||
	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \
 | 
			
		||||
	$(LINK_SO_O);
 | 
			
		||||
link_a.aix:
 | 
			
		||||
	@ $(CALC_VERSIONS); \
 | 
			
		||||
	OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]*\(64\)'` || : ; \
 | 
			
		||||
	OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
 | 
			
		||||
	SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
	SHLIB_SUFFIX=; \
 | 
			
		||||
	ALLSYMSFLAGS='-bnogc'; \
 | 
			
		||||
	NOALLSYMSFLAGS=''; \
 | 
			
		||||
	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \
 | 
			
		||||
	$(LINK_SO_A_VIA_O)
 | 
			
		||||
link_app.aix:
 | 
			
		||||
	LDFLAGS="$(CFLAGS) -Wl,-brtl,-blibpath:$(LIBRPATH):$${LIBPATH:-/usr/lib:/lib}"; \
 | 
			
		||||
	$(LINK_APP)
 | 
			
		||||
 | 
			
		||||
link_o.reliantunix:
 | 
			
		||||
	@ $(CALC_VERSIONS); \
 | 
			
		||||
	SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
	SHLIB_SUFFIX=; \
 | 
			
		||||
	ALLSYMSFLAGS=; \
 | 
			
		||||
	NOALLSYMSFLAGS=''; \
 | 
			
		||||
	SHAREDFLAGS='$(CFLAGS) -G'; \
 | 
			
		||||
	$(LINK_SO_O)
 | 
			
		||||
link_a.reliantunix:
 | 
			
		||||
	@ $(CALC_VERSIONS); \
 | 
			
		||||
	SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
	SHLIB_SUFFIX=; \
 | 
			
		||||
	ALLSYMSFLAGS=; \
 | 
			
		||||
	NOALLSYMSFLAGS=''; \
 | 
			
		||||
	SHAREDFLAGS='$(CFLAGS) -G'; \
 | 
			
		||||
	$(LINK_SO_A_UNPACKED)
 | 
			
		||||
link_app.reliantunix:
 | 
			
		||||
	$(LINK_APP)
 | 
			
		||||
 | 
			
		||||
# Targets to build symbolic links when needed
 | 
			
		||||
symlink.gnu symlink.solaris symlink.svr3 symlink.svr5 symlink.irix \
 | 
			
		||||
symlink.aix symlink.reliantunix:
 | 
			
		||||
	@ $(CALC_VERSIONS); \
 | 
			
		||||
	SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
	$(SYMLINK_SO)
 | 
			
		||||
symlink.darwin:
 | 
			
		||||
	@ $(CALC_VERSIONS); \
 | 
			
		||||
	SHLIB=lib$(LIBNAME); \
 | 
			
		||||
	SHLIB_SUFFIX=.dylib; \
 | 
			
		||||
	$(SYMLINK_SO)
 | 
			
		||||
symlink.hpux:
 | 
			
		||||
	@ $(CALC_VERSIONS); \
 | 
			
		||||
	SHLIB=lib$(LIBNAME).sl; \
 | 
			
		||||
	expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
 | 
			
		||||
	$(SYMLINK_SO)
 | 
			
		||||
# The following lines means those specific architectures do no symlinks
 | 
			
		||||
symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
 | 
			
		||||
 | 
			
		||||
# Compatibility targets
 | 
			
		||||
link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu
 | 
			
		||||
link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu
 | 
			
		||||
link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu
 | 
			
		||||
symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu
 | 
			
		||||
link_o.bsd-shared: link_o.bsd
 | 
			
		||||
link_a.bsd-shared: link_a.bsd
 | 
			
		||||
link_app.bsd-shared: link_app.bsd
 | 
			
		||||
link_o.darwin-shared: link_o.darwin
 | 
			
		||||
link_a.darwin-shared: link_a.darwin
 | 
			
		||||
link_app.darwin-shared: link_app.darwin
 | 
			
		||||
symlink.darwin-shared: symlink.darwin
 | 
			
		||||
link_o.cygwin-shared: link_o.cygwin
 | 
			
		||||
link_a.cygwin-shared: link_a.cygwin
 | 
			
		||||
link_app.cygwin-shared: link_app.cygwin
 | 
			
		||||
symlink.cygwin-shared: symlink.cygwin
 | 
			
		||||
link_o.alpha-osf1-shared: link_o.alpha-osf1
 | 
			
		||||
link_a.alpha-osf1-shared: link_a.alpha-osf1
 | 
			
		||||
link_app.alpha-osf1-shared: link_app.alpha-osf1
 | 
			
		||||
symlink.alpha-osf1-shared: symlink.alpha-osf1
 | 
			
		||||
link_o.tru64-shared: link_o.tru64
 | 
			
		||||
link_a.tru64-shared: link_a.tru64
 | 
			
		||||
link_app.tru64-shared: link_app.tru64
 | 
			
		||||
symlink.tru64-shared: symlink.tru64
 | 
			
		||||
link_o.tru64-shared-rpath: link_o.tru64-rpath
 | 
			
		||||
link_a.tru64-shared-rpath: link_a.tru64-rpath
 | 
			
		||||
link_app.tru64-shared-rpath: link_app.tru64-rpath
 | 
			
		||||
symlink.tru64-shared-rpath: symlink.tru64-rpath
 | 
			
		||||
link_o.solaris-shared: link_o.solaris
 | 
			
		||||
link_a.solaris-shared: link_a.solaris
 | 
			
		||||
link_app.solaris-shared: link_app.solaris
 | 
			
		||||
symlink.solaris-shared: symlink.solaris
 | 
			
		||||
link_o.svr3-shared: link_o.svr3
 | 
			
		||||
link_a.svr3-shared: link_a.svr3
 | 
			
		||||
link_app.svr3-shared: link_app.svr3
 | 
			
		||||
symlink.svr3-shared: symlink.svr3
 | 
			
		||||
link_o.svr5-shared: link_o.svr5
 | 
			
		||||
link_a.svr5-shared: link_a.svr5
 | 
			
		||||
link_app.svr5-shared: link_app.svr5
 | 
			
		||||
symlink.svr5-shared: symlink.svr5
 | 
			
		||||
link_o.irix-shared: link_o.irix
 | 
			
		||||
link_a.irix-shared: link_a.irix
 | 
			
		||||
link_app.irix-shared: link_app.irix
 | 
			
		||||
symlink.irix-shared: symlink.irix
 | 
			
		||||
link_o.hpux-shared: link_o.hpux
 | 
			
		||||
link_a.hpux-shared: link_a.hpux
 | 
			
		||||
link_app.hpux-shared: link_app.hpux
 | 
			
		||||
symlink.hpux-shared: symlink.hpux
 | 
			
		||||
link_o.aix-shared: link_o.aix
 | 
			
		||||
link_a.aix-shared: link_a.aix
 | 
			
		||||
link_app.aix-shared: link_app.aix
 | 
			
		||||
symlink.aix-shared: symlink.aix
 | 
			
		||||
link_o.reliantunix-shared: link_o.reliantunix
 | 
			
		||||
link_a.reliantunix-shared: link_a.reliantunix
 | 
			
		||||
link_app.reliantunix-shared: link_app.reliantunix
 | 
			
		||||
symlink.reliantunix-shared: symlink.reliantunix
 | 
			
		||||
							
								
								
									
										361
									
								
								NEWS
									
									
									
									
									
								
							
							
						
						
									
										361
									
								
								NEWS
									
									
									
									
									
								
							@@ -5,367 +5,6 @@
 | 
			
		||||
  This file gives a brief overview of the major changes between each OpenSSL
 | 
			
		||||
  release. For more details please read the CHANGES file.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.8d and OpenSSL 0.9.8e:
 | 
			
		||||
 | 
			
		||||
      o Various ciphersuite selection fixes.
 | 
			
		||||
      o RFC3779 support.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.8c and OpenSSL 0.9.8d:
 | 
			
		||||
 | 
			
		||||
      o Introduce limits to prevent malicious key DoS  (CVE-2006-2940)
 | 
			
		||||
      o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343)
 | 
			
		||||
      o Changes to ciphersuite selection algorithm
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.8b and OpenSSL 0.9.8c:
 | 
			
		||||
 | 
			
		||||
      o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339
 | 
			
		||||
      o New cipher Camellia
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.8a and OpenSSL 0.9.8b:
 | 
			
		||||
 | 
			
		||||
      o Cipher string fixes.
 | 
			
		||||
      o Fixes for VC++ 2005.
 | 
			
		||||
      o Updated ECC cipher suite support.
 | 
			
		||||
      o New functions EVP_CIPHER_CTX_new() and EVP_CIPHER_CTX_free().
 | 
			
		||||
      o Zlib compression usage fixes.
 | 
			
		||||
      o Built in dynamic engine compilation support on Win32.
 | 
			
		||||
      o Fixes auto dynamic engine loading in Win32.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.8 and OpenSSL 0.9.8a:
 | 
			
		||||
 | 
			
		||||
      o Fix potential SSL 2.0 rollback, CVE-2005-2969
 | 
			
		||||
      o Extended Windows CE support
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.8:
 | 
			
		||||
 | 
			
		||||
      o Major work on the BIGNUM library for higher efficiency and to
 | 
			
		||||
        make operations more streamlined and less contradictory.  This
 | 
			
		||||
        is the result of a major audit of the BIGNUM library.
 | 
			
		||||
      o Addition of BIGNUM functions for fields GF(2^m) and NIST
 | 
			
		||||
        curves, to support the Elliptic Crypto functions.
 | 
			
		||||
      o Major work on Elliptic Crypto; ECDH and ECDSA added, including
 | 
			
		||||
        the use through EVP, X509 and ENGINE.
 | 
			
		||||
      o New ASN.1 mini-compiler that's usable through the OpenSSL
 | 
			
		||||
        configuration file.
 | 
			
		||||
      o Added support for ASN.1 indefinite length constructed encoding.
 | 
			
		||||
      o New PKCS#12 'medium level' API to manipulate PKCS#12 files.
 | 
			
		||||
      o Complete rework of shared library construction and linking
 | 
			
		||||
        programs with shared or static libraries, through a separate
 | 
			
		||||
        Makefile.shared.
 | 
			
		||||
      o Rework of the passing of parameters from one Makefile to another.
 | 
			
		||||
      o Changed ENGINE framework to load dynamic engine modules
 | 
			
		||||
        automatically from specifically given directories.
 | 
			
		||||
      o New structure and ASN.1 functions for CertificatePair.
 | 
			
		||||
      o Changed the ZLIB compression method to be stateful.
 | 
			
		||||
      o Changed the key-generation and primality testing "progress"
 | 
			
		||||
        mechanism to take a structure that contains the ticker
 | 
			
		||||
        function and an argument.
 | 
			
		||||
      o New engine module: GMP (performs private key exponentiation).
 | 
			
		||||
      o New engine module: VIA PadLOck ACE extension in VIA C3
 | 
			
		||||
        Nehemiah processors.
 | 
			
		||||
      o Added support for IPv6 addresses in certificate extensions.
 | 
			
		||||
        See RFC 1884, section 2.2.
 | 
			
		||||
      o Added support for certificate policy mappings, policy
 | 
			
		||||
        constraints and name constraints.
 | 
			
		||||
      o Added support for multi-valued AVAs in the OpenSSL
 | 
			
		||||
        configuration file.
 | 
			
		||||
      o Added support for multiple certificates with the same subject
 | 
			
		||||
        in the 'openssl ca' index file.
 | 
			
		||||
      o Make it possible to create self-signed certificates using
 | 
			
		||||
        'openssl ca -selfsign'.
 | 
			
		||||
      o Make it possible to generate a serial number file with
 | 
			
		||||
        'openssl ca -create_serial'.
 | 
			
		||||
      o New binary search functions with extended functionality.
 | 
			
		||||
      o New BUF functions.
 | 
			
		||||
      o New STORE structure and library to provide an interface to all
 | 
			
		||||
        sorts of data repositories.  Supports storage of public and
 | 
			
		||||
        private keys, certificates, CRLs, numbers and arbitrary blobs.
 | 
			
		||||
	This library is unfortunately unfinished and unused withing
 | 
			
		||||
	OpenSSL.
 | 
			
		||||
      o New control functions for the error stack.
 | 
			
		||||
      o Changed the PKCS#7 library to support one-pass S/MIME
 | 
			
		||||
        processing.
 | 
			
		||||
      o Added the possibility to compile without old deprecated
 | 
			
		||||
        functionality with the OPENSSL_NO_DEPRECATED macro or the
 | 
			
		||||
        'no-deprecated' argument to the config and Configure scripts.
 | 
			
		||||
      o Constification of all ASN.1 conversion functions, and other
 | 
			
		||||
        affected functions.
 | 
			
		||||
      o Improved platform support for PowerPC.
 | 
			
		||||
      o New FIPS 180-2 algorithms (SHA-224, -256, -384 and -512).
 | 
			
		||||
      o New X509_VERIFY_PARAM structure to support parametrisation
 | 
			
		||||
        of X.509 path validation.
 | 
			
		||||
      o Major overhaul of RC4 performance on Intel P4, IA-64 and
 | 
			
		||||
        AMD64.
 | 
			
		||||
      o Changed the Configure script to have some algorithms disabled
 | 
			
		||||
        by default.  Those can be explicitely enabled with the new
 | 
			
		||||
        argument form 'enable-xxx'.
 | 
			
		||||
      o Change the default digest in 'openssl' commands from MD5 to
 | 
			
		||||
        SHA-1.
 | 
			
		||||
      o Added support for DTLS.
 | 
			
		||||
      o New BIGNUM blinding.
 | 
			
		||||
      o Added support for the RSA-PSS encryption scheme
 | 
			
		||||
      o Added support for the RSA X.931 padding.
 | 
			
		||||
      o Added support for BSD sockets on NetWare.
 | 
			
		||||
      o Added support for files larger than 2GB.
 | 
			
		||||
      o Added initial support for Win64.
 | 
			
		||||
      o Added alternate pkg-config files.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.7k and OpenSSL 0.9.7l:
 | 
			
		||||
 | 
			
		||||
      o Introduce limits to prevent malicious key DoS  (CVE-2006-2940)
 | 
			
		||||
      o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343)
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.7j and OpenSSL 0.9.7k:
 | 
			
		||||
 | 
			
		||||
      o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.7i and OpenSSL 0.9.7j:
 | 
			
		||||
 | 
			
		||||
      o Visual C++ 2005 fixes.
 | 
			
		||||
      o Update Windows build system for FIPS.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.7h and OpenSSL 0.9.7i:
 | 
			
		||||
 | 
			
		||||
      o Give EVP_MAX_MD_SIZE it's old value, except for a FIPS build.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.7h:
 | 
			
		||||
 | 
			
		||||
      o Fix SSL 2.0 Rollback, CVE-2005-2969
 | 
			
		||||
      o Allow use of fixed-length exponent on DSA signing
 | 
			
		||||
      o Default fixed-window RSA, DSA, DH private-key operations
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.7f and OpenSSL 0.9.7g:
 | 
			
		||||
 | 
			
		||||
      o More compilation issues fixed.
 | 
			
		||||
      o Adaptation to more modern Kerberos API.
 | 
			
		||||
      o Enhanced or corrected configuration for Solaris64, Mingw and Cygwin.
 | 
			
		||||
      o Enhanced x86_64 assembler BIGNUM module.
 | 
			
		||||
      o More constification.
 | 
			
		||||
      o Added processing of proxy certificates (RFC 3820).
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.7e and OpenSSL 0.9.7f:
 | 
			
		||||
 | 
			
		||||
      o Several compilation issues fixed.
 | 
			
		||||
      o Many memory allocation failure checks added.
 | 
			
		||||
      o Improved comparison of X509 Name type.
 | 
			
		||||
      o Mandatory basic checks on certificates.
 | 
			
		||||
      o Performance improvements.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.7d and OpenSSL 0.9.7e:
 | 
			
		||||
 | 
			
		||||
      o Fix race condition in CRL checking code.
 | 
			
		||||
      o Fixes to PKCS#7 (S/MIME) code.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.7c and OpenSSL 0.9.7d:
 | 
			
		||||
 | 
			
		||||
      o Security: Fix Kerberos ciphersuite SSL/TLS handshaking bug
 | 
			
		||||
      o Security: Fix null-pointer assignment in do_change_cipher_spec()
 | 
			
		||||
      o Allow multiple active certificates with same subject in CA index
 | 
			
		||||
      o Multiple X509 verification fixes
 | 
			
		||||
      o Speed up HMAC and other operations
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.7b and OpenSSL 0.9.7c:
 | 
			
		||||
 | 
			
		||||
      o Security: fix various ASN1 parsing bugs.
 | 
			
		||||
      o New -ignore_err option to OCSP utility.
 | 
			
		||||
      o Various interop and bug fixes in S/MIME code.
 | 
			
		||||
      o SSL/TLS protocol fix for unrequested client certificates.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.7a and OpenSSL 0.9.7b:
 | 
			
		||||
 | 
			
		||||
      o Security: counter the Klima-Pokorny-Rosa extension of
 | 
			
		||||
        Bleichbacher's attack 
 | 
			
		||||
      o Security: make RSA blinding default.
 | 
			
		||||
      o Configuration: Irix fixes, AIX fixes, better mingw support.
 | 
			
		||||
      o Support for new platforms: linux-ia64-ecc.
 | 
			
		||||
      o Build: shared library support fixes.
 | 
			
		||||
      o ASN.1: treat domainComponent correctly.
 | 
			
		||||
      o Documentation: fixes and additions.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.7 and OpenSSL 0.9.7a:
 | 
			
		||||
 | 
			
		||||
      o Security: Important security related bugfixes.
 | 
			
		||||
      o Enhanced compatibility with MIT Kerberos.
 | 
			
		||||
      o Can be built without the ENGINE framework.
 | 
			
		||||
      o IA32 assembler enhancements.
 | 
			
		||||
      o Support for new platforms: FreeBSD/IA64 and FreeBSD/Sparc64.
 | 
			
		||||
      o Configuration: the no-err option now works properly.
 | 
			
		||||
      o SSL/TLS: now handles manual certificate chain building.
 | 
			
		||||
      o SSL/TLS: certain session ID malfunctions corrected.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.7:
 | 
			
		||||
 | 
			
		||||
      o New library section OCSP.
 | 
			
		||||
      o Complete rewrite of ASN1 code.
 | 
			
		||||
      o CRL checking in verify code and openssl utility.
 | 
			
		||||
      o Extension copying in 'ca' utility.
 | 
			
		||||
      o Flexible display options in 'ca' utility.
 | 
			
		||||
      o Provisional support for international characters with UTF8.
 | 
			
		||||
      o Support for external crypto devices ('engine') is no longer
 | 
			
		||||
        a separate distribution.
 | 
			
		||||
      o New elliptic curve library section.
 | 
			
		||||
      o New AES (Rijndael) library section.
 | 
			
		||||
      o Support for new platforms: Windows CE, Tandem OSS, A/UX, AIX 64-bit,
 | 
			
		||||
        Linux x86_64, Linux 64-bit on Sparc v9
 | 
			
		||||
      o Extended support for some platforms: VxWorks
 | 
			
		||||
      o Enhanced support for shared libraries.
 | 
			
		||||
      o Now only builds PIC code when shared library support is requested.
 | 
			
		||||
      o Support for pkg-config.
 | 
			
		||||
      o Lots of new manuals.
 | 
			
		||||
      o Makes symbolic links to or copies of manuals to cover all described
 | 
			
		||||
        functions.
 | 
			
		||||
      o Change DES API to clean up the namespace (some applications link also
 | 
			
		||||
        against libdes providing similar functions having the same name).
 | 
			
		||||
        Provide macros for backward compatibility (will be removed in the
 | 
			
		||||
        future).
 | 
			
		||||
      o Unify handling of cryptographic algorithms (software and engine)
 | 
			
		||||
        to be available via EVP routines for asymmetric and symmetric ciphers.
 | 
			
		||||
      o NCONF: new configuration handling routines.
 | 
			
		||||
      o Change API to use more 'const' modifiers to improve error checking
 | 
			
		||||
        and help optimizers.
 | 
			
		||||
      o Finally remove references to RSAref.
 | 
			
		||||
      o Reworked parts of the BIGNUM code.
 | 
			
		||||
      o Support for new engines: Broadcom ubsec, Accelerated Encryption
 | 
			
		||||
        Processing, IBM 4758.
 | 
			
		||||
      o A few new engines added in the demos area.
 | 
			
		||||
      o Extended and corrected OID (object identifier) table.
 | 
			
		||||
      o PRNG: query at more locations for a random device, automatic query for
 | 
			
		||||
        EGD style random sources at several locations.
 | 
			
		||||
      o SSL/TLS: allow optional cipher choice according to server's preference.
 | 
			
		||||
      o SSL/TLS: allow server to explicitly set new session ids.
 | 
			
		||||
      o SSL/TLS: support Kerberos cipher suites (RFC2712).
 | 
			
		||||
	Only supports MIT Kerberos for now.
 | 
			
		||||
      o SSL/TLS: allow more precise control of renegotiations and sessions.
 | 
			
		||||
      o SSL/TLS: add callback to retrieve SSL/TLS messages.
 | 
			
		||||
      o SSL/TLS: support AES cipher suites (RFC3268).
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.6j and OpenSSL 0.9.6k:
 | 
			
		||||
 | 
			
		||||
      o Security: fix various ASN1 parsing bugs.
 | 
			
		||||
      o SSL/TLS protocol fix for unrequested client certificates.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.6i and OpenSSL 0.9.6j:
 | 
			
		||||
 | 
			
		||||
      o Security: counter the Klima-Pokorny-Rosa extension of
 | 
			
		||||
        Bleichbacher's attack 
 | 
			
		||||
      o Security: make RSA blinding default.
 | 
			
		||||
      o Build: shared library support fixes.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.6h and OpenSSL 0.9.6i:
 | 
			
		||||
 | 
			
		||||
      o Important security related bugfixes.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h:
 | 
			
		||||
 | 
			
		||||
      o New configuration targets for Tandem OSS and A/UX.
 | 
			
		||||
      o New OIDs for Microsoft attributes.
 | 
			
		||||
      o Better handling of SSL session caching.
 | 
			
		||||
      o Better comparison of distinguished names.
 | 
			
		||||
      o Better handling of shared libraries in a mixed GNU/non-GNU environment.
 | 
			
		||||
      o Support assembler code with Borland C.
 | 
			
		||||
      o Fixes for length problems.
 | 
			
		||||
      o Fixes for uninitialised variables.
 | 
			
		||||
      o Fixes for memory leaks, some unusual crashes and some race conditions.
 | 
			
		||||
      o Fixes for smaller building problems.
 | 
			
		||||
      o Updates of manuals, FAQ and other instructive documents.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.6f and OpenSSL 0.9.6g:
 | 
			
		||||
 | 
			
		||||
      o Important building fixes on Unix.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.6e and OpenSSL 0.9.6f:
 | 
			
		||||
 | 
			
		||||
      o Various important bugfixes.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.6d and OpenSSL 0.9.6e:
 | 
			
		||||
 | 
			
		||||
      o Important security related bugfixes.
 | 
			
		||||
      o Various SSL/TLS library bugfixes.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.6c and OpenSSL 0.9.6d:
 | 
			
		||||
 | 
			
		||||
      o Various SSL/TLS library bugfixes.
 | 
			
		||||
      o Fix DH parameter generation for 'non-standard' generators.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.6b and OpenSSL 0.9.6c:
 | 
			
		||||
 | 
			
		||||
      o Various SSL/TLS library bugfixes.
 | 
			
		||||
      o BIGNUM library fixes.
 | 
			
		||||
      o RSA OAEP and random number generation fixes.
 | 
			
		||||
      o Object identifiers corrected and added.
 | 
			
		||||
      o Add assembler BN routines for IA64.
 | 
			
		||||
      o Add support for OS/390 Unix, UnixWare with gcc, OpenUNIX 8,
 | 
			
		||||
        MIPS Linux; shared library support for Irix, HP-UX.
 | 
			
		||||
      o Add crypto accelerator support for AEP, Baltimore SureWare,
 | 
			
		||||
        Broadcom and Cryptographic Appliance's keyserver
 | 
			
		||||
        [in 0.9.6c-engine release].
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.6a and OpenSSL 0.9.6b:
 | 
			
		||||
 | 
			
		||||
      o Security fix: PRNG improvements.
 | 
			
		||||
      o Security fix: RSA OAEP check.
 | 
			
		||||
      o Security fix: Reinsert and fix countermeasure to Bleichbacher's
 | 
			
		||||
        attack.
 | 
			
		||||
      o MIPS bug fix in BIGNUM.
 | 
			
		||||
      o Bug fix in "openssl enc".
 | 
			
		||||
      o Bug fix in X.509 printing routine.
 | 
			
		||||
      o Bug fix in DSA verification routine and DSA S/MIME verification.
 | 
			
		||||
      o Bug fix to make PRNG thread-safe.
 | 
			
		||||
      o Bug fix in RAND_file_name().
 | 
			
		||||
      o Bug fix in compatibility mode trust settings.
 | 
			
		||||
      o Bug fix in blowfish EVP.
 | 
			
		||||
      o Increase default size for BIO buffering filter.
 | 
			
		||||
      o Compatibility fixes in some scripts.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.6a:
 | 
			
		||||
 | 
			
		||||
      o Security fix: change behavior of OpenSSL to avoid using
 | 
			
		||||
        environment variables when running as root.
 | 
			
		||||
      o Security fix: check the result of RSA-CRT to reduce the
 | 
			
		||||
        possibility of deducing the private key from an incorrectly
 | 
			
		||||
        calculated signature.
 | 
			
		||||
      o Security fix: prevent Bleichenbacher's DSA attack.
 | 
			
		||||
      o Security fix: Zero the premaster secret after deriving the
 | 
			
		||||
        master secret in DH ciphersuites.
 | 
			
		||||
      o Reimplement SSL_peek(), which had various problems.
 | 
			
		||||
      o Compatibility fix: the function des_encrypt() renamed to
 | 
			
		||||
        des_encrypt1() to avoid clashes with some Unixen libc.
 | 
			
		||||
      o Bug fixes for Win32, HP/UX and Irix.
 | 
			
		||||
      o Bug fixes in BIGNUM, SSL, PKCS#7, PKCS#12, X.509, CONF and
 | 
			
		||||
        memory checking routines.
 | 
			
		||||
      o Bug fixes for RSA operations in threaded environments.
 | 
			
		||||
      o Bug fixes in misc. openssl applications.
 | 
			
		||||
      o Remove a few potential memory leaks.
 | 
			
		||||
      o Add tighter checks of BIGNUM routines.
 | 
			
		||||
      o Shared library support has been reworked for generality.
 | 
			
		||||
      o More documentation.
 | 
			
		||||
      o New function BN_rand_range().
 | 
			
		||||
      o Add "-rand" option to openssl s_client and s_server.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.5a and OpenSSL 0.9.6:
 | 
			
		||||
 | 
			
		||||
      o Some documentation for BIO and SSL libraries.
 | 
			
		||||
      o Enhanced chain verification using key identifiers.
 | 
			
		||||
      o New sign and verify options to 'dgst' application.
 | 
			
		||||
      o Support for DER and PEM encoded messages in 'smime' application.
 | 
			
		||||
      o New 'rsautl' application, low level RSA utility.
 | 
			
		||||
      o MD4 now included.
 | 
			
		||||
      o Bugfix for SSL rollback padding check.
 | 
			
		||||
      o Support for external crypto devices [1].
 | 
			
		||||
      o Enhanced EVP interface.
 | 
			
		||||
 | 
			
		||||
    [1] The support for external crypto devices is currently a separate
 | 
			
		||||
        distribution.  See the file README.ENGINE.
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.5 and OpenSSL 0.9.5a:
 | 
			
		||||
 | 
			
		||||
      o Bug fixes for Win32, SuSE Linux, NeXTSTEP and FreeBSD 2.2.8 
 | 
			
		||||
      o Shared library support for HPUX and Solaris-gcc
 | 
			
		||||
      o Support of Linux/IA64
 | 
			
		||||
      o Assembler support for Mingw32
 | 
			
		||||
      o New 'rand' application
 | 
			
		||||
      o New way to check for existence of algorithms from scripts
 | 
			
		||||
 | 
			
		||||
  Major changes between OpenSSL 0.9.4 and OpenSSL 0.9.5:
 | 
			
		||||
 | 
			
		||||
      o S/MIME support in new 'smime' command
 | 
			
		||||
 
 | 
			
		||||
@@ -1,209 +0,0 @@
 | 
			
		||||
@echo off
 | 
			
		||||
 | 
			
		||||
rem ========================================================================
 | 
			
		||||
rem   Batch file to automate building OpenSSL for NetWare.
 | 
			
		||||
rem
 | 
			
		||||
rem   usage:
 | 
			
		||||
rem      build [target] [debug opts] [assembly opts] [configure opts]
 | 
			
		||||
rem
 | 
			
		||||
rem      target        - "netware-clib" - CLib NetWare build (WinSock Sockets)
 | 
			
		||||
rem                    - "netware-libc" - LibC NKS NetWare build (WinSock Sockets)
 | 
			
		||||
rem                    - "netware-libc-bsdsock" - LibC NKS NetWare build (BSD Sockets)
 | 
			
		||||
rem 
 | 
			
		||||
rem      debug opts    - "debug"  - build debug
 | 
			
		||||
rem
 | 
			
		||||
rem      assembly opts - "nw-mwasm" - use Metrowerks assembler
 | 
			
		||||
rem                    - "nw-nasm"  - use NASM assembler
 | 
			
		||||
rem                    - "no-asm"   - don't use assembly
 | 
			
		||||
rem
 | 
			
		||||
rem      configure opts- all unrecognized arguments are passed to the
 | 
			
		||||
rem                       perl configure script
 | 
			
		||||
rem
 | 
			
		||||
rem   If no arguments are specified the default is to build non-debug with
 | 
			
		||||
rem   no assembly.  NOTE: there is no default BLD_TARGET.
 | 
			
		||||
rem
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
rem   No assembly is the default - Uncomment section below to change
 | 
			
		||||
rem   the assembler default
 | 
			
		||||
set ASM_MODE=
 | 
			
		||||
set ASSEMBLER=
 | 
			
		||||
set NO_ASM=no-asm
 | 
			
		||||
 | 
			
		||||
rem   Uncomment to default to the Metrowerks assembler
 | 
			
		||||
rem set ASM_MODE=nw-mwasm
 | 
			
		||||
rem set ASSEMBLER=Metrowerks
 | 
			
		||||
rem set NO_ASM=
 | 
			
		||||
 | 
			
		||||
rem   Uncomment to default to the NASM assembler
 | 
			
		||||
rem set ASM_MODE=nw-nasm
 | 
			
		||||
rem set ASSEMBLER=NASM
 | 
			
		||||
rem set NO_ASM=
 | 
			
		||||
 | 
			
		||||
rem   No default Bld target
 | 
			
		||||
set BLD_TARGET=no_target
 | 
			
		||||
rem set BLD_TARGET=netware-clib
 | 
			
		||||
rem set BLD_TARGET=netware-libc
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
rem   Default to build non-debug
 | 
			
		||||
set DEBUG=
 | 
			
		||||
                                    
 | 
			
		||||
rem   Uncomment to default to debug build
 | 
			
		||||
rem set DEBUG=debug
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
set CONFIG_OPTS=
 | 
			
		||||
set ARG_PROCESSED=NO
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
rem   Process command line args
 | 
			
		||||
:opts
 | 
			
		||||
if "a%1" == "a" goto endopt
 | 
			
		||||
if "%1" == "no-asm"   set NO_ASM=no-asm
 | 
			
		||||
if "%1" == "no-asm"   set ARG_PROCESSED=YES
 | 
			
		||||
if "%1" == "debug"    set DEBUG=debug
 | 
			
		||||
if "%1" == "debug"    set ARG_PROCESSED=YES
 | 
			
		||||
if "%1" == "nw-nasm"  set ASM_MODE=nw-nasm
 | 
			
		||||
if "%1" == "nw-nasm"  set ASSEMBLER=NASM
 | 
			
		||||
if "%1" == "nw-nasm"  set NO_ASM=
 | 
			
		||||
if "%1" == "nw-nasm"  set ARG_PROCESSED=YES
 | 
			
		||||
if "%1" == "nw-mwasm" set ASM_MODE=nw-mwasm
 | 
			
		||||
if "%1" == "nw-mwasm" set ASSEMBLER=Metrowerks
 | 
			
		||||
if "%1" == "nw-mwasm"  set NO_ASM=
 | 
			
		||||
if "%1" == "nw-mwasm" set ARG_PROCESSED=YES
 | 
			
		||||
if "%1" == "netware-clib" set BLD_TARGET=netware-clib
 | 
			
		||||
if "%1" == "netware-clib" set ARG_PROCESSED=YES
 | 
			
		||||
if "%1" == "netware-libc" set BLD_TARGET=netware-libc
 | 
			
		||||
if "%1" == "netware-libc" set ARG_PROCESSED=YES
 | 
			
		||||
if "%1" == "netware-libc-bsdsock" set BLD_TARGET=netware-libc-bsdsock
 | 
			
		||||
if "%1" == "netware-libc-bsdsock" set ARG_PROCESSED=YES
 | 
			
		||||
 | 
			
		||||
rem   If we didn't recognize the argument, consider it an option for config
 | 
			
		||||
if "%ARG_PROCESSED%" == "NO" set CONFIG_OPTS=%CONFIG_OPTS% %1
 | 
			
		||||
if "%ARG_PROCESSED%" == "YES" set ARG_PROCESSED=NO
 | 
			
		||||
 | 
			
		||||
shift
 | 
			
		||||
goto opts
 | 
			
		||||
:endopt
 | 
			
		||||
 | 
			
		||||
rem make sure a valid BLD_TARGET was specified
 | 
			
		||||
if "%BLD_TARGET%" == "no_target" goto no_target
 | 
			
		||||
 | 
			
		||||
rem build the nlm make file name which includes target and debug info
 | 
			
		||||
set NLM_MAKE=
 | 
			
		||||
if "%BLD_TARGET%" == "netware-clib" set NLM_MAKE=netware\nlm_clib
 | 
			
		||||
if "%BLD_TARGET%" == "netware-libc" set NLM_MAKE=netware\nlm_libc
 | 
			
		||||
if "%BLD_TARGET%" == "netware-libc-bsdsock" set NLM_MAKE=netware\nlm_libc_bsdsock
 | 
			
		||||
if "%DEBUG%" == "" set NLM_MAKE=%NLM_MAKE%.mak
 | 
			
		||||
if "%DEBUG%" == "debug" set NLM_MAKE=%NLM_MAKE%_dbg.mak
 | 
			
		||||
 | 
			
		||||
if "%NO_ASM%" == "no-asm" set ASM_MODE=
 | 
			
		||||
if "%NO_ASM%" == "no-asm" set ASSEMBLER=
 | 
			
		||||
if "%NO_ASM%" == "no-asm" set CONFIG_OPTS=%CONFIG_OPTS% no-asm
 | 
			
		||||
if "%NO_ASM%" == "no-asm" goto do_config
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
rem ==================================================
 | 
			
		||||
echo Generating x86 for %ASSEMBLER% assembler
 | 
			
		||||
 | 
			
		||||
echo Bignum
 | 
			
		||||
cd crypto\bn\asm
 | 
			
		||||
perl x86.pl %ASM_MODE% > bn-nw.asm
 | 
			
		||||
cd ..\..\..
 | 
			
		||||
 | 
			
		||||
echo DES
 | 
			
		||||
cd crypto\des\asm
 | 
			
		||||
perl des-586.pl %ASM_MODE% > d-nw.asm
 | 
			
		||||
cd ..\..\..
 | 
			
		||||
 | 
			
		||||
echo "crypt(3)"
 | 
			
		||||
 | 
			
		||||
cd crypto\des\asm
 | 
			
		||||
perl crypt586.pl %ASM_MODE% > y-nw.asm
 | 
			
		||||
cd ..\..\..
 | 
			
		||||
 | 
			
		||||
echo Blowfish
 | 
			
		||||
 | 
			
		||||
cd crypto\bf\asm
 | 
			
		||||
perl bf-586.pl %ASM_MODE% > b-nw.asm
 | 
			
		||||
cd ..\..\..
 | 
			
		||||
 | 
			
		||||
echo CAST5
 | 
			
		||||
cd crypto\cast\asm
 | 
			
		||||
perl cast-586.pl %ASM_MODE% > c-nw.asm
 | 
			
		||||
cd ..\..\..
 | 
			
		||||
 | 
			
		||||
echo RC4
 | 
			
		||||
cd crypto\rc4\asm
 | 
			
		||||
perl rc4-586.pl %ASM_MODE% > r4-nw.asm
 | 
			
		||||
cd ..\..\..
 | 
			
		||||
 | 
			
		||||
echo MD5
 | 
			
		||||
cd crypto\md5\asm
 | 
			
		||||
perl md5-586.pl %ASM_MODE% > m5-nw.asm
 | 
			
		||||
cd ..\..\..
 | 
			
		||||
 | 
			
		||||
echo SHA1
 | 
			
		||||
cd crypto\sha\asm
 | 
			
		||||
perl sha1-586.pl %ASM_MODE% > s1-nw.asm
 | 
			
		||||
cd ..\..\..
 | 
			
		||||
 | 
			
		||||
echo RIPEMD160
 | 
			
		||||
cd crypto\ripemd\asm
 | 
			
		||||
perl rmd-586.pl %ASM_MODE% > rm-nw.asm
 | 
			
		||||
cd ..\..\..
 | 
			
		||||
 | 
			
		||||
echo RC5\32
 | 
			
		||||
cd crypto\rc5\asm
 | 
			
		||||
perl rc5-586.pl %ASM_MODE% > r5-nw.asm
 | 
			
		||||
cd ..\..\..
 | 
			
		||||
 | 
			
		||||
rem ===============================================================
 | 
			
		||||
rem
 | 
			
		||||
:do_config
 | 
			
		||||
 | 
			
		||||
echo .
 | 
			
		||||
echo configure options: %CONFIG_OPTS% %BLD_TARGET%
 | 
			
		||||
echo .
 | 
			
		||||
perl configure %CONFIG_OPTS% %BLD_TARGET%
 | 
			
		||||
 | 
			
		||||
perl util\mkfiles.pl >MINFO
 | 
			
		||||
 | 
			
		||||
echo .
 | 
			
		||||
echo mk1mf.pl options: %DEBUG% %ASM_MODE% %CONFIG_OPTS% %BLD_TARGET%
 | 
			
		||||
echo .
 | 
			
		||||
perl util\mk1mf.pl %DEBUG% %ASM_MODE% %CONFIG_OPTS% %BLD_TARGET% >%NLM_MAKE%
 | 
			
		||||
 | 
			
		||||
echo The makefile "%NLM_MAKE%" has been created use your maketool to
 | 
			
		||||
echo build (ex: gmake -f %NLM_MAKE%)
 | 
			
		||||
goto end
 | 
			
		||||
 | 
			
		||||
rem ===============================================================
 | 
			
		||||
rem
 | 
			
		||||
:no_target
 | 
			
		||||
echo .
 | 
			
		||||
echo .  No build target specified!!!
 | 
			
		||||
echo .
 | 
			
		||||
echo .  usage: build [target] [debug opts] [assembly opts] [configure opts]
 | 
			
		||||
echo .
 | 
			
		||||
echo .     target        - "netware-clib" - CLib NetWare build (WinSock Sockets)
 | 
			
		||||
echo .                   - "netware-libc" - LibC NKS NetWare build (WinSock Sockets)
 | 
			
		||||
echo .                   - "netware-libc-bsdsock" - LibC NKS NetWare build (BSD Sockets)
 | 
			
		||||
echo .
 | 
			
		||||
echo .     debug opts    - "debug"  - build debug
 | 
			
		||||
echo .
 | 
			
		||||
echo .     assembly opts - "nw-mwasm" - use Metrowerks assembler
 | 
			
		||||
echo .                     "nw-nasm"  - use NASM assembler
 | 
			
		||||
echo .                     "no-asm"   - don't use assembly
 | 
			
		||||
echo .
 | 
			
		||||
echo .     configure opts- all unrecognized arguments are passed to the
 | 
			
		||||
echo .                      perl configure script
 | 
			
		||||
echo .
 | 
			
		||||
echo .  If no debug or assembly opts are specified the default is to build
 | 
			
		||||
echo .  non-debug without assembly
 | 
			
		||||
echo .
 | 
			
		||||
 | 
			
		||||
        
 | 
			
		||||
:end        
 | 
			
		||||
@@ -1,112 +0,0 @@
 | 
			
		||||
@echo off
 | 
			
		||||
 | 
			
		||||
rem   Batch file to copy OpenSSL stuff to a NetWare server for testing
 | 
			
		||||
 | 
			
		||||
rem   This batch file will create an "opensssl" directory at the root of the
 | 
			
		||||
rem   specified NetWare drive and copy the required files to run the tests.
 | 
			
		||||
rem   It should be run from inside the "openssl\netware" subdirectory.
 | 
			
		||||
 | 
			
		||||
rem   Usage:
 | 
			
		||||
rem      cpy_tests.bat <test subdirectory> <NetWare drive>
 | 
			
		||||
rem          <test subdirectory> - out_nw.dbg | out_nw
 | 
			
		||||
rem          <NetWare drive> - any mapped drive letter
 | 
			
		||||
rem
 | 
			
		||||
rem      example ( copy from debug build to m: dirve ):
 | 
			
		||||
rem              cpy_tests.bat out_nw.dbg m:
 | 
			
		||||
rem
 | 
			
		||||
rem      CAUTION:  If a directory named OpenSSL exists on the target drive
 | 
			
		||||
rem                it will be deleted first.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
if "%1" == "" goto usage
 | 
			
		||||
if "%2" == "" goto usage
 | 
			
		||||
 | 
			
		||||
rem   Assume running in \openssl directory unless cpy_tests.bat exists then
 | 
			
		||||
rem   it must be the \openssl\netware directory
 | 
			
		||||
set loc=.
 | 
			
		||||
if exist cpy_tests.bat set loc=..
 | 
			
		||||
 | 
			
		||||
rem   make sure the local build subdirectory specified is valid
 | 
			
		||||
if not exist %loc%\%1\NUL goto invalid_dir
 | 
			
		||||
 | 
			
		||||
rem   make sure target drive is valid
 | 
			
		||||
if not exist %2\NUL goto invalid_drive
 | 
			
		||||
 | 
			
		||||
rem   If an OpenSSL directory exists on the target drive, remove it
 | 
			
		||||
if exist %2\openssl\NUL goto remove_openssl
 | 
			
		||||
goto do_copy
 | 
			
		||||
 | 
			
		||||
:remove_openssl
 | 
			
		||||
echo .
 | 
			
		||||
echo OpenSSL directory exists on %2 - it will be removed!
 | 
			
		||||
pause
 | 
			
		||||
rmdir %2\openssl /s /q
 | 
			
		||||
 | 
			
		||||
:do_copy
 | 
			
		||||
rem   make an "openssl" directory and others at the root of the NetWare drive
 | 
			
		||||
mkdir %2\openssl
 | 
			
		||||
mkdir %2\openssl\test_out
 | 
			
		||||
mkdir %2\openssl\apps
 | 
			
		||||
mkdir %2\openssl\certs
 | 
			
		||||
mkdir %2\openssl\test
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
rem   copy the test nlms
 | 
			
		||||
copy %loc%\%1\*.nlm %2\openssl\
 | 
			
		||||
 | 
			
		||||
rem   copy the test perl script
 | 
			
		||||
copy %loc%\netware\do_tests.pl %2\openssl\
 | 
			
		||||
 | 
			
		||||
rem   copy the certs directory stuff
 | 
			
		||||
xcopy %loc%\certs\*.*         %2\openssl\certs\ /s
 | 
			
		||||
 | 
			
		||||
rem   copy the test directory stuff
 | 
			
		||||
copy %loc%\test\CAss.cnf      %2\openssl\test\
 | 
			
		||||
copy %loc%\test\Uss.cnf       %2\openssl\test\
 | 
			
		||||
copy %loc%\test\pkcs7.pem     %2\openssl\test\
 | 
			
		||||
copy %loc%\test\pkcs7-1.pem   %2\openssl\test\
 | 
			
		||||
copy %loc%\test\testcrl.pem   %2\openssl\test\
 | 
			
		||||
copy %loc%\test\testp7.pem    %2\openssl\test\
 | 
			
		||||
copy %loc%\test\testreq2.pem  %2\openssl\test\
 | 
			
		||||
copy %loc%\test\testrsa.pem   %2\openssl\test\
 | 
			
		||||
copy %loc%\test\testsid.pem   %2\openssl\test\
 | 
			
		||||
copy %loc%\test\testx509.pem  %2\openssl\test\
 | 
			
		||||
copy %loc%\test\v3-cert1.pem  %2\openssl\test\
 | 
			
		||||
copy %loc%\test\v3-cert2.pem  %2\openssl\test\
 | 
			
		||||
 | 
			
		||||
rem   copy the apps directory stuff
 | 
			
		||||
copy %loc%\apps\client.pem    %2\openssl\apps\
 | 
			
		||||
copy %loc%\apps\server.pem    %2\openssl\apps\
 | 
			
		||||
copy %loc%\apps\openssl.cnf   %2\openssl\apps\
 | 
			
		||||
 | 
			
		||||
echo .
 | 
			
		||||
echo Tests copied
 | 
			
		||||
echo Run the test script at the console by typing:
 | 
			
		||||
echo     "Perl \openssl\do_tests.pl"
 | 
			
		||||
echo .
 | 
			
		||||
echo Make sure the Search path includes the OpenSSL subdirectory
 | 
			
		||||
 | 
			
		||||
goto end
 | 
			
		||||
 | 
			
		||||
:invalid_dir
 | 
			
		||||
echo.
 | 
			
		||||
echo Invalid build directory specified: %1
 | 
			
		||||
echo.
 | 
			
		||||
goto usage
 | 
			
		||||
 | 
			
		||||
:invalid_drive
 | 
			
		||||
echo.
 | 
			
		||||
echo Invalid drive: %2
 | 
			
		||||
echo.
 | 
			
		||||
goto usage
 | 
			
		||||
 | 
			
		||||
:usage
 | 
			
		||||
echo.
 | 
			
		||||
echo usage: cpy_tests.bat [test subdirectory] [NetWare drive]
 | 
			
		||||
echo     [test subdirectory] - out_nw_clib.dbg, out_nw_libc.dbg, etc. 
 | 
			
		||||
echo     [NetWare drive]     - any mapped drive letter
 | 
			
		||||
echo.
 | 
			
		||||
echo example: cpy_test out_nw_clib.dbg M:
 | 
			
		||||
echo  (copy from clib debug build area to M: drive)
 | 
			
		||||
 | 
			
		||||
:end
 | 
			
		||||
@@ -1,594 +0,0 @@
 | 
			
		||||
# perl script to run OpenSSL tests
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
my $base_path      = "\\openssl";
 | 
			
		||||
 | 
			
		||||
my $output_path    = "$base_path\\test_out";
 | 
			
		||||
my $cert_path      = "$base_path\\certs";
 | 
			
		||||
my $test_path      = "$base_path\\test";
 | 
			
		||||
my $app_path       = "$base_path\\apps";
 | 
			
		||||
 | 
			
		||||
my $tmp_cert       = "$output_path\\cert.tmp";
 | 
			
		||||
my $OpenSSL_config = "$app_path\\openssl.cnf";
 | 
			
		||||
my $log_file       = "$output_path\\tests.log";
 | 
			
		||||
 | 
			
		||||
my $pause = 0;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#  process the command line args to see if they wanted us to pause
 | 
			
		||||
#  between executing each command
 | 
			
		||||
foreach $i (@ARGV)
 | 
			
		||||
{
 | 
			
		||||
   if ($i =~ /^-p$/)
 | 
			
		||||
   { $pause=1; }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
main();
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
############################################################################
 | 
			
		||||
sub main()
 | 
			
		||||
{
 | 
			
		||||
   # delete all the output files in the output directory
 | 
			
		||||
   unlink <$output_path\\*.*>;
 | 
			
		||||
 | 
			
		||||
   # open the main log file 
 | 
			
		||||
   open(OUT, ">$log_file") || die "unable to open $log_file\n";
 | 
			
		||||
 | 
			
		||||
   
 | 
			
		||||
   algorithm_tests();
 | 
			
		||||
   encryption_tests();
 | 
			
		||||
   pem_tests();
 | 
			
		||||
   verify_tests();
 | 
			
		||||
   ca_tests();
 | 
			
		||||
   ssl_tests();
 | 
			
		||||
 | 
			
		||||
   close(OUT);
 | 
			
		||||
 | 
			
		||||
   print("\nCompleted running tests.\n\n");
 | 
			
		||||
   print("Check log file for errors: $log_file\n");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
############################################################################
 | 
			
		||||
sub algorithm_tests
 | 
			
		||||
{
 | 
			
		||||
   my $i;
 | 
			
		||||
   my $outFile;
 | 
			
		||||
   my @tests = ( rsa_test, destest, ideatest, bftest, shatest, sha1test,
 | 
			
		||||
                 md5test, dsatest, md2test, mdc2test, rc2test, rc4test, randtest,
 | 
			
		||||
                 dhtest, exptest );
 | 
			
		||||
 | 
			
		||||
   print( "\nRUNNING CRYPTO ALGORITHM TESTS:\n\n");
 | 
			
		||||
 | 
			
		||||
   print( OUT "\n========================================================\n");
 | 
			
		||||
   print( OUT "CRYPTO ALGORITHM TESTS:\n\n");
 | 
			
		||||
 | 
			
		||||
   foreach $i (@tests)
 | 
			
		||||
   {
 | 
			
		||||
      if (-e "$base_path\\$i.nlm")
 | 
			
		||||
	  {
 | 
			
		||||
         $outFile = "$output_path\\$i.out";
 | 
			
		||||
         system("$i > $outFile");
 | 
			
		||||
         log_desc("Test: $i\.nlm:");
 | 
			
		||||
         log_output("", $outFile );
 | 
			
		||||
	  }
 | 
			
		||||
	  else
 | 
			
		||||
	  {
 | 
			
		||||
         log_desc("Test: $i\.nlm: file not found");
 | 
			
		||||
	  }
 | 
			
		||||
   }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
############################################################################
 | 
			
		||||
sub encryption_tests
 | 
			
		||||
{
 | 
			
		||||
   my $i;
 | 
			
		||||
   my $outFile;
 | 
			
		||||
   my @enc_tests = ( "enc", "rc4", "des-cfb", "des-ede-cfb", "des-ede3-cfb",
 | 
			
		||||
                     "des-ofb", "des-ede-ofb", "des-ede3-ofb",
 | 
			
		||||
                     "des-ecb", "des-ede", "des-ede3", "des-cbc",
 | 
			
		||||
                     "des-ede-cbc", "des-ede3-cbc", "idea-ecb", "idea-cfb",
 | 
			
		||||
                     "idea-ofb", "idea-cbc", "rc2-ecb", "rc2-cfb",
 | 
			
		||||
                     "rc2-ofb", "rc2-cbc", "bf-ecb", "bf-cfb",
 | 
			
		||||
                     "bf-ofb", "bf-cbc" );
 | 
			
		||||
 | 
			
		||||
   my $input = "$base_path\\do_tests.pl";
 | 
			
		||||
   my $cipher = "$output_path\\cipher.out";
 | 
			
		||||
   my $clear = "$output_path\\clear.out";
 | 
			
		||||
 | 
			
		||||
   print( "\nRUNNING ENCRYPTION & DECRYPTION TESTS:\n\n");
 | 
			
		||||
 | 
			
		||||
   print( OUT "\n========================================================\n");
 | 
			
		||||
   print( OUT "FILE ENCRYPTION & DECRYPTION TESTS:\n\n");
 | 
			
		||||
 | 
			
		||||
   foreach $i (@enc_tests)
 | 
			
		||||
   {
 | 
			
		||||
      log_desc("Testing: $i");
 | 
			
		||||
 | 
			
		||||
      # do encryption
 | 
			
		||||
      $outFile = "$output_path\\enc.out";
 | 
			
		||||
      system("openssl2 $i -e -bufsize 113 -k test -in $input -out $cipher > $outFile" );
 | 
			
		||||
      log_output("Encrypting: $input --> $cipher", $outFile);
 | 
			
		||||
 | 
			
		||||
      # do decryption
 | 
			
		||||
      $outFile = "$output_path\\dec.out";
 | 
			
		||||
      system("openssl2 $i -d -bufsize 157 -k test -in $cipher -out $clear > $outFile");
 | 
			
		||||
      log_output("Decrypting: $cipher --> $clear", $outFile);
 | 
			
		||||
 | 
			
		||||
      # compare files
 | 
			
		||||
      $x = compare_files( $input, $clear, 1);
 | 
			
		||||
      if ( $x == 0 )
 | 
			
		||||
      {
 | 
			
		||||
         print( "SUCCESS - files match: $input, $clear\n");
 | 
			
		||||
         print( OUT "SUCCESS - files match: $input, $clear\n");
 | 
			
		||||
      }
 | 
			
		||||
      else
 | 
			
		||||
      {
 | 
			
		||||
         print( "ERROR: files don't match\n");
 | 
			
		||||
         print( OUT "ERROR: files don't match\n");
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      do_wait();
 | 
			
		||||
 | 
			
		||||
      # Now do the same encryption but use Base64
 | 
			
		||||
 | 
			
		||||
      # do encryption B64
 | 
			
		||||
      $outFile = "$output_path\\B64enc.out";
 | 
			
		||||
      system("openssl2 $i -a -e -bufsize 113 -k test -in $input -out $cipher > $outFile");
 | 
			
		||||
      log_output("Encrypting(B64): $cipher --> $clear", $outFile);
 | 
			
		||||
 | 
			
		||||
      # do decryption B64
 | 
			
		||||
      $outFile = "$output_path\\B64dec.out";
 | 
			
		||||
      system("openssl2 $i -a -d -bufsize 157 -k test -in $cipher -out $clear > $outFile");
 | 
			
		||||
      log_output("Decrypting(B64): $cipher --> $clear", $outFile);
 | 
			
		||||
 | 
			
		||||
      # compare files
 | 
			
		||||
      $x = compare_files( $input, $clear, 1);
 | 
			
		||||
      if ( $x == 0 )
 | 
			
		||||
      {
 | 
			
		||||
         print( "SUCCESS - files match: $input, $clear\n");
 | 
			
		||||
         print( OUT "SUCCESS - files match: $input, $clear\n");
 | 
			
		||||
      }
 | 
			
		||||
      else
 | 
			
		||||
      {
 | 
			
		||||
         print( "ERROR: files don't match\n");
 | 
			
		||||
         print( OUT "ERROR: files don't match\n");
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      do_wait();
 | 
			
		||||
 | 
			
		||||
   } # end foreach
 | 
			
		||||
 | 
			
		||||
   # delete the temporary files
 | 
			
		||||
   unlink($cipher);
 | 
			
		||||
   unlink($clear);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
############################################################################
 | 
			
		||||
sub pem_tests
 | 
			
		||||
{
 | 
			
		||||
   my $i;
 | 
			
		||||
   my $tmp_out;
 | 
			
		||||
   my $outFile = "$output_path\\pem.out";
 | 
			
		||||
 | 
			
		||||
   my %pem_tests = (
 | 
			
		||||
         "crl"      => "testcrl.pem",
 | 
			
		||||
          "pkcs7"   => "testp7.pem",
 | 
			
		||||
          "req"     => "testreq2.pem",
 | 
			
		||||
          "rsa"     => "testrsa.pem",
 | 
			
		||||
          "x509"    => "testx509.pem",
 | 
			
		||||
          "x509"    => "v3-cert1.pem",
 | 
			
		||||
          "sess_id" => "testsid.pem"  );
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
   print( "\nRUNNING PEM TESTS:\n\n");
 | 
			
		||||
 | 
			
		||||
   print( OUT "\n========================================================\n");
 | 
			
		||||
   print( OUT "PEM TESTS:\n\n");
 | 
			
		||||
 | 
			
		||||
   foreach $i (keys(%pem_tests))
 | 
			
		||||
   {
 | 
			
		||||
      log_desc( "Testing: $i");
 | 
			
		||||
 | 
			
		||||
      my $input = "$test_path\\$pem_tests{$i}";
 | 
			
		||||
 | 
			
		||||
      $tmp_out = "$output_path\\$pem_tests{$i}";
 | 
			
		||||
 | 
			
		||||
      if ($i ne "req" )
 | 
			
		||||
      {
 | 
			
		||||
         system("openssl2 $i -in $input -out $tmp_out > $outFile");
 | 
			
		||||
         log_output( "openssl2 $i -in $input -out $tmp_out", $outFile);
 | 
			
		||||
      }
 | 
			
		||||
      else
 | 
			
		||||
      {
 | 
			
		||||
         system("openssl2 $i -in $input -out $tmp_out -config $OpenSSL_config > $outFile");
 | 
			
		||||
         log_output( "openssl2 $i -in $input -out $tmp_out -config $OpenSSL_config", $outFile );
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      $x = compare_files( $input, $tmp_out);
 | 
			
		||||
      if ( $x == 0 )
 | 
			
		||||
      {
 | 
			
		||||
         print( "SUCCESS - files match: $input, $tmp_out\n");
 | 
			
		||||
         print( OUT "SUCCESS - files match: $input, $tmp_out\n");
 | 
			
		||||
      }
 | 
			
		||||
      else
 | 
			
		||||
      {
 | 
			
		||||
         print( "ERROR: files don't match\n");
 | 
			
		||||
         print( OUT "ERROR: files don't match\n");
 | 
			
		||||
      }
 | 
			
		||||
      do_wait();
 | 
			
		||||
 | 
			
		||||
   } # end foreach
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
############################################################################
 | 
			
		||||
sub verify_tests
 | 
			
		||||
{
 | 
			
		||||
   my $i;
 | 
			
		||||
   my $outFile = "$output_path\\verify.out";
 | 
			
		||||
 | 
			
		||||
   my @cert_files = <$cert_path\\*.pem>;
 | 
			
		||||
 | 
			
		||||
   print( "\nRUNNING VERIFY TESTS:\n\n");
 | 
			
		||||
 | 
			
		||||
   print( OUT "\n========================================================\n");
 | 
			
		||||
   print( OUT "VERIFY TESTS:\n\n");
 | 
			
		||||
 | 
			
		||||
   make_tmp_cert_file();
 | 
			
		||||
 | 
			
		||||
   foreach $i (@cert_files)
 | 
			
		||||
   {
 | 
			
		||||
      system("openssl2 verify -CAfile $tmp_cert $i >$outFile");
 | 
			
		||||
      log_desc("Verifying cert: $i");
 | 
			
		||||
      log_output("openssl2 verify -CAfile $tmp_cert $i", $outFile);
 | 
			
		||||
   }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
############################################################################
 | 
			
		||||
sub ssl_tests
 | 
			
		||||
{
 | 
			
		||||
   my $outFile = "$output_path\\ssl_tst.out";
 | 
			
		||||
   my($CAcert) = "$output_path\\certCA.ss";
 | 
			
		||||
   my($Ukey)   = "$output_path\\keyU.ss";
 | 
			
		||||
   my($Ucert)  = "$output_path\\certU.ss";
 | 
			
		||||
   my($ssltest)= "ssltest -key $Ukey -cert $Ucert -c_key $Ukey -c_cert $Ucert -CAfile $CAcert";
 | 
			
		||||
 | 
			
		||||
   print( "\nRUNNING SSL TESTS:\n\n");
 | 
			
		||||
 | 
			
		||||
   print( OUT "\n========================================================\n");
 | 
			
		||||
   print( OUT "SSL TESTS:\n\n");
 | 
			
		||||
 | 
			
		||||
   system("ssltest -ssl2 >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2:");
 | 
			
		||||
   log_output("ssltest -ssl2", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -ssl2 -server_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2 with server authentication:");
 | 
			
		||||
   log_output("$ssltest -ssl2 -server_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -ssl2 -client_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2 with client authentication:");
 | 
			
		||||
   log_output("$ssltest -ssl2 -client_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -ssl2 -server_auth -client_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2 with both client and server authentication:");
 | 
			
		||||
   log_output("$ssltest -ssl2 -server_auth -client_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("ssltest -ssl3 >$outFile");
 | 
			
		||||
   log_desc("Testing sslv3:");
 | 
			
		||||
   log_output("ssltest -ssl3", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -ssl3 -server_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv3 with server authentication:");
 | 
			
		||||
   log_output("$ssltest -ssl3 -server_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -ssl3 -client_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv3 with client authentication:");
 | 
			
		||||
   log_output("$ssltest -ssl3 -client_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -ssl3 -server_auth -client_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv3 with both client and server authentication:");
 | 
			
		||||
   log_output("$ssltest -ssl3 -server_auth -client_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("ssltest >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2/sslv3:");
 | 
			
		||||
   log_output("ssltest", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -server_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2/sslv3 with server authentication:");
 | 
			
		||||
   log_output("$ssltest -server_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -client_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2/sslv3 with client authentication:");
 | 
			
		||||
   log_output("$ssltest -client_auth ", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -server_auth -client_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2/sslv3 with both client and server authentication:");
 | 
			
		||||
   log_output("$ssltest -server_auth -client_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("ssltest -bio_pair -ssl2 >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2 via BIO pair:");
 | 
			
		||||
   log_output("ssltest -bio_pair -ssl2", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("ssltest -bio_pair -dhe1024dsa -v >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2/sslv3 with 1024 bit DHE via BIO pair:");
 | 
			
		||||
   log_output("ssltest -bio_pair -dhe1024dsa -v", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -bio_pair -ssl2 -server_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2 with server authentication via BIO pair:");
 | 
			
		||||
   log_output("$ssltest -bio_pair -ssl2 -server_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -bio_pair -ssl2 -client_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2 with client authentication via BIO pair:");
 | 
			
		||||
   log_output("$ssltest -bio_pair -ssl2 -client_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -bio_pair -ssl2 -server_auth -client_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2 with both client and server authentication via BIO pair:");
 | 
			
		||||
   log_output("$ssltest -bio_pair -ssl2 -server_auth -client_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("ssltest -bio_pair -ssl3 >$outFile");
 | 
			
		||||
   log_desc("Testing sslv3 via BIO pair:");
 | 
			
		||||
   log_output("ssltest -bio_pair -ssl3", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -bio_pair -ssl3 -server_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv3 with server authentication via BIO pair:");
 | 
			
		||||
   log_output("$ssltest -bio_pair -ssl3 -server_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -bio_pair -ssl3 -client_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv3 with client authentication  via BIO pair:");
 | 
			
		||||
   log_output("$ssltest -bio_pair -ssl3 -client_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -bio_pair -ssl3 -server_auth -client_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv3 with both client and server authentication via BIO pair:");
 | 
			
		||||
   log_output("$ssltest -bio_pair -ssl3 -server_auth -client_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("ssltest -bio_pair >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2/sslv3 via BIO pair:");
 | 
			
		||||
   log_output("ssltest -bio_pair", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -bio_pair -server_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2/sslv3 with server authentication via BIO pair:");
 | 
			
		||||
   log_output("$ssltest -bio_pair -server_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -bio_pair -client_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2/sslv3 with client authentication via BIO pair:");
 | 
			
		||||
   log_output("$ssltest -bio_pair -client_auth", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("$ssltest -bio_pair -server_auth -client_auth >$outFile");
 | 
			
		||||
   log_desc("Testing sslv2/sslv3 with both client and server authentication via BIO pair:");
 | 
			
		||||
   log_output("$ssltest -bio_pair -server_auth -client_auth", $outFile);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
############################################################################
 | 
			
		||||
sub ca_tests
 | 
			
		||||
{
 | 
			
		||||
   my $outFile = "$output_path\\ca_tst.out";
 | 
			
		||||
 | 
			
		||||
   my($CAkey)     = "$output_path\\keyCA.ss";
 | 
			
		||||
   my($CAcert)    = "$output_path\\certCA.ss";
 | 
			
		||||
   my($CAserial)  = "$output_path\\certCA.srl";
 | 
			
		||||
   my($CAreq)     = "$output_path\\reqCA.ss";
 | 
			
		||||
   my($CAreq2)    = "$output_path\\req2CA.ss";
 | 
			
		||||
 | 
			
		||||
   my($CAconf)    = "$test_path\\CAss.cnf";
 | 
			
		||||
 | 
			
		||||
   my($Uconf)     = "$test_path\\Uss.cnf";
 | 
			
		||||
 | 
			
		||||
   my($Ukey)      = "$output_path\\keyU.ss";
 | 
			
		||||
   my($Ureq)      = "$output_path\\reqU.ss";
 | 
			
		||||
   my($Ucert)     = "$output_path\\certU.ss";
 | 
			
		||||
 | 
			
		||||
   print( "\nRUNNING CA TESTS:\n\n");
 | 
			
		||||
 | 
			
		||||
   print( OUT "\n========================================================\n");
 | 
			
		||||
   print( OUT "CA TESTS:\n");
 | 
			
		||||
 | 
			
		||||
   system("openssl2 req -config $CAconf -out $CAreq -keyout $CAkey -new >$outFile");
 | 
			
		||||
   log_desc("Make a certificate request using req:");
 | 
			
		||||
   log_output("openssl2 req -config $CAconf -out $CAreq -keyout $CAkey -new", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("openssl2 x509 -CAcreateserial -in $CAreq -days 30 -req -out $CAcert -signkey $CAkey >$outFile");
 | 
			
		||||
   log_desc("Convert the certificate request into a self signed certificate using x509:");
 | 
			
		||||
   log_output("openssl2 x509 -CAcreateserial -in $CAreq -days 30 -req -out $CAcert -signkey $CAkey", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("openssl2 x509 -in $CAcert -x509toreq -signkey $CAkey -out $CAreq2 >$outFile");
 | 
			
		||||
   log_desc("Convert a certificate into a certificate request using 'x509':");
 | 
			
		||||
   log_output("openssl2 x509 -in $CAcert -x509toreq -signkey $CAkey -out $CAreq2", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("openssl2 req -config $OpenSSL_config -verify -in $CAreq -noout >$outFile");
 | 
			
		||||
   log_output("openssl2 req -config $OpenSSL_config -verify -in $CAreq -noout", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("openssl2 req -config $OpenSSL_config -verify -in $CAreq2 -noout >$outFile");
 | 
			
		||||
   log_output( "openssl2 req -config $OpenSSL_config -verify -in $CAreq2 -noout", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("openssl2 verify -CAfile $CAcert $CAcert >$outFile");
 | 
			
		||||
   log_output("openssl2 verify -CAfile $CAcert $CAcert", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("openssl2 req -config $Uconf -out $Ureq -keyout $Ukey -new >$outFile");
 | 
			
		||||
   log_desc("Make another certificate request using req:");
 | 
			
		||||
   log_output("openssl2 req -config $Uconf -out $Ureq -keyout $Ukey -new", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("openssl2 x509 -CAcreateserial -in $Ureq -days 30 -req -out $Ucert -CA $CAcert -CAkey $CAkey -CAserial $CAserial >$outFile");
 | 
			
		||||
   log_desc("Sign certificate request with the just created CA via x509:");
 | 
			
		||||
   log_output("openssl2 x509 -CAcreateserial -in $Ureq -days 30 -req -out $Ucert -CA $CAcert -CAkey $CAkey -CAserial $CAserial", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("openssl2 verify -CAfile $CAcert $Ucert >$outFile");
 | 
			
		||||
   log_output("openssl2 verify -CAfile $CAcert $Ucert", $outFile);
 | 
			
		||||
 | 
			
		||||
   system("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert >$outFile");
 | 
			
		||||
   log_desc("Certificate details");
 | 
			
		||||
   log_output("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert", $outFile);
 | 
			
		||||
 | 
			
		||||
   print(OUT "-- \n");
 | 
			
		||||
   print(OUT "The generated CA certificate is $CAcert\n");
 | 
			
		||||
   print(OUT "The generated CA private key is $CAkey\n");
 | 
			
		||||
   print(OUT "The current CA signing serial number is in $CAserial\n");
 | 
			
		||||
 | 
			
		||||
   print(OUT "The generated user certificate is $Ucert\n");
 | 
			
		||||
   print(OUT "The generated user private key is $Ukey\n");
 | 
			
		||||
   print(OUT "--\n");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
############################################################################
 | 
			
		||||
sub log_output( $ $ )
 | 
			
		||||
{
 | 
			
		||||
   my( $desc, $file ) = @_;
 | 
			
		||||
   my($error) = 0;
 | 
			
		||||
   my($key);
 | 
			
		||||
   my($msg);
 | 
			
		||||
 | 
			
		||||
   if ($desc)
 | 
			
		||||
   {
 | 
			
		||||
      print("$desc\n");
 | 
			
		||||
      print(OUT "$desc\n");
 | 
			
		||||
   }
 | 
			
		||||
 | 
			
		||||
      # loop waiting for test program to complete
 | 
			
		||||
   while ( stat($file) == 0)
 | 
			
		||||
      { print(". "); sleep(1); }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
      # copy test output to log file
 | 
			
		||||
   open(IN, "<$file");
 | 
			
		||||
   while (<IN>)
 | 
			
		||||
   { 
 | 
			
		||||
      print(OUT $_); 
 | 
			
		||||
      if ( $_ =~ /ERROR/ )
 | 
			
		||||
      {
 | 
			
		||||
         $error = 1;
 | 
			
		||||
      }
 | 
			
		||||
   }
 | 
			
		||||
      # close and delete the temporary test output file
 | 
			
		||||
   close(IN);
 | 
			
		||||
   unlink($file);
 | 
			
		||||
 | 
			
		||||
   if ( $error == 0 )
 | 
			
		||||
   {
 | 
			
		||||
      $msg = "Test Succeeded";
 | 
			
		||||
   }
 | 
			
		||||
   else
 | 
			
		||||
   {
 | 
			
		||||
      $msg = "Test Failed";
 | 
			
		||||
   }
 | 
			
		||||
 | 
			
		||||
   print(OUT "$msg\n");
 | 
			
		||||
 | 
			
		||||
   if ($pause)
 | 
			
		||||
   {
 | 
			
		||||
      print("$msg - press ENTER to continue...");
 | 
			
		||||
      $key = getc;
 | 
			
		||||
      print("\n");
 | 
			
		||||
   }
 | 
			
		||||
      
 | 
			
		||||
      # Several of the testing scripts run a loop loading the 
 | 
			
		||||
      # same NLM with different options.
 | 
			
		||||
      # On slow NetWare machines there appears to be some delay in the 
 | 
			
		||||
      # OS actually unloading the test nlms and the OS complains about.
 | 
			
		||||
      # the NLM already being loaded.  This additional pause is to 
 | 
			
		||||
      # to help provide a little more time for unloading before trying to 
 | 
			
		||||
      # load again.
 | 
			
		||||
   sleep(1);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
############################################################################
 | 
			
		||||
sub log_desc( $ )
 | 
			
		||||
{
 | 
			
		||||
   my( $desc ) = @_;
 | 
			
		||||
 | 
			
		||||
   print("\n");
 | 
			
		||||
   print("$desc\n");
 | 
			
		||||
 | 
			
		||||
   print(OUT "\n");
 | 
			
		||||
   print(OUT "$desc\n");
 | 
			
		||||
   print(OUT "======================================\n");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
############################################################################
 | 
			
		||||
sub compare_files( $ $ $ )
 | 
			
		||||
{
 | 
			
		||||
   my( $file1, $file2, $binary ) = @_;
 | 
			
		||||
   my( $n1, $n2, $b1, $b2 );
 | 
			
		||||
   my($ret) = 1;
 | 
			
		||||
 | 
			
		||||
   open(IN0, $file1) || die "\nunable to open $file1\n";
 | 
			
		||||
   open(IN1, $file2) || die "\nunable to open $file2\n";
 | 
			
		||||
 | 
			
		||||
  if ($binary)
 | 
			
		||||
  {
 | 
			
		||||
      binmode IN0;
 | 
			
		||||
      binmode IN1;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
   for (;;)
 | 
			
		||||
   {
 | 
			
		||||
      $n1 = read(IN0, $b1, 512);
 | 
			
		||||
      $n2 = read(IN1, $b2, 512);
 | 
			
		||||
 | 
			
		||||
      if ($n1 != $n2) {last;}
 | 
			
		||||
      if ($b1 != $b2) {last;}
 | 
			
		||||
 | 
			
		||||
      if ($n1 == 0)
 | 
			
		||||
      {
 | 
			
		||||
         $ret = 0;
 | 
			
		||||
         last;
 | 
			
		||||
      }
 | 
			
		||||
   }
 | 
			
		||||
   close(IN0);
 | 
			
		||||
   close(IN1);
 | 
			
		||||
   return($ret);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
############################################################################
 | 
			
		||||
sub do_wait()
 | 
			
		||||
{
 | 
			
		||||
   my($key);
 | 
			
		||||
 | 
			
		||||
   if ($pause)
 | 
			
		||||
   {
 | 
			
		||||
      print("Press ENTER to continue...");
 | 
			
		||||
      $key = getc;
 | 
			
		||||
      print("\n");
 | 
			
		||||
   }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
############################################################################
 | 
			
		||||
sub make_tmp_cert_file()
 | 
			
		||||
{
 | 
			
		||||
   my @cert_files = <$cert_path\\*.pem>;
 | 
			
		||||
 | 
			
		||||
      # delete the file if it already exists
 | 
			
		||||
   unlink($tmp_cert);
 | 
			
		||||
 | 
			
		||||
   open( TMP_CERT, ">$tmp_cert") || die "\nunable to open $tmp_cert\n";
 | 
			
		||||
 | 
			
		||||
   print("building temporary cert file\n");
 | 
			
		||||
   
 | 
			
		||||
   # create a temporary cert file that contains all the certs
 | 
			
		||||
   foreach $i (@cert_files)
 | 
			
		||||
   {
 | 
			
		||||
      open( IN_CERT, $i ) || die "\nunable to open $i\n";
 | 
			
		||||
 | 
			
		||||
      for(;;)
 | 
			
		||||
      {
 | 
			
		||||
         $n = sysread(IN_CERT, $data, 1024);
 | 
			
		||||
 | 
			
		||||
         if ($n == 0)
 | 
			
		||||
         {
 | 
			
		||||
            close(IN_CERT);
 | 
			
		||||
            last;
 | 
			
		||||
         };
 | 
			
		||||
 | 
			
		||||
         syswrite(TMP_CERT, $data, $n);
 | 
			
		||||
      }
 | 
			
		||||
   }
 | 
			
		||||
 | 
			
		||||
   close( TMP_CERT );
 | 
			
		||||
}
 | 
			
		||||
@@ -1,254 +0,0 @@
 | 
			
		||||
An initial review of the OpenSSL code was done to determine how many 
 | 
			
		||||
global variables where present.  The idea was to determine the amount of 
 | 
			
		||||
work required to pull the globals into an instance data structure in 
 | 
			
		||||
order to build a Library NLM for NetWare.  This file contains the results 
 | 
			
		||||
of the review.  Each file is listed along with the globals in the file.  
 | 
			
		||||
The initial review was done very quickly so this list is probably
 | 
			
		||||
not a comprehensive list.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
cryptlib.c
 | 
			
		||||
===========================================
 | 
			
		||||
 | 
			
		||||
static STACK *app_locks=NULL;
 | 
			
		||||
 | 
			
		||||
static STACK_OF(CRYPTO_dynlock) *dyn_locks=NULL;
 | 
			
		||||
 | 
			
		||||
static void (MS_FAR *locking_callback)(int mode,int type,
 | 
			
		||||
   const char *file,int line)=NULL;
 | 
			
		||||
static int (MS_FAR *add_lock_callback)(int *pointer,int amount,
 | 
			
		||||
   int type,const char *file,int line)=NULL;
 | 
			
		||||
static unsigned long (MS_FAR *id_callback)(void)=NULL;
 | 
			
		||||
static struct CRYPTO_dynlock_value *(MS_FAR *dynlock_create_callback)
 | 
			
		||||
   (const char *file,int line)=NULL;
 | 
			
		||||
static void (MS_FAR *dynlock_lock_callback)(int mode,
 | 
			
		||||
   struct CRYPTO_dynlock_value *l, const char *file,int line)=NULL;
 | 
			
		||||
static void (MS_FAR *dynlock_destroy_callback)(struct CRYPTO_dynlock_value *l,
 | 
			
		||||
   const char *file,int line)=NULL;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
mem.c
 | 
			
		||||
===========================================
 | 
			
		||||
static int allow_customize = 1;      /* we provide flexible functions for */
 | 
			
		||||
static int allow_customize_debug = 1;/* exchanging memory-related functions at
 | 
			
		||||
 | 
			
		||||
/* may be changed as long as `allow_customize' is set */
 | 
			
		||||
static void *(*malloc_locked_func)(size_t)  = malloc;
 | 
			
		||||
static void (*free_locked_func)(void *)     = free;
 | 
			
		||||
static void *(*malloc_func)(size_t)         = malloc;
 | 
			
		||||
static void *(*realloc_func)(void *, size_t)= realloc;
 | 
			
		||||
static void (*free_func)(void *)            = free;
 | 
			
		||||
 | 
			
		||||
/* use default functions from mem_dbg.c */
 | 
			
		||||
static void (*malloc_debug_func)(void *,int,const char *,int,int)
 | 
			
		||||
   = CRYPTO_dbg_malloc;
 | 
			
		||||
static void (*realloc_debug_func)(void *,void *,int,const char *,int,int)
 | 
			
		||||
   = CRYPTO_dbg_realloc;
 | 
			
		||||
static void (*free_debug_func)(void *,int) = CRYPTO_dbg_free;
 | 
			
		||||
static void (*set_debug_options_func)(long) = CRYPTO_dbg_set_options;
 | 
			
		||||
static long (*get_debug_options_func)(void) = CRYPTO_dbg_get_options;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
mem_dbg.c
 | 
			
		||||
===========================================
 | 
			
		||||
static int mh_mode=CRYPTO_MEM_CHECK_OFF;
 | 
			
		||||
static unsigned long order = 0; /* number of memory requests */
 | 
			
		||||
static LHASH *mh=NULL; /* hash-table of memory requests (address as key) */
 | 
			
		||||
 | 
			
		||||
static LHASH *amih=NULL; /* hash-table with those app_mem_info_st's */
 | 
			
		||||
static long options =             /* extra information to be recorded */
 | 
			
		||||
static unsigned long disabling_thread = 0;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
err.c
 | 
			
		||||
===========================================
 | 
			
		||||
static LHASH *error_hash=NULL;
 | 
			
		||||
static LHASH *thread_hash=NULL;
 | 
			
		||||
 | 
			
		||||
several files have routines with static "init" to track if error strings
 | 
			
		||||
   have been loaded ( may not want seperate error strings for each process )
 | 
			
		||||
   The "init" variable can't be left "global" because the error has is a ptr
 | 
			
		||||
   that is malloc'ed.  The malloc'ed error has is dependant on the "init"
 | 
			
		||||
   vars.
 | 
			
		||||
 | 
			
		||||
   files:
 | 
			
		||||
      pem_err.c
 | 
			
		||||
      cpt_err.c
 | 
			
		||||
      pk12err.c
 | 
			
		||||
      asn1_err.c
 | 
			
		||||
      bio_err.c
 | 
			
		||||
      bn_err.c
 | 
			
		||||
      buf_err.c
 | 
			
		||||
      comp_err.c
 | 
			
		||||
      conf_err.c
 | 
			
		||||
      cpt_err.c
 | 
			
		||||
      dh_err.c
 | 
			
		||||
      dsa_err.c
 | 
			
		||||
      dso_err.c
 | 
			
		||||
      evp_err.c
 | 
			
		||||
      obj_err.c
 | 
			
		||||
      pkcs7err.c
 | 
			
		||||
      rand_err.c
 | 
			
		||||
      rsa_err.c
 | 
			
		||||
      rsar_err.c
 | 
			
		||||
      ssl_err.c
 | 
			
		||||
      x509_err.c
 | 
			
		||||
      v3err.c
 | 
			
		||||
		err.c
 | 
			
		||||
 | 
			
		||||
These file have similar "init" globals but they are for other stuff not
 | 
			
		||||
error strings:
 | 
			
		||||
 | 
			
		||||
		bn_lib.c
 | 
			
		||||
		ecc_enc.c
 | 
			
		||||
		s23_clnt.c
 | 
			
		||||
		s23_meth.c
 | 
			
		||||
		s23_srvr.c
 | 
			
		||||
		s2_clnt.c
 | 
			
		||||
		s2_lib.c
 | 
			
		||||
		s2_meth.c
 | 
			
		||||
		s2_srvr.c
 | 
			
		||||
		s3_clnt.c
 | 
			
		||||
		s3_lib.c
 | 
			
		||||
		s3_srvr.c
 | 
			
		||||
		t1_clnt.c
 | 
			
		||||
		t1_meth.c
 | 
			
		||||
		t1_srvr.c
 | 
			
		||||
 | 
			
		||||
rand_lib.c
 | 
			
		||||
===========================================
 | 
			
		||||
static RAND_METHOD *rand_meth= &rand_ssleay_meth;
 | 
			
		||||
 | 
			
		||||
md_rand.c
 | 
			
		||||
===========================================
 | 
			
		||||
static int state_num=0,state_index=0;
 | 
			
		||||
static unsigned char state[STATE_SIZE+MD_DIGEST_LENGTH];
 | 
			
		||||
static unsigned char md[MD_DIGEST_LENGTH];
 | 
			
		||||
static long md_count[2]={0,0};
 | 
			
		||||
static double entropy=0;
 | 
			
		||||
static int initialized=0;
 | 
			
		||||
 | 
			
		||||
/* This should be set to 1 only when ssleay_rand_add() is called inside
 | 
			
		||||
   an already locked state, so it doesn't try to lock and thereby cause
 | 
			
		||||
   a hang.  And it should always be reset back to 0 before unlocking. */
 | 
			
		||||
static int add_do_not_lock=0;
 | 
			
		||||
 | 
			
		||||
obj_dat.c
 | 
			
		||||
============================================
 | 
			
		||||
static int new_nid=NUM_NID;
 | 
			
		||||
static LHASH *added=NULL;
 | 
			
		||||
 | 
			
		||||
b_sock.c
 | 
			
		||||
===========================================
 | 
			
		||||
static unsigned long BIO_ghbn_hits=0L;
 | 
			
		||||
static unsigned long BIO_ghbn_miss=0L;
 | 
			
		||||
static struct ghbn_cache_st
 | 
			
		||||
   {
 | 
			
		||||
   char name[129];
 | 
			
		||||
   struct hostent *ent;
 | 
			
		||||
   unsigned long order;
 | 
			
		||||
   } ghbn_cache[GHBN_NUM];
 | 
			
		||||
 | 
			
		||||
static int wsa_init_done=0;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
bio_lib.c
 | 
			
		||||
===========================================
 | 
			
		||||
static STACK_OF(CRYPTO_EX_DATA_FUNCS) *bio_meth=NULL;
 | 
			
		||||
static int bio_meth_num=0;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
bn_lib.c
 | 
			
		||||
========================================
 | 
			
		||||
static int bn_limit_bits=0;
 | 
			
		||||
static int bn_limit_num=8;        /* (1<<bn_limit_bits) */
 | 
			
		||||
static int bn_limit_bits_low=0;
 | 
			
		||||
static int bn_limit_num_low=8;    /* (1<<bn_limit_bits_low) */
 | 
			
		||||
static int bn_limit_bits_high=0;
 | 
			
		||||
static int bn_limit_num_high=8;   /* (1<<bn_limit_bits_high) */
 | 
			
		||||
static int bn_limit_bits_mont=0;
 | 
			
		||||
static int bn_limit_num_mont=8;   /* (1<<bn_limit_bits_mont) */
 | 
			
		||||
 | 
			
		||||
conf_lib.c
 | 
			
		||||
========================================
 | 
			
		||||
static CONF_METHOD *default_CONF_method=NULL;
 | 
			
		||||
 | 
			
		||||
dh_lib.c
 | 
			
		||||
========================================
 | 
			
		||||
static DH_METHOD *default_DH_method;
 | 
			
		||||
static int dh_meth_num = 0;
 | 
			
		||||
static STACK_OF(CRYPTO_EX_DATA_FUNCS) *dh_meth = NULL;
 | 
			
		||||
 | 
			
		||||
dsa_lib.c
 | 
			
		||||
========================================
 | 
			
		||||
static DSA_METHOD *default_DSA_method;
 | 
			
		||||
static int dsa_meth_num = 0;
 | 
			
		||||
static STACK_OF(CRYPTO_EX_DATA_FUNCS) *dsa_meth = NULL;
 | 
			
		||||
 | 
			
		||||
dso_lib.c
 | 
			
		||||
========================================
 | 
			
		||||
static DSO_METHOD *default_DSO_meth = NULL;
 | 
			
		||||
 | 
			
		||||
rsa_lib.c
 | 
			
		||||
========================================
 | 
			
		||||
static RSA_METHOD *default_RSA_meth=NULL;
 | 
			
		||||
static int rsa_meth_num=0;
 | 
			
		||||
static STACK_OF(CRYPTO_EX_DATA_FUNCS) *rsa_meth=NULL;
 | 
			
		||||
 | 
			
		||||
x509_trs.c
 | 
			
		||||
=======================================
 | 
			
		||||
static int (*default_trust)(int id, X509 *x, int flags) = obj_trust;
 | 
			
		||||
static STACK_OF(X509_TRUST) *trtable = NULL;
 | 
			
		||||
 | 
			
		||||
x509_req.c
 | 
			
		||||
=======================================
 | 
			
		||||
static int *ext_nids = ext_nid_list;
 | 
			
		||||
 | 
			
		||||
o_names.c
 | 
			
		||||
======================================
 | 
			
		||||
static LHASH *names_lh=NULL;
 | 
			
		||||
static STACK_OF(NAME_FUNCS) *name_funcs_stack;
 | 
			
		||||
static int free_type;
 | 
			
		||||
static int names_type_num=OBJ_NAME_TYPE_NUM;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
th-lock.c - NEED to add support for locking for NetWare
 | 
			
		||||
==============================================
 | 
			
		||||
static long *lock_count;
 | 
			
		||||
(other platform specific globals)
 | 
			
		||||
 | 
			
		||||
x_x509.c
 | 
			
		||||
==============================================
 | 
			
		||||
static int x509_meth_num = 0;
 | 
			
		||||
static STACK_OF(CRYPTO_EX_DATA_FUNCS) *x509_meth = NULL;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
evp_pbe.c
 | 
			
		||||
============================================
 | 
			
		||||
static STACK *pbe_algs;
 | 
			
		||||
 | 
			
		||||
evp_key.c
 | 
			
		||||
============================================
 | 
			
		||||
static char prompt_string[80];
 | 
			
		||||
 | 
			
		||||
ssl_ciph.c
 | 
			
		||||
============================================
 | 
			
		||||
static STACK_OF(SSL_COMP) *ssl_comp_methods=NULL;
 | 
			
		||||
 | 
			
		||||
ssl_lib.c
 | 
			
		||||
=============================================
 | 
			
		||||
static STACK_OF(CRYPTO_EX_DATA_FUNCS) *ssl_meth=NULL;
 | 
			
		||||
static STACK_OF(CRYPTO_EX_DATA_FUNCS) *ssl_ctx_meth=NULL;
 | 
			
		||||
static int ssl_meth_num=0;
 | 
			
		||||
static int ssl_ctx_meth_num=0;
 | 
			
		||||
 | 
			
		||||
ssl_sess.c
 | 
			
		||||
=============================================
 | 
			
		||||
static int ssl_session_num=0;
 | 
			
		||||
static STACK_OF(CRYPTO_EX_DATA_FUNCS) *ssl_session_meth=NULL;
 | 
			
		||||
 | 
			
		||||
x509_vfy.c
 | 
			
		||||
============================================
 | 
			
		||||
static STACK_OF(CRYPTO_EX_DATA_FUNCS) *x509_store_ctx_method=NULL;
 | 
			
		||||
static int x509_store_ctx_num=0;
 | 
			
		||||
 | 
			
		||||
@@ -1,19 +0,0 @@
 | 
			
		||||
 | 
			
		||||
Contents of the openssl\netware directory
 | 
			
		||||
==========================================
 | 
			
		||||
 | 
			
		||||
Regular files:
 | 
			
		||||
 | 
			
		||||
readme.txt     - this file
 | 
			
		||||
do_tests.pl    - perl script used to run the OpenSSL tests on NetWare
 | 
			
		||||
cpy_tests.bat  - batch to to copy test stuff to NetWare server
 | 
			
		||||
build.bat      - batch file to help with builds
 | 
			
		||||
set_env.bat    - batch file to help setup build environments
 | 
			
		||||
globals.txt    - results of initial code review to identify OpenSSL global variables
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
The following files are generated by the various scripts.  They are
 | 
			
		||||
recreated each time and it is okay to delete them.
 | 
			
		||||
 | 
			
		||||
*.def - command files used by Metrowerks linker
 | 
			
		||||
*.mak - make files generated by mk1mf.pl
 | 
			
		||||
@@ -1,90 +0,0 @@
 | 
			
		||||
@echo off
 | 
			
		||||
 | 
			
		||||
rem ========================================================================
 | 
			
		||||
rem   Batch file to assist in setting up the necessary enviroment for
 | 
			
		||||
rem   building OpenSSL for NetWare.
 | 
			
		||||
rem
 | 
			
		||||
rem   usage:
 | 
			
		||||
rem      set_env [target]
 | 
			
		||||
rem
 | 
			
		||||
rem      target      - "netware-clib" - Clib build
 | 
			
		||||
rem                  - "netware-libc" - LibC build
 | 
			
		||||
rem
 | 
			
		||||
rem
 | 
			
		||||
 | 
			
		||||
if "a%1" == "a" goto usage
 | 
			
		||||
               
 | 
			
		||||
set LIBC_BUILD=
 | 
			
		||||
set CLIB_BUILD=
 | 
			
		||||
 | 
			
		||||
if "%1" == "netware-clib" set CLIB_BUILD=Y
 | 
			
		||||
if "%1" == "netware-clib" set LIBC_BUILD=
 | 
			
		||||
 | 
			
		||||
if "%1" == "netware-libc"  set LIBC_BUILD=Y
 | 
			
		||||
if "%1" == "netware-libc"  set CLIB_BUILD=
 | 
			
		||||
 | 
			
		||||
rem   Location of tools (compiler, linker, etc)
 | 
			
		||||
set TOOLS=d:\i_drive\tools
 | 
			
		||||
 | 
			
		||||
rem   If Perl for Win32 is not already in your path, add it here
 | 
			
		||||
set PERL_PATH=
 | 
			
		||||
 | 
			
		||||
rem   Define path to the Metrowerks command line tools
 | 
			
		||||
rem   ( compiler, assembler, linker)
 | 
			
		||||
set METROWERKS_PATH=%TOOLS%\codewar\pdk_21\tools\command line tools
 | 
			
		||||
rem set METROWERKS_PATH=%TOOLS%\codewar\PDK_40\Other Metrowerks Tools\Command Line Tools
 | 
			
		||||
 | 
			
		||||
rem   If using gnu make define path to utility
 | 
			
		||||
set GNU_MAKE_PATH=%TOOLS%\gnu
 | 
			
		||||
 | 
			
		||||
rem   If using ms nmake define path to nmake
 | 
			
		||||
set MS_NMAKE_PATH=%TOOLS%\msvc\600\bin
 | 
			
		||||
 | 
			
		||||
rem   If using NASM assembler define path
 | 
			
		||||
set NASM_PATH=%TOOLS%\nasm
 | 
			
		||||
 | 
			
		||||
rem   Update path to include tool paths
 | 
			
		||||
set path=%path%;%METROWERKS_PATH%
 | 
			
		||||
if not "%GNU_MAKE_PATH%" == "" set path=%path%;%GNU_MAKE_PATH%
 | 
			
		||||
if not "%MS_NMAKE_PATH%" == "" set path=%path%;%MS_NMAKE_PATH%
 | 
			
		||||
if not "%NASM_PATH%"     == "" set path=%path%;%NASM_PATH%
 | 
			
		||||
if not "%PERL_PATH%"     == "" set path=%path%;%PERL_PATH%
 | 
			
		||||
 | 
			
		||||
rem   Set MWCIncludes to location of Novell NDK includes
 | 
			
		||||
if "%LIBC_BUILD%" == "Y" set MWCIncludes=%TOOLS%\ndk\libc\include;%TOOLS%\ndk\libc\include\winsock;.\engines
 | 
			
		||||
if "%CLIB_BUILD%" == "Y" set MWCIncludes=%TOOLS%\ndk\nwsdk\include\nlm;.\engines
 | 
			
		||||
set include=
 | 
			
		||||
 | 
			
		||||
rem   Set Imports to location of Novell NDK import files
 | 
			
		||||
if "%LIBC_BUILD%" == "Y" set IMPORTS=%TOOLS%\ndk\libc\imports
 | 
			
		||||
if "%CLIB_BUILD%" == "Y" set IMPORTS=%TOOLS%\ndk\nwsdk\imports
 | 
			
		||||
 | 
			
		||||
rem   Set PRELUDE to the absolute path of the prelude object to link with in
 | 
			
		||||
rem   the Metrowerks NetWare PDK - NOTE: for Clib builds "clibpre.o" is 
 | 
			
		||||
rem   recommended, for LibC NKS builds libcpre.o must be used
 | 
			
		||||
if "%LIBC_BUILD%" == "Y" set PRELUDE=%IMPORTS%\libcpre.o
 | 
			
		||||
if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\clibpre.o
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
if "%LIBC_BUILD%" == "Y" echo Enviroment configured for LibC build
 | 
			
		||||
if "%LIBC_BUILD%" == "Y" echo use "netware\build.bat netware-libc ..." 
 | 
			
		||||
 | 
			
		||||
if "%CLIB_BUILD%" == "Y" echo Enviroment configured for CLib build
 | 
			
		||||
if "%CLIB_BUILD%" == "Y" echo use "netware\build.bat netware-clib ..." 
 | 
			
		||||
goto end
 | 
			
		||||
 | 
			
		||||
:usage
 | 
			
		||||
rem ===============================================================
 | 
			
		||||
echo .
 | 
			
		||||
echo . No target build specified!
 | 
			
		||||
echo .
 | 
			
		||||
echo . usage: set_env [target]
 | 
			
		||||
echo .
 | 
			
		||||
echo .   target      - "netware-clib" - Clib build
 | 
			
		||||
echo .               - "netware-libc" - LibC build
 | 
			
		||||
echo .
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
:end
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										197
									
								
								PROBLEMS
									
									
									
									
									
								
							
							
						
						
									
										197
									
								
								PROBLEMS
									
									
									
									
									
								
							@@ -1,197 +0,0 @@
 | 
			
		||||
* System libcrypto.dylib and libssl.dylib are used by system ld on MacOS X.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    NOTE: The problem described here only applies when OpenSSL isn't built
 | 
			
		||||
    with shared library support (i.e. without the "shared" configuration
 | 
			
		||||
    option).  If you build with shared library support, you will have no
 | 
			
		||||
    problems as long as you set up DYLD_LIBRARY_PATH properly at all times.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
This is really a misfeature in ld, which seems to look for .dylib libraries
 | 
			
		||||
along the whole library path before it bothers looking for .a libraries.  This
 | 
			
		||||
means that -L switches won't matter unless OpenSSL is built with shared
 | 
			
		||||
library support.
 | 
			
		||||
 | 
			
		||||
The workaround may be to change the following lines in apps/Makefile and
 | 
			
		||||
test/Makefile:
 | 
			
		||||
 | 
			
		||||
  LIBCRYPTO=-L.. -lcrypto
 | 
			
		||||
  LIBSSL=-L.. -lssl
 | 
			
		||||
 | 
			
		||||
to:
 | 
			
		||||
 | 
			
		||||
  LIBCRYPTO=../libcrypto.a
 | 
			
		||||
  LIBSSL=../libssl.a
 | 
			
		||||
 | 
			
		||||
It's possible that something similar is needed for shared library support
 | 
			
		||||
as well.  That hasn't been well tested yet.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Another solution that many seem to recommend is to move the libraries
 | 
			
		||||
/usr/lib/libcrypto.0.9.dylib, /usr/lib/libssl.0.9.dylib to a different
 | 
			
		||||
directory, build and install OpenSSL and anything that depends on your
 | 
			
		||||
build, then move libcrypto.0.9.dylib and libssl.0.9.dylib back to their
 | 
			
		||||
original places.  Note that the version numbers on those two libraries
 | 
			
		||||
may differ on your machine.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
As long as Apple doesn't fix the problem with ld, this problem building
 | 
			
		||||
OpenSSL will remain as is.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Parallell make leads to errors
 | 
			
		||||
 | 
			
		||||
While running tests, running a parallell make is a bad idea.  Many test
 | 
			
		||||
scripts use the same name for output and input files, which means different
 | 
			
		||||
will interfere with each other and lead to test failure.
 | 
			
		||||
 | 
			
		||||
The solution is simple for now: don't run parallell make when testing.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
* Bugs in gcc triggered
 | 
			
		||||
 | 
			
		||||
- According to a problem report, there are bugs in gcc 3.0 that are
 | 
			
		||||
  triggered by some of the code in OpenSSL, more specifically in
 | 
			
		||||
  PEM_get_EVP_CIPHER_INFO().  The triggering code is the following:
 | 
			
		||||
 | 
			
		||||
	header+=11;
 | 
			
		||||
	if (*header != '4') return(0); header++;
 | 
			
		||||
	if (*header != ',') return(0); header++;
 | 
			
		||||
 | 
			
		||||
  What happens is that gcc might optimize a little too agressively, and
 | 
			
		||||
  you end up with an extra incrementation when *header != '4'.
 | 
			
		||||
 | 
			
		||||
  We recommend that you upgrade gcc to as high a 3.x version as you can.
 | 
			
		||||
 | 
			
		||||
- According to multiple problem reports, some of our message digest
 | 
			
		||||
  implementations trigger bug[s] in code optimizer in gcc 3.3 for sparc64
 | 
			
		||||
  and gcc 2.96 for ppc. Former fails to complete RIPEMD160 test, while
 | 
			
		||||
  latter - SHA one.
 | 
			
		||||
 | 
			
		||||
  The recomendation is to upgrade your compiler. This naturally applies to
 | 
			
		||||
  other similar cases.
 | 
			
		||||
 | 
			
		||||
- There is a subtle Solaris x86-specific gcc run-time environment bug, which
 | 
			
		||||
  "falls between" OpenSSL [0.9.8 and later], Solaris ld and GCC. The bug
 | 
			
		||||
  manifests itself as Segmentation Fault upon early application start-up.
 | 
			
		||||
  The problem can be worked around by patching the environment according to
 | 
			
		||||
  http://www.openssl.org/~appro/values.c.
 | 
			
		||||
 | 
			
		||||
* solaris64-sparcv9-cc SHA-1 performance with WorkShop 6 compiler.
 | 
			
		||||
 | 
			
		||||
As subject suggests SHA-1 might perform poorly (4 times slower)
 | 
			
		||||
if compiled with WorkShop 6 compiler and -xarch=v9. The cause for
 | 
			
		||||
this seems to be the fact that compiler emits multiplication to
 | 
			
		||||
perform shift operations:-( To work the problem around configure
 | 
			
		||||
with './Configure solaris64-sparcv9-cc -DMD32_REG_T=int'.
 | 
			
		||||
 | 
			
		||||
* Problems with hp-parisc2-cc target when used with "no-asm" flag
 | 
			
		||||
 | 
			
		||||
When using the hp-parisc2-cc target, wrong bignum code is generated.
 | 
			
		||||
This is due to the SIXTY_FOUR_BIT build being compiled with the +O3
 | 
			
		||||
aggressive optimization.
 | 
			
		||||
The problem manifests itself by the BN_kronecker test hanging in an
 | 
			
		||||
endless loop. Reason: the BN_kronecker test calls BN_generate_prime()
 | 
			
		||||
which itself hangs. The reason could be tracked down to the bn_mul_comba8()
 | 
			
		||||
function in bn_asm.c. At some occasions the higher 32bit value of r[7]
 | 
			
		||||
is off by 1 (meaning: calculated=shouldbe+1). Further analysis failed,
 | 
			
		||||
as no debugger support possible at +O3 and additional fprintf()'s
 | 
			
		||||
introduced fixed the bug, therefore it is most likely a bug in the
 | 
			
		||||
optimizer.
 | 
			
		||||
The bug was found in the BN_kronecker test but may also lead to
 | 
			
		||||
failures in other parts of the code.
 | 
			
		||||
(See Ticket #426.)
 | 
			
		||||
 | 
			
		||||
Workaround: modify the target to +O2 when building with no-asm.
 | 
			
		||||
 | 
			
		||||
* Problems building shared libraries on SCO OpenServer Release 5.0.6
 | 
			
		||||
  with gcc 2.95.3
 | 
			
		||||
 | 
			
		||||
The symptoms appear when running the test suite, more specifically
 | 
			
		||||
test/ectest, with the following result:
 | 
			
		||||
 | 
			
		||||
OSSL_LIBPATH="`cd ..; pwd`"; LD_LIBRARY_PATH="$OSSL_LIBPATH:$LD_LIBRARY_PATH"; DYLD_LIBRARY_PATH="$OSSL_LIBPATH:$DYLD_LIBRARY_PATH"; SHLIB_PATH="$OSSL_LIBPATH:$SHLIB_PATH"; LIBPATH="$OSSL_LIBPATH:$LIBPATH"; if [ "debug-sco5-gcc" = "Cygwin" ]; then PATH="${LIBPATH}:$PATH"; fi; export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; ./ectest
 | 
			
		||||
ectest.c:186: ABORT
 | 
			
		||||
 | 
			
		||||
The cause of the problem seems to be that isxdigit(), called from
 | 
			
		||||
BN_hex2bn(), returns 0 on a perfectly legitimate hex digit.  Further
 | 
			
		||||
investigation shows that any of the isxxx() macros return 0 on any
 | 
			
		||||
input.  A direct look in the information array that the isxxx() use,
 | 
			
		||||
called __ctype, shows that it contains all zeroes...
 | 
			
		||||
 | 
			
		||||
Taking a look at the newly created libcrypto.so with nm, one can see
 | 
			
		||||
that the variable __ctype is defined in libcrypto's .bss (which
 | 
			
		||||
explains why it is filled with zeroes):
 | 
			
		||||
 | 
			
		||||
$ nm -Pg libcrypto.so | grep __ctype
 | 
			
		||||
__ctype B 0011659c
 | 
			
		||||
__ctype2 U         
 | 
			
		||||
 | 
			
		||||
Curiously, __ctype2 is undefined, in spite of being declared in
 | 
			
		||||
/usr/include/ctype.h in exactly the same way as __ctype.
 | 
			
		||||
 | 
			
		||||
Any information helping to solve this issue would be deeply
 | 
			
		||||
appreciated.
 | 
			
		||||
 | 
			
		||||
NOTE: building non-shared doesn't come with this problem.
 | 
			
		||||
 | 
			
		||||
* ULTRIX build fails with shell errors, such as "bad substitution"
 | 
			
		||||
  and "test: argument expected"
 | 
			
		||||
 | 
			
		||||
The problem is caused by ULTRIX /bin/sh supporting only original
 | 
			
		||||
Bourne shell syntax/semantics, and the trouble is that the vast
 | 
			
		||||
majority is so accustomed to more modern syntax, that very few
 | 
			
		||||
people [if any] would recognize the ancient syntax even as valid.
 | 
			
		||||
This inevitably results in non-trivial scripts breaking on ULTRIX,
 | 
			
		||||
and OpenSSL isn't an exclusion. Fortunately there is workaround,
 | 
			
		||||
hire /bin/ksh to do the job /bin/sh fails to do.
 | 
			
		||||
 | 
			
		||||
1. Trick make(1) to use /bin/ksh by setting up following environ-
 | 
			
		||||
   ment variables *prior* you execute ./Configure and make:
 | 
			
		||||
 | 
			
		||||
	PROG_ENV=POSIX
 | 
			
		||||
	MAKESHELL=/bin/ksh
 | 
			
		||||
	export PROG_ENV MAKESHELL
 | 
			
		||||
 | 
			
		||||
   or if your shell is csh-compatible:
 | 
			
		||||
 | 
			
		||||
	setenv PROG_ENV POSIX
 | 
			
		||||
	setenv MAKESHELL /bin/ksh
 | 
			
		||||
 | 
			
		||||
2. Trick /bin/sh to use alternative expression evaluator. Create
 | 
			
		||||
   following 'test' script for example in /tmp:
 | 
			
		||||
 | 
			
		||||
	#!/bin/ksh
 | 
			
		||||
	${0##*/} "$@"
 | 
			
		||||
 | 
			
		||||
   Then 'chmod a+x /tmp/test; ln /tmp/test /tmp/[' and *prepend*
 | 
			
		||||
   your $PATH with chosen location, e.g. PATH=/tmp:$PATH. Alter-
 | 
			
		||||
   natively just replace system /bin/test and /bin/[ with the
 | 
			
		||||
   above script.
 | 
			
		||||
 | 
			
		||||
* hpux64-ia64-cc fails blowfish test.
 | 
			
		||||
 | 
			
		||||
Compiler bug, presumably at particular patch level. It should be noted
 | 
			
		||||
that same compiler generates correct 32-bit code, a.k.a. hpux-ia64-cc
 | 
			
		||||
target. Drop optimization level to +O2 when compiling 64-bit bf_skey.o.
 | 
			
		||||
 | 
			
		||||
* no-engines generates errors.
 | 
			
		||||
 | 
			
		||||
Unfortunately, the 'no-engines' configuration option currently doesn't
 | 
			
		||||
work properly.  Use 'no-hw' and you'll will at least get no hardware
 | 
			
		||||
support.  We'll see how we fix that on OpenSSL versions past 0.9.8.
 | 
			
		||||
 | 
			
		||||
* 'make test' fails in BN_sqr [commonly with "error 139" denoting SIGSEGV]
 | 
			
		||||
  if elder GNU binutils were deployed to link shared libcrypto.so.
 | 
			
		||||
 | 
			
		||||
As subject suggests the failure is caused by a bug in elder binutils,
 | 
			
		||||
either as or ld, and was observed on FreeBSD and Linux. There are two
 | 
			
		||||
options. First is naturally to upgrade binutils, the second one - to
 | 
			
		||||
reconfigure with additional no-sse2 [or 386] option passed to ./config.
 | 
			
		||||
 | 
			
		||||
* If configured with ./config no-dso, toolkit still gets linked with -ldl,
 | 
			
		||||
  which most notably poses a problem when linking with dietlibc.
 | 
			
		||||
 | 
			
		||||
We don't have framework to associate -ldl with no-dso, therefore the only
 | 
			
		||||
way is to edit Makefile right after ./config no-dso and remove -ldl from
 | 
			
		||||
EX_LIBS line.
 | 
			
		||||
							
								
								
									
										91
									
								
								README
									
									
									
									
									
								
							
							
						
						
									
										91
									
								
								README
									
									
									
									
									
								
							@@ -1,26 +1,19 @@
 | 
			
		||||
 | 
			
		||||
 OpenSSL 0.9.8f-fips-dev test version
 | 
			
		||||
 OpenSSL 0.9.5  28 Feb 2000
 | 
			
		||||
 | 
			
		||||
 Copyright (c) 1998-2007 The OpenSSL Project
 | 
			
		||||
 Copyright (c) 1998-2000 The OpenSSL Project
 | 
			
		||||
 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
 | 
			
		||||
 All rights reserved.
 | 
			
		||||
 | 
			
		||||
 WARNING
 | 
			
		||||
 -------
 | 
			
		||||
 | 
			
		||||
 This version of OpenSSL is an initial port of the FIPS 140-2 code to OpenSSL
 | 
			
		||||
 0.9.8. See the file README.FIPS for brief usage details.
 | 
			
		||||
 | 
			
		||||
 DESCRIPTION
 | 
			
		||||
 -----------
 | 
			
		||||
 | 
			
		||||
 The OpenSSL Project is a collaborative effort to develop a robust,
 | 
			
		||||
 commercial-grade, fully featured, and Open Source toolkit implementing the
 | 
			
		||||
 Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
 | 
			
		||||
 protocols as well as a full-strength general purpose cryptography library.
 | 
			
		||||
 The project is managed by a worldwide community of volunteers that use the
 | 
			
		||||
 Internet to communicate, plan, and develop the OpenSSL toolkit and its
 | 
			
		||||
 related documentation.
 | 
			
		||||
 protocols with full-strength cryptography world-wide. The project is managed
 | 
			
		||||
 by a worldwide community of volunteers that use the Internet to communicate,
 | 
			
		||||
 plan, and develop the OpenSSL toolkit and its related documentation. 
 | 
			
		||||
 | 
			
		||||
 OpenSSL is based on the excellent SSLeay library developed from Eric A. Young
 | 
			
		||||
 and Tim J. Hudson.  The OpenSSL toolkit is licensed under a dual-license (the
 | 
			
		||||
@@ -42,13 +35,12 @@
 | 
			
		||||
     actually logically part of it. It includes routines for the following:
 | 
			
		||||
 | 
			
		||||
     Ciphers
 | 
			
		||||
        libdes - EAY's libdes DES encryption package which was floating
 | 
			
		||||
                 around the net for a few years, and was then relicensed by
 | 
			
		||||
                 him as part of SSLeay.  It includes 15 'modes/variations'
 | 
			
		||||
                 of DES (1, 2 and 3 key versions of ecb, cbc, cfb and ofb;
 | 
			
		||||
                 pcbc and a more general form of cfb and ofb) including desx
 | 
			
		||||
                 in cbc mode, a fast crypt(3), and routines to read
 | 
			
		||||
                 passwords from the keyboard.
 | 
			
		||||
        libdes - EAY's libdes DES encryption package which has been floating
 | 
			
		||||
                 around the net for a few years.  It includes 15
 | 
			
		||||
                 'modes/variations' of DES (1, 2 and 3 key versions of ecb,
 | 
			
		||||
                 cbc, cfb and ofb; pcbc and a more general form of cfb and
 | 
			
		||||
                 ofb) including desx in cbc mode, a fast crypt(3), and
 | 
			
		||||
                 routines to read passwords from the keyboard.
 | 
			
		||||
        RC4 encryption,
 | 
			
		||||
        RC2 encryption      - 4 different modes, ecb, cbc, cfb and ofb.
 | 
			
		||||
        Blowfish encryption - 4 different modes, ecb, cbc, cfb and ofb.
 | 
			
		||||
@@ -69,7 +61,7 @@
 | 
			
		||||
 | 
			
		||||
     X.509v3 certificates
 | 
			
		||||
        X509 encoding/decoding into/from binary ASN1 and a PEM
 | 
			
		||||
             based ASCII-binary encoding which supports encryption with a
 | 
			
		||||
             based ascii-binary encoding which supports encryption with a
 | 
			
		||||
             private key.  Program to generate RSA and DSA certificate
 | 
			
		||||
             requests and to generate RSA and DSA certificates.
 | 
			
		||||
 | 
			
		||||
@@ -104,26 +96,21 @@
 | 
			
		||||
 locations around the world. _YOU_ are responsible for ensuring that your use
 | 
			
		||||
 of any algorithms is legal by checking if there are any patents in your
 | 
			
		||||
 country.  The file contains some of the patents that we know about or are
 | 
			
		||||
 rumored to exist. This is not a definitive list.
 | 
			
		||||
 rumoured to exist. This is not a definitive list.
 | 
			
		||||
 | 
			
		||||
 RSA Security holds software patents on the RC5 algorithm.  If you
 | 
			
		||||
 intend to use this cipher, you must contact RSA Security for
 | 
			
		||||
 licensing conditions. Their web page is http://www.rsasecurity.com/.
 | 
			
		||||
 RSA Data Security holds software patents on the RSA and RC5 algorithms.  If
 | 
			
		||||
 their ciphers are used used inside the USA (and Japan?), you must contact RSA
 | 
			
		||||
 Data Security for licensing conditions. Their web page is
 | 
			
		||||
 http://www.rsa.com/.
 | 
			
		||||
 | 
			
		||||
 RC4 is a trademark of RSA Security, so use of this label should perhaps
 | 
			
		||||
 only be used with RSA Security's permission.
 | 
			
		||||
 RC4 is a trademark of RSA Data Security, so use of this label should perhaps
 | 
			
		||||
 only be used with RSA Data Security's permission. 
 | 
			
		||||
 | 
			
		||||
 The IDEA algorithm is patented by Ascom in Austria, France, Germany, Italy,
 | 
			
		||||
 Japan, the Netherlands, Spain, Sweden, Switzerland, UK and the USA.  They
 | 
			
		||||
 should be contacted if that algorithm is to be used; their web page is
 | 
			
		||||
 Japan, Netherlands, Spain, Sweden, Switzerland, UK and the USA.  They should
 | 
			
		||||
 be contacted if that algorithm is to be used, their web page is
 | 
			
		||||
 http://www.ascom.ch/.
 | 
			
		||||
 | 
			
		||||
 The MDC2 algorithm is patented by IBM.
 | 
			
		||||
 | 
			
		||||
 NTT and Mitsubishi have patents and pending patents on the Camellia
 | 
			
		||||
 algorithm, but allow use at no charge without requiring an explicit
 | 
			
		||||
 licensing agreement: http://info.isl.ntt.co.jp/crypt/eng/info/chiteki.html
 | 
			
		||||
 | 
			
		||||
 INSTALLATION
 | 
			
		||||
 ------------
 | 
			
		||||
 | 
			
		||||
@@ -131,16 +118,12 @@
 | 
			
		||||
 a Win32 platform, read the INSTALL.W32 file.  For OpenVMS systems, read
 | 
			
		||||
 INSTALL.VMS.
 | 
			
		||||
 | 
			
		||||
 For people in the USA, it is possible to compile OpenSSL to use RSA Inc.'s
 | 
			
		||||
 public key library, RSAREF, by configuring OpenSSL with the option "rsaref".
 | 
			
		||||
 | 
			
		||||
 Read the documentation in the doc/ directory.  It is quite rough, but it
 | 
			
		||||
 lists the functions; you will probably have to look at the code to work out
 | 
			
		||||
 how to use them. Look at the example programs.
 | 
			
		||||
 | 
			
		||||
 PROBLEMS
 | 
			
		||||
 --------
 | 
			
		||||
 | 
			
		||||
 For some platforms, there are some known problems that may affect the user
 | 
			
		||||
 or application author.  We try to collect those in doc/PROBLEMS, with current
 | 
			
		||||
 thoughts on how they should be solved in a future of OpenSSL.
 | 
			
		||||
 lists the functions, you will probably have to look at the code to work out
 | 
			
		||||
 how to used them. Look at the example programs.
 | 
			
		||||
 | 
			
		||||
 SUPPORT 
 | 
			
		||||
 -------
 | 
			
		||||
@@ -166,13 +149,11 @@
 | 
			
		||||
    - Problem Description (steps that will reproduce the problem, if known)
 | 
			
		||||
    - Stack Traceback (if the application dumps core)
 | 
			
		||||
 | 
			
		||||
 Report the bug to the OpenSSL project via the Request Tracker
 | 
			
		||||
 (http://www.openssl.org/support/rt2.html) by mail to:
 | 
			
		||||
 Report the bug to the OpenSSL project at:
 | 
			
		||||
 | 
			
		||||
    openssl-bugs@openssl.org
 | 
			
		||||
 | 
			
		||||
 Note that mail to openssl-bugs@openssl.org is recorded in the publicly
 | 
			
		||||
 readable request tracker database and is forwarded to a public
 | 
			
		||||
 Note that mail to openssl-bugs@openssl.org is forwarded to a public
 | 
			
		||||
 mailing list. Confidential mail may be sent to openssl-security@openssl.org
 | 
			
		||||
 (PGP key available from the key servers).
 | 
			
		||||
 | 
			
		||||
@@ -185,23 +166,11 @@
 | 
			
		||||
 the string "[PATCH]" in the subject. Please be sure to include a
 | 
			
		||||
 textual explanation of what your patch does.
 | 
			
		||||
 | 
			
		||||
 Note: For legal reasons, contributions from the US can be accepted only
 | 
			
		||||
 if a TSU notification and a copy of the patch are sent to crypt@bis.doc.gov
 | 
			
		||||
 (formerly BXA) with a copy to the ENC Encryption Request Coordinator;
 | 
			
		||||
 please take some time to look at
 | 
			
		||||
    http://www.bis.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html [sic]
 | 
			
		||||
 and
 | 
			
		||||
    http://w3.access.gpo.gov/bis/ear/pdf/740.pdf (EAR Section 740.13(e))
 | 
			
		||||
 for the details. If "your encryption source code is too large to serve as
 | 
			
		||||
 an email attachment", they are glad to receive it by fax instead; hope you
 | 
			
		||||
 have a cheap long-distance plan.
 | 
			
		||||
 | 
			
		||||
 Our preferred format for changes is "diff -u" output. You might
 | 
			
		||||
 The preferred format for changes is "diff -u" output. You might
 | 
			
		||||
 generate it like this:
 | 
			
		||||
 | 
			
		||||
 # cd openssl-work
 | 
			
		||||
 # [your changes]
 | 
			
		||||
 # ./Configure dist; make clean
 | 
			
		||||
 # cd ..
 | 
			
		||||
 # diff -ur openssl-orig openssl-work > mydiffs.patch
 | 
			
		||||
 | 
			
		||||
 # diff -urN openssl-orig openssl-work > mydiffs.patch
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										187
									
								
								README.ASN1
									
									
									
									
									
								
							
							
						
						
									
										187
									
								
								README.ASN1
									
									
									
									
									
								
							@@ -1,187 +0,0 @@
 | 
			
		||||
 | 
			
		||||
OpenSSL ASN1 Revision
 | 
			
		||||
=====================
 | 
			
		||||
 | 
			
		||||
This document describes some of the issues relating to the new ASN1 code.
 | 
			
		||||
 | 
			
		||||
Previous OpenSSL ASN1 problems
 | 
			
		||||
=============================
 | 
			
		||||
 | 
			
		||||
OK why did the OpenSSL ASN1 code need revising in the first place? Well
 | 
			
		||||
there are lots of reasons some of which are included below...
 | 
			
		||||
 | 
			
		||||
1. The code is difficult to read and write. For every single ASN1 structure
 | 
			
		||||
(e.g. SEQUENCE) four functions need to be written for new, free, encode and
 | 
			
		||||
decode operations. This is a very painful and error prone operation. Very few
 | 
			
		||||
people have ever written any OpenSSL ASN1 and those that have usually wish
 | 
			
		||||
they hadn't.
 | 
			
		||||
 | 
			
		||||
2. Partly because of 1. the code is bloated and takes up a disproportionate
 | 
			
		||||
amount of space. The SEQUENCE encoder is particularly bad: it essentially
 | 
			
		||||
contains two copies of the same operation, one to compute the SEQUENCE length
 | 
			
		||||
and the other to encode it.
 | 
			
		||||
 | 
			
		||||
3. The code is memory based: that is it expects to be able to read the whole
 | 
			
		||||
structure from memory. This is fine for small structures but if you have a
 | 
			
		||||
(say) 1Gb PKCS#7 signedData structure it isn't such a good idea...
 | 
			
		||||
 | 
			
		||||
4. The code for the ASN1 IMPLICIT tag is evil. It is handled by temporarily
 | 
			
		||||
changing the tag to the expected one, attempting to read it, then changing it
 | 
			
		||||
back again. This means that decode buffers have to be writable even though they
 | 
			
		||||
are ultimately unchanged. This gets in the way of constification.
 | 
			
		||||
 | 
			
		||||
5. The handling of EXPLICIT isn't much better. It adds a chunk of code into 
 | 
			
		||||
the decoder and encoder for every EXPLICIT tag.
 | 
			
		||||
 | 
			
		||||
6. APPLICATION and PRIVATE tags aren't even supported at all.
 | 
			
		||||
 | 
			
		||||
7. Even IMPLICIT isn't complete: there is no support for implicitly tagged
 | 
			
		||||
types that are not OPTIONAL.
 | 
			
		||||
 | 
			
		||||
8. Much of the code assumes that a tag will fit in a single octet. This is
 | 
			
		||||
only true if the tag is 30 or less (mercifully tags over 30 are rare).
 | 
			
		||||
 | 
			
		||||
9. The ASN1 CHOICE type has to be largely handled manually, there aren't any
 | 
			
		||||
macros that properly support it.
 | 
			
		||||
 | 
			
		||||
10. Encoders have no concept of OPTIONAL and have no error checking. If the
 | 
			
		||||
passed structure contains a NULL in a mandatory field it will not be encoded,
 | 
			
		||||
resulting in an invalid structure.
 | 
			
		||||
 | 
			
		||||
11. It is tricky to add ASN1 encoders and decoders to external applications.
 | 
			
		||||
 | 
			
		||||
Template model
 | 
			
		||||
==============
 | 
			
		||||
 | 
			
		||||
One of the major problems with revision is the sheer volume of the ASN1 code.
 | 
			
		||||
Attempts to change (for example) the IMPLICIT behaviour would result in a
 | 
			
		||||
modification of *every* single decode function. 
 | 
			
		||||
 | 
			
		||||
I decided to adopt a template based approach. I'm using the term 'template'
 | 
			
		||||
in a manner similar to SNACC templates: it has nothing to do with C++
 | 
			
		||||
templates.
 | 
			
		||||
 | 
			
		||||
A template is a description of an ASN1 module as several constant C structures.
 | 
			
		||||
It describes in a machine readable way exactly how the ASN1 structure should
 | 
			
		||||
behave. If this template contains enough detail then it is possible to write
 | 
			
		||||
versions of new, free, encode, decode (and possibly others operations) that
 | 
			
		||||
operate on templates.
 | 
			
		||||
 | 
			
		||||
Instead of having to write code to handle each operation only a single
 | 
			
		||||
template needs to be written. If new operations are needed (such as a 'print'
 | 
			
		||||
operation) only a single new template based function needs to be written 
 | 
			
		||||
which will then automatically handle all existing templates.
 | 
			
		||||
 | 
			
		||||
Plans for revision
 | 
			
		||||
==================
 | 
			
		||||
 | 
			
		||||
The revision will consist of the following steps. Other than the first two
 | 
			
		||||
these can be handled in any order.
 | 
			
		||||
 
 | 
			
		||||
o Design and write template new, free, encode and decode operations, initially
 | 
			
		||||
memory based. *DONE*
 | 
			
		||||
 | 
			
		||||
o Convert existing ASN1 code to template form. *IN PROGRESS*
 | 
			
		||||
 | 
			
		||||
o Convert an existing ASN1 compiler (probably SNACC) to output templates
 | 
			
		||||
in OpenSSL form.
 | 
			
		||||
 | 
			
		||||
o Add support for BIO based ASN1 encoders and decoders to handle large
 | 
			
		||||
structures, initially blocking I/O.
 | 
			
		||||
 | 
			
		||||
o Add support for non blocking I/O: this is quite a bit harder than blocking
 | 
			
		||||
I/O.
 | 
			
		||||
 | 
			
		||||
o Add new ASN1 structures, such as OCSP, CRMF, S/MIME v3 (CMS), attribute
 | 
			
		||||
certificates etc etc.
 | 
			
		||||
 | 
			
		||||
Description of major changes
 | 
			
		||||
============================
 | 
			
		||||
 | 
			
		||||
The BOOLEAN type now takes three values. 0xff is TRUE, 0 is FALSE and -1 is
 | 
			
		||||
absent. The meaning of absent depends on the context. If for example the
 | 
			
		||||
boolean type is DEFAULT FALSE (as in the case of the critical flag for
 | 
			
		||||
certificate extensions) then -1 is FALSE, if DEFAULT TRUE then -1 is TRUE.
 | 
			
		||||
Usually the value will only ever be read via an API which will hide this from
 | 
			
		||||
an application.
 | 
			
		||||
 | 
			
		||||
There is an evil bug in the old ASN1 code that mishandles OPTIONAL with
 | 
			
		||||
SEQUENCE OF or SET OF. These are both implemented as a STACK structure. The
 | 
			
		||||
old code would omit the structure if the STACK was NULL (which is fine) or if
 | 
			
		||||
it had zero elements (which is NOT OK). This causes problems because an empty
 | 
			
		||||
SEQUENCE OF or SET OF will result in an empty STACK when it is decoded but when
 | 
			
		||||
it is encoded it will be omitted resulting in different encodings. The new code
 | 
			
		||||
only omits the encoding if the STACK is NULL, if it contains zero elements it
 | 
			
		||||
is encoded and empty. There is an additional problem though: because an empty
 | 
			
		||||
STACK was omitted, sometimes the corresponding *_new() function would
 | 
			
		||||
initialize the STACK to empty so an application could immediately use it, if
 | 
			
		||||
this is done with the new code (i.e. a NULL) it wont work. Therefore a new
 | 
			
		||||
STACK should be allocated first. One instance of this is the X509_CRL list of
 | 
			
		||||
revoked certificates: a helper function X509_CRL_add0_revoked() has been added
 | 
			
		||||
for this purpose.
 | 
			
		||||
 | 
			
		||||
The X509_ATTRIBUTE structure used to have an element called 'set' which took
 | 
			
		||||
the value 1 if the attribute value was a SET OF or 0 if it was a single. Due
 | 
			
		||||
to the behaviour of CHOICE in the new code this has been changed to a field
 | 
			
		||||
called 'single' which is 0 for a SET OF and 1 for single. The old field has
 | 
			
		||||
been deleted to deliberately break source compatibility. Since this structure
 | 
			
		||||
is normally accessed via higher level functions this shouldn't break too much.
 | 
			
		||||
 | 
			
		||||
The X509_REQ_INFO certificate request info structure no longer has a field
 | 
			
		||||
called 'req_kludge'. This used to be set to 1 if the attributes field was
 | 
			
		||||
(incorrectly) omitted. You can check to see if the field is omitted now by
 | 
			
		||||
checking if the attributes field is NULL. Similarly if you need to omit
 | 
			
		||||
the field then free attributes and set it to NULL.
 | 
			
		||||
 | 
			
		||||
The top level 'detached' field in the PKCS7 structure is no longer set when
 | 
			
		||||
a PKCS#7 structure is read in. PKCS7_is_detached() should be called instead.
 | 
			
		||||
The behaviour of PKCS7_get_detached() is unaffected.
 | 
			
		||||
 | 
			
		||||
The values of 'type' in the GENERAL_NAME structure have changed. This is
 | 
			
		||||
because the old code use the ASN1 initial octet as the selector. The new
 | 
			
		||||
code uses the index in the ASN1_CHOICE template.
 | 
			
		||||
 | 
			
		||||
The DIST_POINT_NAME structure has changed to be a true CHOICE type.
 | 
			
		||||
 | 
			
		||||
typedef struct DIST_POINT_NAME_st {
 | 
			
		||||
int type;
 | 
			
		||||
union {
 | 
			
		||||
	STACK_OF(GENERAL_NAME) *fullname;
 | 
			
		||||
	STACK_OF(X509_NAME_ENTRY) *relativename;
 | 
			
		||||
} name;
 | 
			
		||||
} DIST_POINT_NAME;
 | 
			
		||||
 | 
			
		||||
This means that name.fullname or name.relativename should be set
 | 
			
		||||
and type reflects the option. That is if name.fullname is set then
 | 
			
		||||
type is 0 and if name.relativename is set type is 1.
 | 
			
		||||
 | 
			
		||||
With the old code using the i2d functions would typically involve:
 | 
			
		||||
 | 
			
		||||
unsigned char *buf, *p;
 | 
			
		||||
int len;
 | 
			
		||||
/* Find length of encoding */
 | 
			
		||||
len = i2d_SOMETHING(x, NULL);
 | 
			
		||||
/* Allocate buffer */
 | 
			
		||||
buf = OPENSSL_malloc(len);
 | 
			
		||||
if(buf == NULL) {
 | 
			
		||||
	/* Malloc error */
 | 
			
		||||
}
 | 
			
		||||
/* Use temp variable because &p gets updated to point to end of
 | 
			
		||||
 * encoding.
 | 
			
		||||
 */
 | 
			
		||||
p = buf;
 | 
			
		||||
i2d_SOMETHING(x, &p);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Using the new i2d you can also do:
 | 
			
		||||
 | 
			
		||||
unsigned char *buf = NULL;
 | 
			
		||||
int len;
 | 
			
		||||
len = i2d_SOMETHING(x, &buf);
 | 
			
		||||
if(len < 0) {
 | 
			
		||||
	/* Malloc error */
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
and it will automatically allocate and populate a buffer with the
 | 
			
		||||
encoding. After this call 'buf' will point to the start of the
 | 
			
		||||
encoding which is len bytes long.
 | 
			
		||||
							
								
								
									
										289
									
								
								README.ENGINE
									
									
									
									
									
								
							
							
						
						
									
										289
									
								
								README.ENGINE
									
									
									
									
									
								
							@@ -1,289 +0,0 @@
 | 
			
		||||
  ENGINE
 | 
			
		||||
  ======
 | 
			
		||||
 | 
			
		||||
  With OpenSSL 0.9.6, a new component was added to support alternative
 | 
			
		||||
  cryptography implementations, most commonly for interfacing with external
 | 
			
		||||
  crypto devices (eg. accelerator cards). This component is called ENGINE,
 | 
			
		||||
  and its presence in OpenSSL 0.9.6 (and subsequent bug-fix releases)
 | 
			
		||||
  caused a little confusion as 0.9.6** releases were rolled in two
 | 
			
		||||
  versions, a "standard" and an "engine" version. In development for 0.9.7,
 | 
			
		||||
  the ENGINE code has been merged into the main branch and will be present
 | 
			
		||||
  in the standard releases from 0.9.7 forwards.
 | 
			
		||||
 | 
			
		||||
  There are currently built-in ENGINE implementations for the following
 | 
			
		||||
  crypto devices:
 | 
			
		||||
 | 
			
		||||
      o CryptoSwift
 | 
			
		||||
      o Compaq Atalla
 | 
			
		||||
      o nCipher CHIL
 | 
			
		||||
      o Nuron
 | 
			
		||||
      o Broadcom uBSec
 | 
			
		||||
 | 
			
		||||
  In addition, dynamic binding to external ENGINE implementations is now
 | 
			
		||||
  provided by a special ENGINE called "dynamic". See the "DYNAMIC ENGINE"
 | 
			
		||||
  section below for details.
 | 
			
		||||
 | 
			
		||||
  At this stage, a number of things are still needed and are being worked on:
 | 
			
		||||
 | 
			
		||||
      1 Integration of EVP support.
 | 
			
		||||
      2 Configuration support.
 | 
			
		||||
      3 Documentation!
 | 
			
		||||
 | 
			
		||||
1 With respect to EVP, this relates to support for ciphers and digests in
 | 
			
		||||
  the ENGINE model so that alternative implementations of existing
 | 
			
		||||
  algorithms/modes (or previously unimplemented ones) can be provided by
 | 
			
		||||
  ENGINE implementations.
 | 
			
		||||
 | 
			
		||||
2 Configuration support currently exists in the ENGINE API itself, in the
 | 
			
		||||
  form of "control commands". These allow an application to expose to the
 | 
			
		||||
  user/admin the set of commands and parameter types a given ENGINE
 | 
			
		||||
  implementation supports, and for an application to directly feed string
 | 
			
		||||
  based input to those ENGINEs, in the form of name-value pairs. This is an
 | 
			
		||||
  extensible way for ENGINEs to define their own "configuration" mechanisms
 | 
			
		||||
  that are specific to a given ENGINE (eg. for a particular hardware
 | 
			
		||||
  device) but that should be consistent across *all* OpenSSL-based
 | 
			
		||||
  applications when they use that ENGINE. Work is in progress (or at least
 | 
			
		||||
  in planning) for supporting these control commands from the CONF (or
 | 
			
		||||
  NCONF) code so that applications using OpenSSL's existing configuration
 | 
			
		||||
  file format can have ENGINE settings specified in much the same way.
 | 
			
		||||
  Presently however, applications must use the ENGINE API itself to provide
 | 
			
		||||
  such functionality. To see first hand the types of commands available
 | 
			
		||||
  with the various compiled-in ENGINEs (see further down for dynamic
 | 
			
		||||
  ENGINEs), use the "engine" openssl utility with full verbosity, ie;
 | 
			
		||||
       openssl engine -vvvv
 | 
			
		||||
 | 
			
		||||
3 Documentation? Volunteers welcome! The source code is reasonably well
 | 
			
		||||
  self-documenting, but some summaries and usage instructions are needed -
 | 
			
		||||
  moreover, they are needed in the same POD format the existing OpenSSL
 | 
			
		||||
  documentation is provided in. Any complete or incomplete contributions
 | 
			
		||||
  would help make this happen.
 | 
			
		||||
 | 
			
		||||
  STABILITY & BUG-REPORTS
 | 
			
		||||
  =======================
 | 
			
		||||
 | 
			
		||||
  What already exists is fairly stable as far as it has been tested, but
 | 
			
		||||
  the test base has been a bit small most of the time. For the most part,
 | 
			
		||||
  the vendors of the devices these ENGINEs support have contributed to the
 | 
			
		||||
  development and/or testing of the implementations, and *usually* (with no
 | 
			
		||||
  guarantees) have experience in using the ENGINE support to drive their
 | 
			
		||||
  devices from common OpenSSL-based applications. Bugs and/or inexplicable
 | 
			
		||||
  behaviour in using a specific ENGINE implementation should be sent to the
 | 
			
		||||
  author of that implementation (if it is mentioned in the corresponding C
 | 
			
		||||
  file), and in the case of implementations for commercial hardware
 | 
			
		||||
  devices, also through whatever vendor support channels are available.  If
 | 
			
		||||
  none of this is possible, or the problem seems to be something about the
 | 
			
		||||
  ENGINE API itself (ie. not necessarily specific to a particular ENGINE
 | 
			
		||||
  implementation) then you should mail complete details to the relevant
 | 
			
		||||
  OpenSSL mailing list. For a definition of "complete details", refer to
 | 
			
		||||
  the OpenSSL "README" file. As for which list to send it to;
 | 
			
		||||
 | 
			
		||||
     openssl-users: if you are *using* the ENGINE abstraction, either in an
 | 
			
		||||
          pre-compiled application or in your own application code.
 | 
			
		||||
 | 
			
		||||
     openssl-dev: if you are discussing problems with OpenSSL source code.
 | 
			
		||||
 | 
			
		||||
  USAGE
 | 
			
		||||
  =====
 | 
			
		||||
 | 
			
		||||
  The default "openssl" ENGINE is always chosen when performing crypto
 | 
			
		||||
  operations unless you specify otherwise. You must actively tell the
 | 
			
		||||
  openssl utility commands to use anything else through a new command line
 | 
			
		||||
  switch called "-engine". Also, if you want to use the ENGINE support in
 | 
			
		||||
  your own code to do something similar, you must likewise explicitly
 | 
			
		||||
  select the ENGINE implementation you want.
 | 
			
		||||
 | 
			
		||||
  Depending on the type of hardware, system, and configuration, "settings"
 | 
			
		||||
  may need to be applied to an ENGINE for it to function as expected/hoped.
 | 
			
		||||
  The recommended way of doing this is for the application to support
 | 
			
		||||
  ENGINE "control commands" so that each ENGINE implementation can provide
 | 
			
		||||
  whatever configuration primitives it might require and the application
 | 
			
		||||
  can allow the user/admin (and thus the hardware vendor's support desk
 | 
			
		||||
  also) to provide any such input directly to the ENGINE implementation.
 | 
			
		||||
  This way, applications do not need to know anything specific to any
 | 
			
		||||
  device, they only need to provide the means to carry such user/admin
 | 
			
		||||
  input through to the ENGINE in question. Ie. this connects *you* (and
 | 
			
		||||
  your helpdesk) to the specific ENGINE implementation (and device), and
 | 
			
		||||
  allows application authors to not get buried in hassle supporting
 | 
			
		||||
  arbitrary devices they know (and care) nothing about.
 | 
			
		||||
 | 
			
		||||
  A new "openssl" utility, "openssl engine", has been added in that allows
 | 
			
		||||
  for testing and examination of ENGINE implementations. Basic usage
 | 
			
		||||
  instructions are available by specifying the "-?" command line switch.
 | 
			
		||||
 | 
			
		||||
  DYNAMIC ENGINES
 | 
			
		||||
  ===============
 | 
			
		||||
 | 
			
		||||
  The new "dynamic" ENGINE provides a low-overhead way to support ENGINE
 | 
			
		||||
  implementations that aren't pre-compiled and linked into OpenSSL-based
 | 
			
		||||
  applications. This could be because existing compiled-in implementations
 | 
			
		||||
  have known problems and you wish to use a newer version with an existing
 | 
			
		||||
  application. It could equally be because the application (or OpenSSL
 | 
			
		||||
  library) you are using simply doesn't have support for the ENGINE you
 | 
			
		||||
  wish to use, and the ENGINE provider (eg. hardware vendor) is providing
 | 
			
		||||
  you with a self-contained implementation in the form of a shared-library.
 | 
			
		||||
  The other use-case for "dynamic" is with applications that wish to
 | 
			
		||||
  maintain the smallest foot-print possible and so do not link in various
 | 
			
		||||
  ENGINE implementations from OpenSSL, but instead leaves you to provide
 | 
			
		||||
  them, if you want them, in the form of "dynamic"-loadable
 | 
			
		||||
  shared-libraries. It should be possible for hardware vendors to provide
 | 
			
		||||
  their own shared-libraries to support arbitrary hardware to work with
 | 
			
		||||
  applications based on OpenSSL 0.9.7 or later. If you're using an
 | 
			
		||||
  application based on 0.9.7 (or later) and the support you desire is only
 | 
			
		||||
  announced for versions later than the one you need, ask the vendor to
 | 
			
		||||
  backport their ENGINE to the version you need.
 | 
			
		||||
 | 
			
		||||
  How does "dynamic" work?
 | 
			
		||||
  ------------------------
 | 
			
		||||
    The dynamic ENGINE has a special flag in its implementation such that
 | 
			
		||||
    every time application code asks for the 'dynamic' ENGINE, it in fact
 | 
			
		||||
    gets its own copy of it. As such, multi-threaded code (or code that
 | 
			
		||||
    multiplexes multiple uses of 'dynamic' in a single application in any
 | 
			
		||||
    way at all) does not get confused by 'dynamic' being used to do many
 | 
			
		||||
    independent things. Other ENGINEs typically don't do this so there is
 | 
			
		||||
    only ever 1 ENGINE structure of its type (and reference counts are used
 | 
			
		||||
    to keep order). The dynamic ENGINE itself provides absolutely no
 | 
			
		||||
    cryptographic functionality, and any attempt to "initialise" the ENGINE
 | 
			
		||||
    automatically fails. All it does provide are a few "control commands"
 | 
			
		||||
    that can be used to control how it will load an external ENGINE
 | 
			
		||||
    implementation from a shared-library. To see these control commands,
 | 
			
		||||
    use the command-line;
 | 
			
		||||
 | 
			
		||||
       openssl engine -vvvv dynamic
 | 
			
		||||
 | 
			
		||||
    The "SO_PATH" control command should be used to identify the
 | 
			
		||||
    shared-library that contains the ENGINE implementation, and "NO_VCHECK"
 | 
			
		||||
    might possibly be useful if there is a minor version conflict and you
 | 
			
		||||
    (or a vendor helpdesk) is convinced you can safely ignore it.
 | 
			
		||||
    "ID" is probably only needed if a shared-library implements
 | 
			
		||||
    multiple ENGINEs, but if you know the engine id you expect to be using,
 | 
			
		||||
    it doesn't hurt to specify it (and this provides a sanity check if
 | 
			
		||||
    nothing else). "LIST_ADD" is only required if you actually wish the
 | 
			
		||||
    loaded ENGINE to be discoverable by application code later on using the
 | 
			
		||||
    ENGINE's "id". For most applications, this isn't necessary - but some
 | 
			
		||||
    application authors may have nifty reasons for using it. The "LOAD"
 | 
			
		||||
    command is the only one that takes no parameters and is the command
 | 
			
		||||
    that uses the settings from any previous commands to actually *load*
 | 
			
		||||
    the shared-library ENGINE implementation. If this command succeeds, the
 | 
			
		||||
    (copy of the) 'dynamic' ENGINE will magically morph into the ENGINE
 | 
			
		||||
    that has been loaded from the shared-library. As such, any control
 | 
			
		||||
    commands supported by the loaded ENGINE could then be executed as per
 | 
			
		||||
    normal. Eg. if ENGINE "foo" is implemented in the shared-library
 | 
			
		||||
    "libfoo.so" and it supports some special control command "CMD_FOO", the
 | 
			
		||||
    following code would load and use it (NB: obviously this code has no
 | 
			
		||||
    error checking);
 | 
			
		||||
 | 
			
		||||
       ENGINE *e = ENGINE_by_id("dynamic");
 | 
			
		||||
       ENGINE_ctrl_cmd_string(e, "SO_PATH", "/lib/libfoo.so", 0);
 | 
			
		||||
       ENGINE_ctrl_cmd_string(e, "ID", "foo", 0);
 | 
			
		||||
       ENGINE_ctrl_cmd_string(e, "LOAD", NULL, 0);
 | 
			
		||||
       ENGINE_ctrl_cmd_string(e, "CMD_FOO", "some input data", 0);
 | 
			
		||||
 | 
			
		||||
    For testing, the "openssl engine" utility can be useful for this sort
 | 
			
		||||
    of thing. For example the above code excerpt would achieve much the
 | 
			
		||||
    same result as;
 | 
			
		||||
 | 
			
		||||
       openssl engine dynamic \
 | 
			
		||||
                 -pre SO_PATH:/lib/libfoo.so \
 | 
			
		||||
                 -pre ID:foo \
 | 
			
		||||
                 -pre LOAD \
 | 
			
		||||
                 -pre "CMD_FOO:some input data"
 | 
			
		||||
 | 
			
		||||
    Or to simply see the list of commands supported by the "foo" ENGINE;
 | 
			
		||||
 | 
			
		||||
       openssl engine -vvvv dynamic \
 | 
			
		||||
                 -pre SO_PATH:/lib/libfoo.so \
 | 
			
		||||
                 -pre ID:foo \
 | 
			
		||||
                 -pre LOAD
 | 
			
		||||
 | 
			
		||||
    Applications that support the ENGINE API and more specifically, the
 | 
			
		||||
    "control commands" mechanism, will provide some way for you to pass
 | 
			
		||||
    such commands through to ENGINEs. As such, you would select "dynamic"
 | 
			
		||||
    as the ENGINE to use, and the parameters/commands you pass would
 | 
			
		||||
    control the *actual* ENGINE used. Each command is actually a name-value
 | 
			
		||||
    pair and the value can sometimes be omitted (eg. the "LOAD" command).
 | 
			
		||||
    Whilst the syntax demonstrated in "openssl engine" uses a colon to
 | 
			
		||||
    separate the command name from the value, applications may provide
 | 
			
		||||
    their own syntax for making that separation (eg. a win32 registry
 | 
			
		||||
    key-value pair may be used by some applications). The reason for the
 | 
			
		||||
    "-pre" syntax in the "openssl engine" utility is that some commands
 | 
			
		||||
    might be issued to an ENGINE *after* it has been initialised for use.
 | 
			
		||||
    Eg. if an ENGINE implementation requires a smart-card to be inserted
 | 
			
		||||
    during initialisation (or a PIN to be typed, or whatever), there may be
 | 
			
		||||
    a control command you can issue afterwards to "forget" the smart-card
 | 
			
		||||
    so that additional initialisation is no longer possible. In
 | 
			
		||||
    applications such as web-servers, where potentially volatile code may
 | 
			
		||||
    run on the same host system, this may provide some arguable security
 | 
			
		||||
    value. In such a case, the command would be passed to the ENGINE after
 | 
			
		||||
    it has been initialised for use, and so the "-post" switch would be
 | 
			
		||||
    used instead. Applications may provide a different syntax for
 | 
			
		||||
    supporting this distinction, and some may simply not provide it at all
 | 
			
		||||
    ("-pre" is almost always what you're after, in reality).
 | 
			
		||||
 | 
			
		||||
  How do I build a "dynamic" ENGINE?
 | 
			
		||||
  ----------------------------------
 | 
			
		||||
    This question is trickier - currently OpenSSL bundles various ENGINE
 | 
			
		||||
    implementations that are statically built in, and any application that
 | 
			
		||||
    calls the "ENGINE_load_builtin_engines()" function will automatically
 | 
			
		||||
    have all such ENGINEs available (and occupying memory). Applications
 | 
			
		||||
    that don't call that function have no ENGINEs available like that and
 | 
			
		||||
    would have to use "dynamic" to load any such ENGINE - but on the other
 | 
			
		||||
    hand such applications would only have the memory footprint of any
 | 
			
		||||
    ENGINEs explicitly loaded using user/admin provided control commands.
 | 
			
		||||
    The main advantage of not statically linking ENGINEs and only using
 | 
			
		||||
    "dynamic" for hardware support is that any installation using no
 | 
			
		||||
    "external" ENGINE suffers no unnecessary memory footprint from unused
 | 
			
		||||
    ENGINEs. Likewise, installations that do require an ENGINE incur the
 | 
			
		||||
    overheads from only *that* ENGINE once it has been loaded.
 | 
			
		||||
 | 
			
		||||
    Sounds good? Maybe, but currently building an ENGINE implementation as
 | 
			
		||||
    a shared-library that can be loaded by "dynamic" isn't automated in
 | 
			
		||||
    OpenSSL's build process. It can be done manually quite easily however.
 | 
			
		||||
    Such a shared-library can either be built with any OpenSSL code it
 | 
			
		||||
    needs statically linked in, or it can link dynamically against OpenSSL
 | 
			
		||||
    if OpenSSL itself is built as a shared library. The instructions are
 | 
			
		||||
    the same in each case, but in the former (statically linked any
 | 
			
		||||
    dependencies on OpenSSL) you must ensure OpenSSL is built with
 | 
			
		||||
    position-independent code ("PIC"). The default OpenSSL compilation may
 | 
			
		||||
    already specify the relevant flags to do this, but you should consult
 | 
			
		||||
    with your compiler documentation if you are in any doubt.
 | 
			
		||||
 | 
			
		||||
    This example will show building the "atalla" ENGINE in the
 | 
			
		||||
    crypto/engine/ directory as a shared-library for use via the "dynamic"
 | 
			
		||||
    ENGINE.
 | 
			
		||||
    1) "cd" to the crypto/engine/ directory of a pre-compiled OpenSSL
 | 
			
		||||
       source tree.
 | 
			
		||||
    2) Recompile at least one source file so you can see all the compiler
 | 
			
		||||
       flags (and syntax) being used to build normally. Eg;
 | 
			
		||||
           touch hw_atalla.c ; make
 | 
			
		||||
       will rebuild "hw_atalla.o" using all such flags.
 | 
			
		||||
    3) Manually enter the same compilation line to compile the
 | 
			
		||||
       "hw_atalla.c" file but with the following two changes;
 | 
			
		||||
         (a) add "-DENGINE_DYNAMIC_SUPPORT" to the command line switches,
 | 
			
		||||
	 (b) change the output file from "hw_atalla.o" to something new,
 | 
			
		||||
             eg. "tmp_atalla.o"
 | 
			
		||||
    4) Link "tmp_atalla.o" into a shared-library using the top-level
 | 
			
		||||
       OpenSSL libraries to resolve any dependencies. The syntax for doing
 | 
			
		||||
       this depends heavily on your system/compiler and is a nightmare
 | 
			
		||||
       known well to anyone who has worked with shared-library portability
 | 
			
		||||
       before. 'gcc' on Linux, for example, would use the following syntax;
 | 
			
		||||
          gcc -shared -o dyn_atalla.so tmp_atalla.o -L../.. -lcrypto
 | 
			
		||||
    5) Test your shared library using "openssl engine" as explained in the
 | 
			
		||||
       previous section. Eg. from the top-level directory, you might try;
 | 
			
		||||
          apps/openssl engine -vvvv dynamic \
 | 
			
		||||
              -pre SO_PATH:./crypto/engine/dyn_atalla.so -pre LOAD
 | 
			
		||||
       If the shared-library loads successfully, you will see both "-pre"
 | 
			
		||||
       commands marked as "SUCCESS" and the list of control commands
 | 
			
		||||
       displayed (because of "-vvvv") will be the control commands for the
 | 
			
		||||
       *atalla* ENGINE (ie. *not* the 'dynamic' ENGINE). You can also add
 | 
			
		||||
       the "-t" switch to the utility if you want it to try and initialise
 | 
			
		||||
       the atalla ENGINE for use to test any possible hardware/driver
 | 
			
		||||
       issues.
 | 
			
		||||
 | 
			
		||||
  PROBLEMS
 | 
			
		||||
  ========
 | 
			
		||||
 | 
			
		||||
  It seems like the ENGINE part doesn't work too well with CryptoSwift on Win32.
 | 
			
		||||
  A quick test done right before the release showed that trying "openssl speed
 | 
			
		||||
  -engine cswift" generated errors. If the DSO gets enabled, an attempt is made
 | 
			
		||||
  to write at memory address 0x00000002.
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										35
									
								
								README.FIPS
									
									
									
									
									
								
							
							
						
						
									
										35
									
								
								README.FIPS
									
									
									
									
									
								
							@@ -1,35 +0,0 @@
 | 
			
		||||
 | 
			
		||||
Brief instructions on using OpenSSL 0.9.8 FIPS test branch.
 | 
			
		||||
 | 
			
		||||
To avoid any confusion that this might generate a validate library just
 | 
			
		||||
supplying "fips" on the command line wont work. Additional options are
 | 
			
		||||
needed...
 | 
			
		||||
 | 
			
		||||
To build fipscanister and produce a usable distribution the configuration
 | 
			
		||||
option "fipscanisterbuild" is used to either the config or Configure scripts.
 | 
			
		||||
For example:
 | 
			
		||||
 | 
			
		||||
./config fipscanisterbuild
 | 
			
		||||
 | 
			
		||||
This builds static libraries in a way similar to the FIPS 1.1.1 distro.
 | 
			
		||||
 | 
			
		||||
To build the shared library fipscanister version use the configuration
 | 
			
		||||
options "fipsdso".
 | 
			
		||||
 | 
			
		||||
Note that the fipscanister.o file is totally incompatible with the version
 | 
			
		||||
produced by the FIPS 1.1.1 distribution and cannot be made to work with
 | 
			
		||||
it.
 | 
			
		||||
 | 
			
		||||
Both options should also work under Windows and VC++. With this version the
 | 
			
		||||
use of MinGW is unnecessary and the normal VC++ build procedure can be
 | 
			
		||||
followed *except* the GNU linker "ld.exe" (for example from MinGW) must be
 | 
			
		||||
accessible somewhere on the PATH. For example:
 | 
			
		||||
 | 
			
		||||
perl Configure VC-WIN32 fipsdso
 | 
			
		||||
ms\do_masm
 | 
			
		||||
nmake -f ms\ntdll.mak
 | 
			
		||||
 | 
			
		||||
Note that any warnings from a Windows version of "tar" about being unable to
 | 
			
		||||
create symbolic links can be ignored.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										128
									
								
								STATUS
									
									
									
									
									
								
							
							
						
						
									
										128
									
								
								STATUS
									
									
									
									
									
								
							@@ -1,91 +1,43 @@
 | 
			
		||||
 | 
			
		||||
  OpenSSL STATUS                           Last modified at
 | 
			
		||||
  ______________                           $Date: 2007/02/23 12:12:27 $
 | 
			
		||||
  ______________                           $Date: 2000/02/28 11:59:02 $
 | 
			
		||||
 | 
			
		||||
  DEVELOPMENT STATE
 | 
			
		||||
 | 
			
		||||
    o  OpenSSL 0.9.9:  Under development...
 | 
			
		||||
    o  OpenSSL 0.9.8e: Released on February  23rd, 2007
 | 
			
		||||
    o  OpenSSL 0.9.8d: Released on September 28th, 2006
 | 
			
		||||
    o  OpenSSL 0.9.8c: Released on September  5th, 2006
 | 
			
		||||
    o  OpenSSL 0.9.8b: Released on May        4th, 2006
 | 
			
		||||
    o  OpenSSL 0.9.8a: Released on October   11th, 2005
 | 
			
		||||
    o  OpenSSL 0.9.8:  Released on July       5th, 2005
 | 
			
		||||
    o  OpenSSL 0.9.7m: Released on February  23rd, 2007
 | 
			
		||||
    o  OpenSSL 0.9.7l: Released on September 28th, 2006
 | 
			
		||||
    o  OpenSSL 0.9.7k: Released on September  5th, 2006
 | 
			
		||||
    o  OpenSSL 0.9.7j: Released on May        4th, 2006
 | 
			
		||||
    o  OpenSSL 0.9.7i: Released on October   14th, 2005
 | 
			
		||||
    o  OpenSSL 0.9.7h: Released on October   11th, 2005
 | 
			
		||||
    o  OpenSSL 0.9.7g: Released on April     11th, 2005
 | 
			
		||||
    o  OpenSSL 0.9.7f: Released on March     22nd, 2005
 | 
			
		||||
    o  OpenSSL 0.9.7e: Released on October   25th, 2004
 | 
			
		||||
    o  OpenSSL 0.9.7d: Released on March     17th, 2004
 | 
			
		||||
    o  OpenSSL 0.9.7c: Released on September 30th, 2003
 | 
			
		||||
    o  OpenSSL 0.9.7b: Released on April     10th, 2003
 | 
			
		||||
    o  OpenSSL 0.9.7a: Released on February  19th, 2003
 | 
			
		||||
    o  OpenSSL 0.9.7:  Released on December  31st, 2002
 | 
			
		||||
    o  OpenSSL 0.9.6m: Released on March     17th, 2004
 | 
			
		||||
    o  OpenSSL 0.9.6l: Released on November   4th, 2003
 | 
			
		||||
    o  OpenSSL 0.9.6k: Released on September 30th, 2003
 | 
			
		||||
    o  OpenSSL 0.9.6j: Released on April     10th, 2003
 | 
			
		||||
    o  OpenSSL 0.9.6i: Released on February  19th, 2003
 | 
			
		||||
    o  OpenSSL 0.9.6h: Released on December   5th, 2002
 | 
			
		||||
    o  OpenSSL 0.9.6g: Released on August     9th, 2002
 | 
			
		||||
    o  OpenSSL 0.9.6f: Released on August     8th, 2002
 | 
			
		||||
    o  OpenSSL 0.9.6e: Released on July      30th, 2002
 | 
			
		||||
    o  OpenSSL 0.9.6d: Released on May        9th, 2002
 | 
			
		||||
    o  OpenSSL 0.9.6c: Released on December  21st, 2001
 | 
			
		||||
    o  OpenSSL 0.9.6b: Released on July       9th, 2001
 | 
			
		||||
    o  OpenSSL 0.9.6a: Released on April      5th, 2001
 | 
			
		||||
    o  OpenSSL 0.9.6:  Released on September 24th, 2000
 | 
			
		||||
    o  OpenSSL 0.9.5a: Released on April      1st, 2000
 | 
			
		||||
    o  OpenSSL 0.9.5:  Released on February  28th, 2000
 | 
			
		||||
    o  OpenSSL 0.9.4:  Released on August    09th, 1999
 | 
			
		||||
    o  OpenSSL 0.9.3a: Released on May       29th, 1999
 | 
			
		||||
    o  OpenSSL 0.9.3:  Released on May       25th, 1999
 | 
			
		||||
    o  OpenSSL 0.9.2b: Released on March     22th, 1999
 | 
			
		||||
    o  OpenSSL 0.9.1c: Released on December  23th, 1998
 | 
			
		||||
 | 
			
		||||
  [See also http://www.openssl.org/support/rt2.html]
 | 
			
		||||
    o  OpenSSL 0.9.5:  Released on February 28th, 2000
 | 
			
		||||
    o  OpenSSL 0.9.4:  Released on August   09th, 1999
 | 
			
		||||
    o  OpenSSL 0.9.3a: Released on May      29th, 1999
 | 
			
		||||
    o  OpenSSL 0.9.3:  Released on May      25th, 1999
 | 
			
		||||
    o  OpenSSL 0.9.2b: Released on March    22th, 1999
 | 
			
		||||
    o  OpenSSL 0.9.1c: Released on December 23th, 1998
 | 
			
		||||
 | 
			
		||||
  RELEASE SHOWSTOPPERS
 | 
			
		||||
 | 
			
		||||
    o The Makefiles fail with some SysV makes.
 | 
			
		||||
    o 
 | 
			
		||||
 | 
			
		||||
  AVAILABLE PATCHES
 | 
			
		||||
 | 
			
		||||
    o 
 | 
			
		||||
    o shared libraries <behnke@trustcenter.de>
 | 
			
		||||
    o CA.pl patch (Damien Miller)
 | 
			
		||||
 | 
			
		||||
  IN PROGRESS
 | 
			
		||||
 | 
			
		||||
    o Steve is currently working on (in no particular order):
 | 
			
		||||
        ASN1 code redesign, butchery, replacement.
 | 
			
		||||
        OCSP
 | 
			
		||||
        EVP cipher enhancement.
 | 
			
		||||
        Enhanced certificate chain verification.
 | 
			
		||||
        Proper (or at least usable) certificate chain verification.
 | 
			
		||||
	Private key, certificate and CRL API and implementation.
 | 
			
		||||
	Developing and bugfixing PKCS#7 (S/MIME code).
 | 
			
		||||
        Various X509 issues: character sets, certificate request extensions.
 | 
			
		||||
    o Richard is currently working on:
 | 
			
		||||
	Constification
 | 
			
		||||
	Attribute Certificate support
 | 
			
		||||
	Certificate Pair support
 | 
			
		||||
	Storage Engines (primarly an LDAP storage engine)
 | 
			
		||||
	Certificate chain validation with full RFC 3280 compatibility
 | 
			
		||||
	Documentation for the openssl utility.
 | 
			
		||||
 | 
			
		||||
  NEEDS PATCH
 | 
			
		||||
 | 
			
		||||
    o  0.9.8-dev: COMPLEMENTOFALL and COMPLEMENTOFDEFAULT do not
 | 
			
		||||
       handle ECCdraft cipher suites correctly.
 | 
			
		||||
 | 
			
		||||
    o  apps/ca.c: "Sign the certificate?" - "n" creates empty certificate file
 | 
			
		||||
 | 
			
		||||
    o  "OpenSSL STATUS" is never up-to-date.
 | 
			
		||||
    o  non-blocking socket on AIX
 | 
			
		||||
    o  $(PERL) in */Makefile.ssl
 | 
			
		||||
    o  "Sign the certificate?" - "n" creates empty certificate file
 | 
			
		||||
 | 
			
		||||
  OPEN ISSUES
 | 
			
		||||
 | 
			
		||||
    o internal_verify doesn't know about X509.v3 (basicConstraints
 | 
			
		||||
      CA flag ...)
 | 
			
		||||
 | 
			
		||||
    o  The Makefile hierarchy and build mechanism is still not a round thing:
 | 
			
		||||
 | 
			
		||||
       1. The config vs. Configure scripts
 | 
			
		||||
@@ -110,20 +62,36 @@
 | 
			
		||||
                    which apparently is not flexible enough to generate
 | 
			
		||||
                    libcrypto)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    o  The perl/ stuff needs a major overhaul. Currently it's
 | 
			
		||||
       totally obsolete. Either we clean it up and enhance it to be up-to-date
 | 
			
		||||
       with the C code or we also could replace it with the really nice
 | 
			
		||||
       Net::SSLeay package we can find under
 | 
			
		||||
       http://www.neuronio.pt/SSLeay.pm.html.  Ralf uses this package for a
 | 
			
		||||
       longer time and it works fine and is a nice Perl module. Best would be
 | 
			
		||||
       to convince the author to work for the OpenSSL project and create a
 | 
			
		||||
       Net::OpenSSL or Crypt::OpenSSL package out of it and maintains it for
 | 
			
		||||
       us.
 | 
			
		||||
 | 
			
		||||
       Status: Ralf thinks we should both contact the author of Net::SSLeay
 | 
			
		||||
               and look how much effort it is to bring Eric's perl/ stuff up
 | 
			
		||||
               to date.
 | 
			
		||||
               Paul +1
 | 
			
		||||
 | 
			
		||||
    o The EVP and ASN1 stuff is a mess. Currently you have one EVP_CIPHER
 | 
			
		||||
      structure for each cipher. This may make sense for things like DES but
 | 
			
		||||
      for variable length ciphers like RC2 and RC4 it is NBG. Need a way to
 | 
			
		||||
      use the EVP interface and set up the cipher parameters. The ASN1 stuff
 | 
			
		||||
      is also foo wrt ciphers whose AlgorithmIdentifier has more than just
 | 
			
		||||
      an IV in it (e.g. RC2, RC5). This also means that EVP_Seal and EVP_Open
 | 
			
		||||
      don't work unless the key length matches the fixed value (some vendors
 | 
			
		||||
      use a key length decided by the size of the RSA encrypted key and expect
 | 
			
		||||
      RC2 to adapt).
 | 
			
		||||
 | 
			
		||||
    o ERR_error_string(..., buf) does not know how large buf is,
 | 
			
		||||
      there should be ERR_error_string_n(..., buf, bufsize)
 | 
			
		||||
      or similar.
 | 
			
		||||
 | 
			
		||||
  WISHES
 | 
			
		||||
 | 
			
		||||
    o  Add variants of DH_generate_parameters() and BN_generate_prime() [etc?]
 | 
			
		||||
       where the callback function can request that the function be aborted.
 | 
			
		||||
       [Gregory Stark <ghstark@pobox.com>, <rayyang2000@yahoo.com>]
 | 
			
		||||
 | 
			
		||||
    o  SRP in TLS.
 | 
			
		||||
       [wished by:
 | 
			
		||||
        Dj <derek@yo.net>, Tom Wu <tom@arcot.com>,
 | 
			
		||||
        Tom Holroyd <tomh@po.crl.go.jp>]
 | 
			
		||||
 | 
			
		||||
       See http://search.ietf.org/internet-drafts/draft-ietf-tls-srp-00.txt
 | 
			
		||||
       as well as http://www-cs-students.stanford.edu/~tjw/srp/.
 | 
			
		||||
 | 
			
		||||
       Tom Holroyd tells us there is a SRP patch for OpenSSH at
 | 
			
		||||
       http://members.tripod.com/professor_tom/archives/, that could
 | 
			
		||||
       be useful.
 | 
			
		||||
    o 
 | 
			
		||||
 
 | 
			
		||||
@@ -1,34 +0,0 @@
 | 
			
		||||
#! /usr/bin/perl
 | 
			
		||||
 | 
			
		||||
use strict;
 | 
			
		||||
use warnings;
 | 
			
		||||
 | 
			
		||||
my @directory_vars = ( "dir", "certs", "crl_dir", "new_certs_dir" );
 | 
			
		||||
my @file_vars = ( "database", "certificate", "serial", "crlnumber",
 | 
			
		||||
		  "crl", "private_key", "RANDFILE" );
 | 
			
		||||
while(<STDIN>) {
 | 
			
		||||
    chomp;
 | 
			
		||||
    foreach my $d (@directory_vars) {
 | 
			
		||||
	if (/^(\s*\#?\s*${d}\s*=\s*)\.\/([^\s\#]*)([\s\#].*)$/) {
 | 
			
		||||
	    $_ = "$1sys\\\$disk:\[.$2$3";
 | 
			
		||||
	} elsif (/^(\s*\#?\s*${d}\s*=\s*)(\w[^\s\#]*)([\s\#].*)$/) {
 | 
			
		||||
	    $_ = "$1sys\\\$disk:\[.$2$3";
 | 
			
		||||
	}
 | 
			
		||||
	s/^(\s*\#?\s*${d}\s*=\s*\$\w+)\/([^\s\#]*)([\s\#].*)$/$1.$2\]$3/;
 | 
			
		||||
	while(/^(\s*\#?\s*${d}\s*=\s*(\$\w+\.|sys\\\$disk:\[\.)[\w\.]+)\/([^\]]*)\](.*)$/) {
 | 
			
		||||
	    $_ = "$1.$3]$4";
 | 
			
		||||
	}
 | 
			
		||||
    }
 | 
			
		||||
    foreach my $f (@file_vars) {
 | 
			
		||||
	s/^(\s*\#?\s*${f}\s*=\s*)\.\/(.*)$/$1sys\\\$disk:\[\/$2/;
 | 
			
		||||
	while(/^(\s*\#?\s*${f}\s*=\s*(\$\w+|sys\\\$disk:\[)[^\/]*)\/(\w+\/[^\s\#]*)([\s\#].*)$/) {
 | 
			
		||||
	    $_ = "$1.$3$4";
 | 
			
		||||
	}
 | 
			
		||||
	if (/^(\s*\#?\s*${f}\s*=\s*(\$\w+|sys\\\$disk:\[)[^\/]*)\/(\w+)([\s\#].*)$/) {
 | 
			
		||||
	    $_ = "$1]$3.$4";
 | 
			
		||||
	} elsif  (/^(\s*\#?\s*${f}\s*=\s*(\$\w+|sys\\\$disk:\[)[^\/]*)\/([^\s\#]*)([\s\#].*)$/) {
 | 
			
		||||
	    $_ = "$1]$3$4";
 | 
			
		||||
	}
 | 
			
		||||
   }
 | 
			
		||||
    print $_,"\n";
 | 
			
		||||
}
 | 
			
		||||
@@ -34,8 +34,10 @@ $	IF F$PARSE("WRK_SSLINCLUDE:") .EQS. "" THEN -
 | 
			
		||||
$	IF F$PARSE("WRK_SSLROOT:[VMS]") .EQS. "" THEN -
 | 
			
		||||
	   CREATE/DIR/LOG WRK_SSLROOT:[VMS]
 | 
			
		||||
$
 | 
			
		||||
$	IF F$SEARCH("WRK_SSLINCLUDE:vms_idhacks.h") .NES. "" THEN -
 | 
			
		||||
	   DELETE WRK_SSLINCLUDE:vms_idhacks.h;*
 | 
			
		||||
$	EXHEADER := vms_idhacks.h
 | 
			
		||||
$
 | 
			
		||||
$	COPY 'EXHEADER' WRK_SSLINCLUDE: /LOG
 | 
			
		||||
$	SET FILE/PROT=WORLD:RE WRK_SSLINCLUDE:'EXHEADER'
 | 
			
		||||
$
 | 
			
		||||
$	OPEN/WRITE SF WRK_SSLROOT:[VMS]OPENSSL_STARTUP.COM
 | 
			
		||||
$	WRITE SYS$OUTPUT "%OPEN-I-CREATED,  ",F$SEARCH("WRK_SSLROOT:[VMS]OPENSSL_STARTUP.COM")," created."
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										354
									
								
								VMS/mkshared.com
									
									
									
									
									
								
							
							
						
						
									
										354
									
								
								VMS/mkshared.com
									
									
									
									
									
								
							@@ -1,354 +0,0 @@
 | 
			
		||||
$! MKSHARED.COM -- script to created shareable images on VMS
 | 
			
		||||
$!
 | 
			
		||||
$! No command line parameters.  This should be run at the start of the source
 | 
			
		||||
$! tree (the same directory where one finds INSTALL.VMS).
 | 
			
		||||
$!
 | 
			
		||||
$! Input:	[.UTIL]LIBEAY.NUM,[.AXP.EXE.CRYPTO]LIBCRYPTO.OLB
 | 
			
		||||
$!		[.UTIL]SSLEAY.NUM,[.AXP.EXE.SSL]LIBSSL.OLB
 | 
			
		||||
$! Output:	[.AXP.EXE.CRYPTO]LIBCRYPTO.OPT,.MAP,.EXE
 | 
			
		||||
$!		[.AXP.EXE.SSL]LIBSSL.OPT,.MAP,.EXE
 | 
			
		||||
$!
 | 
			
		||||
$! So far, tests have only been made on VMS for Alpha.  VAX will come in time.
 | 
			
		||||
$! ===========================================================================
 | 
			
		||||
$
 | 
			
		||||
$! ----- Prepare info for processing: version number and file info
 | 
			
		||||
$ gosub read_version_info
 | 
			
		||||
$ if libver .eqs. ""
 | 
			
		||||
$ then
 | 
			
		||||
$   write sys$error "ERROR: Couldn't find any library version info..."
 | 
			
		||||
$   exit
 | 
			
		||||
$ endif
 | 
			
		||||
$
 | 
			
		||||
$ if f$getsyi("CPU") .ge. 128
 | 
			
		||||
$ then
 | 
			
		||||
$   libid  = "Crypto"
 | 
			
		||||
$   libnum = "[.UTIL]LIBEAY.NUM"
 | 
			
		||||
$   libdir = "[.AXP.EXE.CRYPTO]"
 | 
			
		||||
$   libolb = "''libdir'LIBCRYPTO.OLB"
 | 
			
		||||
$   libopt = "''libdir'LIBCRYPTO.OPT"
 | 
			
		||||
$   libmap = "''libdir'LIBCRYPTO.MAP"
 | 
			
		||||
$   libgoal= "''libdir'LIBCRYPTO.EXE"
 | 
			
		||||
$   libref = ""
 | 
			
		||||
$   gosub create_axp_shr
 | 
			
		||||
$   libid  = "SSL"
 | 
			
		||||
$   libnum = "[.UTIL]SSLEAY.NUM"
 | 
			
		||||
$   libdir = "[.AXP.EXE.SSL]"
 | 
			
		||||
$   libolb = "''libdir'LIBSSL.OLB"
 | 
			
		||||
$   libopt = "''libdir'LIBSSL.OPT"
 | 
			
		||||
$   libmap = "''libdir'LIBSSL.MAP"
 | 
			
		||||
$   libgoal= "''libdir'LIBSSL.EXE"
 | 
			
		||||
$   libref = "[.AXP.EXE.CRYPTO]LIBCRYPTO.EXE"
 | 
			
		||||
$   gosub create_axp_shr
 | 
			
		||||
$ else
 | 
			
		||||
$   libtit = "CRYPTO_TRANSFER_VECTOR"
 | 
			
		||||
$   libid  = "Crypto"
 | 
			
		||||
$   libnum = "[.UTIL]LIBEAY.NUM"
 | 
			
		||||
$   libdir = "[.VAX.EXE.CRYPTO]"
 | 
			
		||||
$   libmar = "''libdir'LIBCRYPTO.MAR"
 | 
			
		||||
$   libolb = "''libdir'LIBCRYPTO.OLB"
 | 
			
		||||
$   libopt = "''libdir'LIBCRYPTO.OPT"
 | 
			
		||||
$   libobj = "''libdir'LIBCRYPTO.OBJ"
 | 
			
		||||
$   libmap = "''libdir'LIBCRYPTO.MAP"
 | 
			
		||||
$   libgoal= "''libdir'LIBCRYPTO.EXE"
 | 
			
		||||
$   libref = ""
 | 
			
		||||
$   libvec = "LIBCRYPTO"
 | 
			
		||||
$   gosub create_vax_shr
 | 
			
		||||
$   libtit = "SSL_TRANSFER_VECTOR"
 | 
			
		||||
$   libid  = "SSL"
 | 
			
		||||
$   libnum = "[.UTIL]SSLEAY.NUM"
 | 
			
		||||
$   libdir = "[.VAX.EXE.SSL]"
 | 
			
		||||
$   libmar = "''libdir'LIBSSL.MAR"
 | 
			
		||||
$   libolb = "''libdir'LIBSSL.OLB"
 | 
			
		||||
$   libopt = "''libdir'LIBSSL.OPT"
 | 
			
		||||
$   libobj = "''libdir'LIBSSL.OBJ"
 | 
			
		||||
$   libmap = "''libdir'LIBSSL.MAP"
 | 
			
		||||
$   libgoal= "''libdir'LIBSSL.EXE"
 | 
			
		||||
$   libref = "[.VAX.EXE.CRYPTO]LIBCRYPTO.EXE"
 | 
			
		||||
$   libvec = "LIBSSL"
 | 
			
		||||
$   gosub create_vax_shr
 | 
			
		||||
$ endif
 | 
			
		||||
$ exit
 | 
			
		||||
$
 | 
			
		||||
$! ----- Soubroutines to actually build the shareable libraries
 | 
			
		||||
$! The way things work, there's a main shareable library creator for each
 | 
			
		||||
$! supported architecture, which is called from the main code above.
 | 
			
		||||
$! The creator will define a number of variables to tell the next levels of
 | 
			
		||||
$! subroutines what routines to use to write to the option files, call the
 | 
			
		||||
$! main processor, read_func_num, and when that is done, it will write version
 | 
			
		||||
$! data at the end of the .opt file, close it, and link the library.
 | 
			
		||||
$!
 | 
			
		||||
$! read_func_num reads through a .num file and calls the writer routine for
 | 
			
		||||
$! each line.  It's also responsible for checking that order is properly kept
 | 
			
		||||
$! in the .num file, check that each line applies to VMS and the architecture,
 | 
			
		||||
$! and to fill in "holes" with dummy entries.
 | 
			
		||||
$!
 | 
			
		||||
$! The creator routines depend on the following variables:
 | 
			
		||||
$! libnum	The name of the .num file to use as input
 | 
			
		||||
$! libolb	The name of the object library to build from
 | 
			
		||||
$! libid	The identification string of the shareable library
 | 
			
		||||
$! libopt	The name of the .opt file to write
 | 
			
		||||
$! libtit	The title of the assembler transfer vector file (VAX only)
 | 
			
		||||
$! libmar	The name of the assembler transfer vector file (VAX only)
 | 
			
		||||
$! libmap	The name of the map file to write
 | 
			
		||||
$! libgoal	The name of the shareable library to write
 | 
			
		||||
$! libref	The name of a shareable library to link in
 | 
			
		||||
$!
 | 
			
		||||
$! read_func_num depends on the following variables from the creator:
 | 
			
		||||
$! libwriter	The name of the writer routine to call for each .num file line
 | 
			
		||||
$! -----
 | 
			
		||||
$
 | 
			
		||||
$! ----- Subroutines for AXP
 | 
			
		||||
$! -----
 | 
			
		||||
$! The creator routine
 | 
			
		||||
$ create_axp_shr:
 | 
			
		||||
$   open/write opt 'libopt'
 | 
			
		||||
$   write opt "identification=""",libid," ",libverstr,""""
 | 
			
		||||
$   write opt libolb,"/lib"
 | 
			
		||||
$   if libref .nes. "" then write opt libref,"/SHARE"
 | 
			
		||||
$   write opt "SYMBOL_VECTOR=(-"
 | 
			
		||||
$   libfirstentry := true
 | 
			
		||||
$   libwrch   := opt
 | 
			
		||||
$   libwriter := write_axp_transfer_entry
 | 
			
		||||
$   textcount = 0
 | 
			
		||||
$   gosub read_func_num
 | 
			
		||||
$   write opt ")"
 | 
			
		||||
$   write opt "GSMATCH=",libvmatch,",",libver
 | 
			
		||||
$   close opt
 | 
			
		||||
$   link/map='libmap'/full/share='libgoal' 'libopt'/option
 | 
			
		||||
$   return
 | 
			
		||||
$
 | 
			
		||||
$! The record writer routine
 | 
			
		||||
$ write_axp_transfer_entry:
 | 
			
		||||
$   if libentry .eqs. ".dummy" then return
 | 
			
		||||
$   if info_kind .eqs. "VARIABLE"
 | 
			
		||||
$   then
 | 
			
		||||
$     pr:=DATA
 | 
			
		||||
$   else
 | 
			
		||||
$     pr:=PROCEDURE
 | 
			
		||||
$   endif
 | 
			
		||||
$   textcount_this = f$length(pr) + f$length(libentry) + 5
 | 
			
		||||
$   if textcount + textcount_this .gt. 1024
 | 
			
		||||
$   then
 | 
			
		||||
$     write opt ")"
 | 
			
		||||
$     write opt "SYMBOL_VECTOR=(-"
 | 
			
		||||
$     textcount = 16
 | 
			
		||||
$     libfirstentry := true
 | 
			
		||||
$   endif
 | 
			
		||||
$   if libfirstentry
 | 
			
		||||
$   then
 | 
			
		||||
$     write 'libwrch' "    ",libentry,"=",pr," -"
 | 
			
		||||
$   else
 | 
			
		||||
$     write 'libwrch' "    ,",libentry,"=",pr," -"
 | 
			
		||||
$   endif
 | 
			
		||||
$   libfirstentry := false
 | 
			
		||||
$   textcount = textcount + textcount_this
 | 
			
		||||
$   return
 | 
			
		||||
$
 | 
			
		||||
$! ----- Subroutines for AXP
 | 
			
		||||
$! -----
 | 
			
		||||
$! The creator routine
 | 
			
		||||
$ create_vax_shr:
 | 
			
		||||
$   open/write mar 'libmar'
 | 
			
		||||
$   type sys$input:/out=mar:
 | 
			
		||||
;
 | 
			
		||||
; Transfer vector for VAX shareable image
 | 
			
		||||
;
 | 
			
		||||
$   write mar "	.TITLE ",libtit
 | 
			
		||||
$   write mar "	.IDENT /",libid,"/"
 | 
			
		||||
$   type sys$input:/out=mar:
 | 
			
		||||
;
 | 
			
		||||
; Define macro to assist in building transfer vector entries.  Each entry
 | 
			
		||||
; should take no more than 8 bytes.
 | 
			
		||||
;
 | 
			
		||||
	.MACRO FTRANSFER_ENTRY routine
 | 
			
		||||
	.ALIGN QUAD
 | 
			
		||||
	.TRANSFER routine
 | 
			
		||||
	.MASK	routine
 | 
			
		||||
	JMP	routine+2
 | 
			
		||||
	.ENDM FTRANSFER_ENTRY
 | 
			
		||||
;
 | 
			
		||||
; Place entries in own program section.
 | 
			
		||||
;
 | 
			
		||||
$   write mar "	.PSECT $$",libvec,",QUAD,PIC,USR,CON,REL,LCL,SHR,EXE,RD,NOWRT"
 | 
			
		||||
$   write mar libvec,"_xfer:"
 | 
			
		||||
$   libwrch   := mar
 | 
			
		||||
$   libwriter := write_vax_ftransfer_entry
 | 
			
		||||
$   gosub read_func_num
 | 
			
		||||
$   type sys$input:/out=mar:
 | 
			
		||||
;
 | 
			
		||||
; Allocate extra storage at end of vector to allow for expansion.
 | 
			
		||||
;
 | 
			
		||||
$   write mar "	.BLKB 32768-<.-",libvec,"_xfer>	; 64 pages total."
 | 
			
		||||
$!   libwriter := write_vax_vtransfer_entry
 | 
			
		||||
$!   gosub read_func_num
 | 
			
		||||
$   write mar "	.END"
 | 
			
		||||
$   close mar
 | 
			
		||||
$   open/write opt 'libopt'
 | 
			
		||||
$   write opt "identification=""",libid," ",libverstr,""""
 | 
			
		||||
$   write opt libobj
 | 
			
		||||
$   write opt libolb,"/lib"
 | 
			
		||||
$   if libref .nes. "" then write opt libref,"/SHARE"
 | 
			
		||||
$   type sys$input:/out=opt:
 | 
			
		||||
!
 | 
			
		||||
! Ensure transfer vector is at beginning of image
 | 
			
		||||
!
 | 
			
		||||
CLUSTER=FIRST
 | 
			
		||||
$   write opt "COLLECT=FIRST,$$",libvec
 | 
			
		||||
$   write opt "GSMATCH=",libvmatch,",",libver
 | 
			
		||||
$   type sys$input:/out=opt:
 | 
			
		||||
!
 | 
			
		||||
! make psects nonshareable so image can be installed.
 | 
			
		||||
!
 | 
			
		||||
PSECT_ATTR=$CHAR_STRING_CONSTANTS,NOWRT
 | 
			
		||||
$   libwrch   := opt
 | 
			
		||||
$   libwriter := write_vax_psect_attr
 | 
			
		||||
$   gosub read_func_num
 | 
			
		||||
$   close opt
 | 
			
		||||
$   macro/obj='libobj' 'libmar'
 | 
			
		||||
$   link/map='libmap'/full/share='libgoal' 'libopt'/option
 | 
			
		||||
$   return
 | 
			
		||||
$
 | 
			
		||||
$! The record writer routine for VAX functions
 | 
			
		||||
$ write_vax_ftransfer_entry:
 | 
			
		||||
$   if info_kind .nes. "FUNCTION" then return
 | 
			
		||||
$   if libentry .eqs ".dummy"
 | 
			
		||||
$   then
 | 
			
		||||
$     write 'libwrch' "	.BLKB 8" ! Dummy is zeroes...
 | 
			
		||||
$   else
 | 
			
		||||
$     write 'libwrch' "	FTRANSFER_ENTRY ",libentry
 | 
			
		||||
$   endif
 | 
			
		||||
$   return
 | 
			
		||||
$! The record writer routine for VAX variables (should never happen!)
 | 
			
		||||
$ write_vax_psect_attr:
 | 
			
		||||
$   if info_kind .nes. "VARIABLE" then return
 | 
			
		||||
$   if libentry .eqs ".dummy" then return
 | 
			
		||||
$   write 'libwrch' "PSECT_ATTR=",libentry,",NOSHR"
 | 
			
		||||
$   return
 | 
			
		||||
$
 | 
			
		||||
$! ----- Common subroutines
 | 
			
		||||
$! -----
 | 
			
		||||
$! The .num file reader.  This one has great responsability.
 | 
			
		||||
$ read_func_num:
 | 
			
		||||
$   open libnum 'libnum'
 | 
			
		||||
$   goto read_nums
 | 
			
		||||
$
 | 
			
		||||
$ read_nums:
 | 
			
		||||
$   libentrynum=0
 | 
			
		||||
$   liblastentry:=false
 | 
			
		||||
$   entrycount=0
 | 
			
		||||
$   loop:
 | 
			
		||||
$     read/end=loop_end/err=loop_end libnum line
 | 
			
		||||
$     entrynum=f$int(f$element(1," ",f$edit(line,"COMPRESS,TRIM")))
 | 
			
		||||
$     entryinfo=f$element(2," ",f$edit(line,"COMPRESS,TRIM"))
 | 
			
		||||
$     curentry=f$element(0," ",f$edit(line,"COMPRESS,TRIM"))
 | 
			
		||||
$     info_exist=f$element(0,":",entryinfo)
 | 
			
		||||
$     info_platforms=","+f$element(1,":",entryinfo)+","
 | 
			
		||||
$     info_kind=f$element(2,":",entryinfo)
 | 
			
		||||
$     info_algorithms=","+f$element(3,":",entryinfo)+","
 | 
			
		||||
$     if info_exist .eqs. "NOEXIST" then goto loop
 | 
			
		||||
$     truesum = 0
 | 
			
		||||
$     falsesum = 0
 | 
			
		||||
$     negatives = 1
 | 
			
		||||
$     plat_i = 0
 | 
			
		||||
$     loop1:
 | 
			
		||||
$       plat_entry = f$element(plat_i,",",info_platforms)
 | 
			
		||||
$       plat_i = plat_i + 1
 | 
			
		||||
$       if plat_entry .eqs. "" then goto loop1
 | 
			
		||||
$       if plat_entry .nes. ","
 | 
			
		||||
$       then
 | 
			
		||||
$         if f$extract(0,1,plat_entry) .nes. "!" then negatives = 0
 | 
			
		||||
$         if f$getsyi("CPU") .lt. 128
 | 
			
		||||
$         then
 | 
			
		||||
$           if plat_entry .eqs. "EXPORT_VAR_AS_FUNCTION" then -
 | 
			
		||||
$             truesum = truesum + 1
 | 
			
		||||
$           if plat_entry .eqs. "!EXPORT_VAR_AS_FUNCTION" then -
 | 
			
		||||
$             falsesum = falsesum + 1
 | 
			
		||||
$         endif
 | 
			
		||||
$         if plat_entry .eqs. "VMS" then truesum = truesum + 1
 | 
			
		||||
$         if plat_entry .eqs. "!VMS" then falsesum = falsesum + 1
 | 
			
		||||
$	  goto loop1
 | 
			
		||||
$       endif
 | 
			
		||||
$     endloop1:
 | 
			
		||||
$!DEBUG!$     if info_platforms - "EXPORT_VAR_AS_FUNCTION" .nes. info_platforms
 | 
			
		||||
$!DEBUG!$     then
 | 
			
		||||
$!DEBUG!$       write sys$output line
 | 
			
		||||
$!DEBUG!$       write sys$output "        truesum = ",truesum,-
 | 
			
		||||
$!DEBUG!		", negatives = ",negatives,", falsesum = ",falsesum
 | 
			
		||||
$!DEBUG!$     endif
 | 
			
		||||
$     if falsesum .ne. 0 then goto loop
 | 
			
		||||
$     if truesum+negatives .eq. 0 then goto loop
 | 
			
		||||
$     alg_i = 0
 | 
			
		||||
$     loop2:
 | 
			
		||||
$       alg_entry = f$element(alg_i,",",info_algorithms)
 | 
			
		||||
$	alg_i = alg_i + 1
 | 
			
		||||
$       if alg_entry .eqs. "" then goto loop2
 | 
			
		||||
$       if alg_entry .nes. ","
 | 
			
		||||
$       then
 | 
			
		||||
$         if alg_entry .eqs. "KRB5" then goto loop ! Special for now
 | 
			
		||||
$	  if alg_entry .eqs. "STATIC_ENGINE" then goto loop ! Special for now
 | 
			
		||||
$         if f$trnlnm("OPENSSL_NO_"+alg_entry) .nes. "" then goto loop
 | 
			
		||||
$	  goto loop2
 | 
			
		||||
$       endif
 | 
			
		||||
$     endloop2:
 | 
			
		||||
$     if info_platforms - "EXPORT_VAR_AS_FUNCTION" .nes. info_platforms
 | 
			
		||||
$     then
 | 
			
		||||
$!DEBUG!$     write sys$output curentry," ; ",entrynum," ; ",entryinfo
 | 
			
		||||
$     endif
 | 
			
		||||
$   redo:
 | 
			
		||||
$     next:=loop
 | 
			
		||||
$     tolibentry=curentry
 | 
			
		||||
$     if libentrynum .ne. entrynum
 | 
			
		||||
$     then
 | 
			
		||||
$       entrycount=entrycount+1
 | 
			
		||||
$       if entrycount .lt. entrynum
 | 
			
		||||
$       then
 | 
			
		||||
$!DEBUG!$         write sys$output "Info: entrycount: ''entrycount', entrynum: ''entrynum' => 0"
 | 
			
		||||
$         tolibentry=".dummy"
 | 
			
		||||
$         next:=redo
 | 
			
		||||
$       endif
 | 
			
		||||
$       if entrycount .gt. entrynum
 | 
			
		||||
$       then
 | 
			
		||||
$         write sys$error "Decreasing library entry numbers!  Can't continue"
 | 
			
		||||
$         write sys$error """",line,""""
 | 
			
		||||
$         close libnum
 | 
			
		||||
$         return
 | 
			
		||||
$       endif
 | 
			
		||||
$       libentry=tolibentry
 | 
			
		||||
$!DEBUG!$       write sys$output entrycount," ",libentry," ",entryinfo
 | 
			
		||||
$       if libentry .nes. "" .and. libwriter .nes. "" then gosub 'libwriter'
 | 
			
		||||
$     else
 | 
			
		||||
$       write sys$error "Info: ""''curentry'"" is an alias for ""''libentry'"".  Overriding..."
 | 
			
		||||
$     endif
 | 
			
		||||
$     libentrynum=entrycount
 | 
			
		||||
$     goto 'next'
 | 
			
		||||
$   loop_end:
 | 
			
		||||
$   close libnum
 | 
			
		||||
$   return
 | 
			
		||||
$
 | 
			
		||||
$! The version number reader
 | 
			
		||||
$ read_version_info:
 | 
			
		||||
$   libver = ""
 | 
			
		||||
$   open/read vf [.CRYPTO]OPENSSLV.H
 | 
			
		||||
$   loop_rvi:
 | 
			
		||||
$     read/err=endloop_rvi/end=endloop_rvi vf rvi_line
 | 
			
		||||
$     if rvi_line - "SHLIB_VERSION_NUMBER """ .eqs. rvi_line then -
 | 
			
		||||
	goto loop_rvi
 | 
			
		||||
$     libverstr = f$element(1,"""",rvi_line)
 | 
			
		||||
$     libvmajor = f$element(0,".",libverstr)
 | 
			
		||||
$     libvminor = f$element(1,".",libverstr)
 | 
			
		||||
$     libvedit = f$element(2,".",libverstr)
 | 
			
		||||
$     libvpatch = f$cvui(0,8,f$extract(1,1,libvedit)+"@")-f$cvui(0,8,"@")
 | 
			
		||||
$     libvedit = f$extract(0,1,libvedit)
 | 
			
		||||
$     libver = f$string(f$int(libvmajor)*100)+","+-
 | 
			
		||||
	f$string(f$int(libvminor)*100+f$int(libvedit)*10+f$int(libvpatch))
 | 
			
		||||
$     if libvmajor .eqs. "0"
 | 
			
		||||
$     then
 | 
			
		||||
$       libvmatch = "EQUAL"
 | 
			
		||||
$     else
 | 
			
		||||
$       ! Starting with the 1.0 release, backward compatibility should be
 | 
			
		||||
$       ! kept, so switch over to the following
 | 
			
		||||
$       libvmatch = "LEQUAL"
 | 
			
		||||
$     endif
 | 
			
		||||
$   endloop_rvi:
 | 
			
		||||
$   close vf
 | 
			
		||||
$   return
 | 
			
		||||
@@ -1 +0,0 @@
 | 
			
		||||
sys$share:tcpip$ipc_shr.exe/share
 | 
			
		||||
							
								
								
									
										198
									
								
								VMS/vms_idhacks.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										198
									
								
								VMS/vms_idhacks.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,198 @@
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * 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 above 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 acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 | 
			
		||||
 *    endorse or promote products derived from this software without
 | 
			
		||||
 *    prior written permission. For written permission, please contact
 | 
			
		||||
 *    openssl-core@openssl.org.
 | 
			
		||||
 *
 | 
			
		||||
 * 5. Products derived from this software may not be called "OpenSSL"
 | 
			
		||||
 *    nor may "OpenSSL" appear in their names without prior written
 | 
			
		||||
 *    permission of the OpenSSL Project.
 | 
			
		||||
 *
 | 
			
		||||
 * 6. Redistributions of any form whatsoever must retain the following
 | 
			
		||||
 *    acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 | 
			
		||||
 * EXPRESSED 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 OpenSSL PROJECT OR
 | 
			
		||||
 * ITS 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.
 | 
			
		||||
 * ====================================================================
 | 
			
		||||
 *
 | 
			
		||||
 * This product includes cryptographic software written by Eric Young
 | 
			
		||||
 * (eay@cryptsoft.com).  This product includes software written by Tim
 | 
			
		||||
 * Hudson (tjh@cryptsoft.com).
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#ifndef HEADER_VMS_IDHACKS_H
 | 
			
		||||
#define HEADER_VMS_IDHACKS_H
 | 
			
		||||
 | 
			
		||||
#ifdef VMS
 | 
			
		||||
 | 
			
		||||
/* Hack a long name in crypto/asn1/a_mbstr.c */
 | 
			
		||||
#define ASN1_STRING_set_default_mask_asc ASN1_STRING_set_def_mask_asc
 | 
			
		||||
/* Hack the names created with DECLARE_STACK_OF(PKCS7_SIGNER_INFO) */
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_new		sk_PKCS7_SIGINF_new
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_new_null		sk_PKCS7_SIGINF_new_null
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_free		sk_PKCS7_SIGINF_free
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_num		sk_PKCS7_SIGINF_num
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_value		sk_PKCS7_SIGINF_value
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_set		sk_PKCS7_SIGINF_set
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_zero		sk_PKCS7_SIGINF_zero
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_push		sk_PKCS7_SIGINF_push
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_unshift		sk_PKCS7_SIGINF_unshift
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_find		sk_PKCS7_SIGINF_find
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_delete		sk_PKCS7_SIGINF_delete
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_delete_ptr		sk_PKCS7_SIGINF_delete_ptr
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_insert		sk_PKCS7_SIGINF_insert
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_set_cmp_func	sk_PKCS7_SIGINF_set_cmp_func
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_dup		sk_PKCS7_SIGINF_dup
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_pop_free		sk_PKCS7_SIGINF_pop_free
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_shift		sk_PKCS7_SIGINF_shift
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_pop		sk_PKCS7_SIGINF_pop
 | 
			
		||||
#define sk_PKCS7_SIGNER_INFO_sort		sk_PKCS7_SIGINF_sort
 | 
			
		||||
 | 
			
		||||
/* Hack the names created with DECLARE_STACK_OF(PKCS7_RECIP_INFO) */
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_new			sk_PKCS7_RECINF_new
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_new_null		sk_PKCS7_RECINF_new_null
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_free		sk_PKCS7_RECINF_free
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_num			sk_PKCS7_RECINF_num
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_value		sk_PKCS7_RECINF_value
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_set			sk_PKCS7_RECINF_set
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_zero		sk_PKCS7_RECINF_zero
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_push		sk_PKCS7_RECINF_push
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_unshift		sk_PKCS7_RECINF_unshift
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_find		sk_PKCS7_RECINF_find
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_delete		sk_PKCS7_RECINF_delete
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_delete_ptr		sk_PKCS7_RECINF_delete_ptr
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_insert		sk_PKCS7_RECINF_insert
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_set_cmp_func	sk_PKCS7_RECINF_set_cmp_func
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_dup			sk_PKCS7_RECINF_dup
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_pop_free		sk_PKCS7_RECINF_pop_free
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_shift		sk_PKCS7_RECINF_shift
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_pop			sk_PKCS7_RECINF_pop
 | 
			
		||||
#define sk_PKCS7_RECIP_INFO_sort		sk_PKCS7_RECINF_sort
 | 
			
		||||
 | 
			
		||||
/* Hack the names created with DECLARE_STACK_OF(ASN1_STRING_TABLE) */
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_new		sk_ASN1_STRTAB_new
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_new_null		sk_ASN1_STRTAB_new_null
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_free		sk_ASN1_STRTAB_free
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_num		sk_ASN1_STRTAB_num
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_value		sk_ASN1_STRTAB_value
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_set		sk_ASN1_STRTAB_set
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_zero		sk_ASN1_STRTAB_zero
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_push		sk_ASN1_STRTAB_push
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_unshift		sk_ASN1_STRTAB_unshift
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_find		sk_ASN1_STRTAB_find
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_delete		sk_ASN1_STRTAB_delete
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_delete_ptr		sk_ASN1_STRTAB_delete_ptr
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_insert		sk_ASN1_STRTAB_insert
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_set_cmp_func	sk_ASN1_STRTAB_set_cmp_func
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_dup		sk_ASN1_STRTAB_dup
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_pop_free		sk_ASN1_STRTAB_pop_free
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_shift		sk_ASN1_STRTAB_shift
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_pop		sk_ASN1_STRTAB_pop
 | 
			
		||||
#define sk_ASN1_STRING_TABLE_sort		sk_ASN1_STRTAB_sort
 | 
			
		||||
 | 
			
		||||
/* Hack the names created with DECLARE_STACK_OF(ACCESS_DESCRIPTION) */
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_new		sk_ACC_DESC_new
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_new_null		sk_ACC_DESC_new_null
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_free		sk_ACC_DESC_free
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_num		sk_ACC_DESC_num
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_value		sk_ACC_DESC_value
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_set		sk_ACC_DESC_set
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_zero		sk_ACC_DESC_zero
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_push		sk_ACC_DESC_push
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_unshift		sk_ACC_DESC_unshift
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_find		sk_ACC_DESC_find
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_delete		sk_ACC_DESC_delete
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_delete_ptr	sk_ACC_DESC_delete_ptr
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_insert		sk_ACC_DESC_insert
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_set_cmp_func	sk_ACC_DESC_set_cmp_func
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_dup		sk_ACC_DESC_dup
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_pop_free		sk_ACC_DESC_pop_free
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_shift		sk_ACC_DESC_shift
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_pop		sk_ACC_DESC_pop
 | 
			
		||||
#define sk_ACCESS_DESCRIPTION_sort		sk_ACC_DESC_sort
 | 
			
		||||
 | 
			
		||||
/* Hack the names created with DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS) */
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_new		sk_CRYPT_EX_DATFNS_new
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_new_null	sk_CRYPT_EX_DATFNS_new_null
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_free		sk_CRYPT_EX_DATFNS_free
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_num		sk_CRYPT_EX_DATFNS_num
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_value		sk_CRYPT_EX_DATFNS_value
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_set		sk_CRYPT_EX_DATFNS_set
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_zero		sk_CRYPT_EX_DATFNS_zero
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_push		sk_CRYPT_EX_DATFNS_push
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_unshift		sk_CRYPT_EX_DATFNS_unshift
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_find		sk_CRYPT_EX_DATFNS_find
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_delete		sk_CRYPT_EX_DATFNS_delete
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_delete_ptr	sk_CRYPT_EX_DATFNS_delete_ptr
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_insert		sk_CRYPT_EX_DATFNS_insert
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func	sk_CRYPT_EX_DATFNS_set_cmp_func
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_dup		sk_CRYPT_EX_DATFNS_dup
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_pop_free	sk_CRYPT_EX_DATFNS_pop_free
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_shift		sk_CRYPT_EX_DATFNS_shift
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_pop		sk_CRYPT_EX_DATFNS_pop
 | 
			
		||||
#define sk_CRYPTO_EX_DATA_FUNCS_sort		sk_CRYPT_EX_DATFNS_sort
 | 
			
		||||
 | 
			
		||||
/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO) */
 | 
			
		||||
#define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO	i2d_ASN1_SET_OF_PKCS7_SIGINF
 | 
			
		||||
#define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO	d2i_ASN1_SET_OF_PKCS7_SIGINF
 | 
			
		||||
 | 
			
		||||
/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO) */
 | 
			
		||||
#define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO	i2d_ASN1_SET_OF_PKCS7_RECGINF
 | 
			
		||||
#define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO	d2i_ASN1_SET_OF_PKCS7_RECGINF
 | 
			
		||||
 | 
			
		||||
/* Hack the names created with DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION) */
 | 
			
		||||
#define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION	i2d_ASN1_SET_OF_ACC_DESC
 | 
			
		||||
#define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION	d2i_ASN1_SET_OF_ACC_DESC
 | 
			
		||||
 | 
			
		||||
/* Hack the names created with DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE) */
 | 
			
		||||
#define PEM_read_NETSCAPE_CERT_SEQUENCE		PEM_read_NS_CERT_SEQUENCE
 | 
			
		||||
#define PEM_write_NETSCAPE_CERT_SEQUENCE	PEM_write_NS_CERT_SEQUENCE
 | 
			
		||||
#define PEM_read_bio_NETSCAPE_CERT_SEQUENCE	PEM_read_bio_NS_CERT_SEQUENCE
 | 
			
		||||
#define PEM_write_bio_NETSCAPE_CERT_SEQUENCE	PEM_write_bio_NS_CERT_SEQUENCE
 | 
			
		||||
#define PEM_write_cb_bio_NETSCAPE_CERT_SEQUENCE	PEM_write_cb_bio_NS_CERT_SEQUENCE
 | 
			
		||||
 | 
			
		||||
/* Hack the names created with DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO) */
 | 
			
		||||
#define PEM_read_PKCS8_PRIV_KEY_INFO		PEM_read_P8_PRIV_KEY_INFO
 | 
			
		||||
#define PEM_write_PKCS8_PRIV_KEY_INFO		PEM_write_P8_PRIV_KEY_INFO
 | 
			
		||||
#define PEM_read_bio_PKCS8_PRIV_KEY_INFO	PEM_read_bio_P8_PRIV_KEY_INFO
 | 
			
		||||
#define PEM_write_bio_PKCS8_PRIV_KEY_INFO	PEM_write_bio_P8_PRIV_KEY_INFO
 | 
			
		||||
#define PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO	PEM_wrt_cb_bio_P8_PRIV_KEY_INFO
 | 
			
		||||
 | 
			
		||||
/* Hack other PEM names */
 | 
			
		||||
#define PEM_write_bio_PKCS8PrivateKey_nid	PEM_write_bio_PKCS8PrivKey_nid
 | 
			
		||||
 | 
			
		||||
#endif /* defined VMS */
 | 
			
		||||
 | 
			
		||||
#endif /* ! defined HEADER_VMS_IDHACKS_H */
 | 
			
		||||
@@ -3,5 +3,3 @@ Makefile.save
 | 
			
		||||
der_chop
 | 
			
		||||
der_chop.bak
 | 
			
		||||
CA.pl
 | 
			
		||||
*.flc
 | 
			
		||||
semantic.cache
 | 
			
		||||
 
 | 
			
		||||
@@ -5,7 +5,7 @@
 | 
			
		||||
#      things easier between now and when Eric is convinced to fix it :-)
 | 
			
		||||
#
 | 
			
		||||
# CA -newca ... will setup the right stuff
 | 
			
		||||
# CA -newreq[-nodes] ... will generate a certificate request 
 | 
			
		||||
# CA -newreq ... will generate a certificate request 
 | 
			
		||||
# CA -sign ... will sign the generated request and output 
 | 
			
		||||
#
 | 
			
		||||
# At the end of that grab newreq.pem and newcert.pem (one has the key 
 | 
			
		||||
@@ -36,26 +36,15 @@
 | 
			
		||||
# default openssl.cnf file has setup as per the following
 | 
			
		||||
# demoCA ... where everything is stored
 | 
			
		||||
 | 
			
		||||
my $openssl;
 | 
			
		||||
if(defined $ENV{OPENSSL}) {
 | 
			
		||||
	$openssl = $ENV{OPENSSL};
 | 
			
		||||
} else {
 | 
			
		||||
	$openssl = "openssl";
 | 
			
		||||
	$ENV{OPENSSL} = $openssl;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
$SSLEAY_CONFIG=$ENV{"SSLEAY_CONFIG"};
 | 
			
		||||
$DAYS="-days 365";	# 1 year
 | 
			
		||||
$CADAYS="-days 1095";	# 3 years
 | 
			
		||||
$REQ="$openssl req $SSLEAY_CONFIG";
 | 
			
		||||
$CA="$openssl ca $SSLEAY_CONFIG";
 | 
			
		||||
$VERIFY="$openssl verify";
 | 
			
		||||
$X509="$openssl x509";
 | 
			
		||||
$PKCS12="$openssl pkcs12";
 | 
			
		||||
$DAYS="-days 365";
 | 
			
		||||
$REQ="openssl req $SSLEAY_CONFIG";
 | 
			
		||||
$CA="openssl ca $SSLEAY_CONFIG";
 | 
			
		||||
$VERIFY="openssl verify";
 | 
			
		||||
$X509="openssl x509";
 | 
			
		||||
$PKCS12="openssl pkcs12";
 | 
			
		||||
 | 
			
		||||
$CATOP="./demoCA";
 | 
			
		||||
$CAKEY="cakey.pem";
 | 
			
		||||
$CAREQ="careq.pem";
 | 
			
		||||
$CACERT="cacert.pem";
 | 
			
		||||
 | 
			
		||||
$DIRMODE = 0777;
 | 
			
		||||
@@ -64,23 +53,18 @@ $RET = 0;
 | 
			
		||||
 | 
			
		||||
foreach (@ARGV) {
 | 
			
		||||
	if ( /^(-\?|-h|-help)$/ ) {
 | 
			
		||||
	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
 | 
			
		||||
	    print STDERR "usage: CA -newcert|-newreq|-newca|-sign|-verify\n";
 | 
			
		||||
	    exit 0;
 | 
			
		||||
	} elsif (/^-newcert$/) {
 | 
			
		||||
	    # create a certificate
 | 
			
		||||
	    system ("$REQ -new -x509 -keyout newkey.pem -out newcert.pem $DAYS");
 | 
			
		||||
	    system ("$REQ -new -x509 -keyout newreq.pem -out newreq.pem $DAYS");
 | 
			
		||||
	    $RET=$?;
 | 
			
		||||
	    print "Certificate is in newcert.pem, private key is in newkey.pem\n"
 | 
			
		||||
	    print "Certificate (and private key) is in newreq.pem\n"
 | 
			
		||||
	} elsif (/^-newreq$/) {
 | 
			
		||||
	    # create a certificate request
 | 
			
		||||
	    system ("$REQ -new -keyout newkey.pem -out newreq.pem $DAYS");
 | 
			
		||||
	    system ("$REQ -new -keyout newreq.pem -out newreq.pem $DAYS");
 | 
			
		||||
	    $RET=$?;
 | 
			
		||||
	    print "Request is in newreq.pem, private key is in newkey.pem\n";
 | 
			
		||||
	} elsif (/^-newreq-nodes$/) {
 | 
			
		||||
	    # create a certificate request
 | 
			
		||||
	    system ("$REQ -new -nodes -keyout newkey.pem -out newreq.pem $DAYS");
 | 
			
		||||
	    $RET=$?;
 | 
			
		||||
	    print "Request is in newreq.pem, private key is in newkey.pem\n";
 | 
			
		||||
	    print "Request (and private key) is in newreq.pem\n";
 | 
			
		||||
	} elsif (/^-newca$/) {
 | 
			
		||||
		# if explicitly asked for or it doesn't exist then setup the
 | 
			
		||||
		# directory structure that Eric likes to manage things 
 | 
			
		||||
@@ -92,11 +76,11 @@ foreach (@ARGV) {
 | 
			
		||||
		mkdir "${CATOP}/crl", $DIRMODE ;
 | 
			
		||||
		mkdir "${CATOP}/newcerts", $DIRMODE;
 | 
			
		||||
		mkdir "${CATOP}/private", $DIRMODE;
 | 
			
		||||
		open OUT, ">${CATOP}/index.txt";
 | 
			
		||||
		close OUT;
 | 
			
		||||
		open OUT, ">${CATOP}/crlnumber";
 | 
			
		||||
		open OUT, ">${CATOP}/serial";
 | 
			
		||||
		print OUT "01\n";
 | 
			
		||||
		close OUT;
 | 
			
		||||
		open OUT, ">${CATOP}/index.txt";
 | 
			
		||||
		close OUT;
 | 
			
		||||
	    }
 | 
			
		||||
	    if ( ! -f "${CATOP}/private/$CAKEY" ) {
 | 
			
		||||
		print "CA certificate filename (or enter to create)\n";
 | 
			
		||||
@@ -111,24 +95,18 @@ foreach (@ARGV) {
 | 
			
		||||
		    $RET=$?;
 | 
			
		||||
		} else {
 | 
			
		||||
		    print "Making CA certificate ...\n";
 | 
			
		||||
		    system ("$REQ -new -keyout " .
 | 
			
		||||
			"${CATOP}/private/$CAKEY -out ${CATOP}/$CAREQ");
 | 
			
		||||
		    system ("$CA -create_serial " .
 | 
			
		||||
			"-out ${CATOP}/$CACERT $CADAYS -batch " . 
 | 
			
		||||
			"-keyfile ${CATOP}/private/$CAKEY -selfsign " .
 | 
			
		||||
			"-extensions v3_ca " .
 | 
			
		||||
			"-infiles ${CATOP}/$CAREQ ");
 | 
			
		||||
		    system ("$REQ -new -x509 -keyout " .
 | 
			
		||||
			"${CATOP}/private/$CAKEY -out ${CATOP}/$CACERT $DAYS");
 | 
			
		||||
		    $RET=$?;
 | 
			
		||||
		}
 | 
			
		||||
	    }
 | 
			
		||||
	} elsif (/^-pkcs12$/) {
 | 
			
		||||
	    my $cname = $ARGV[1];
 | 
			
		||||
	    $cname = "My Certificate" unless defined $cname;
 | 
			
		||||
	    system ("$PKCS12 -in newcert.pem -inkey newkey.pem " .
 | 
			
		||||
	    system ("$PKCS12 -in newcert.pem -inkey newreq.pem " .
 | 
			
		||||
			"-certfile ${CATOP}/$CACERT -out newcert.p12 " .
 | 
			
		||||
			"-export -name \"$cname\"");
 | 
			
		||||
	    $RET=$?;
 | 
			
		||||
	    print "PKCS #12 file is in newcert.p12\n";
 | 
			
		||||
	    exit $RET;
 | 
			
		||||
	} elsif (/^-xsign$/) {
 | 
			
		||||
	    system ("$CA -policy policy_anything -infiles newreq.pem");
 | 
			
		||||
@@ -138,11 +116,6 @@ foreach (@ARGV) {
 | 
			
		||||
							"-infiles newreq.pem");
 | 
			
		||||
	    $RET=$?;
 | 
			
		||||
	    print "Signed certificate is in newcert.pem\n";
 | 
			
		||||
	} elsif (/^(-signCA)$/) {
 | 
			
		||||
	    system ("$CA -policy policy_anything -out newcert.pem " .
 | 
			
		||||
					"-extensions v3_ca -infiles newreq.pem");
 | 
			
		||||
	    $RET=$?;
 | 
			
		||||
	    print "Signed CA certificate is in newcert.pem\n";
 | 
			
		||||
	} elsif (/^-signcert$/) {
 | 
			
		||||
	    system ("$X509 -x509toreq -in newreq.pem -signkey newreq.pem " .
 | 
			
		||||
								"-out tmp.pem");
 | 
			
		||||
@@ -164,7 +137,7 @@ foreach (@ARGV) {
 | 
			
		||||
	    }
 | 
			
		||||
	} else {
 | 
			
		||||
	    print STDERR "Unknown arg $_\n";
 | 
			
		||||
	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
 | 
			
		||||
	    print STDERR "usage: CA -newcert|-newreq|-newca|-sign|-verify\n";
 | 
			
		||||
	    exit 1;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										31
									
								
								apps/CA.sh
									
									
									
									
									
								
							
							
						
						
									
										31
									
								
								apps/CA.sh
									
									
									
									
									
								
							@@ -30,18 +30,14 @@
 | 
			
		||||
# default openssl.cnf file has setup as per the following
 | 
			
		||||
# demoCA ... where everything is stored
 | 
			
		||||
 | 
			
		||||
if [ -z "$OPENSSL" ]; then OPENSSL=openssl; fi
 | 
			
		||||
 | 
			
		||||
DAYS="-days 365"	# 1 year
 | 
			
		||||
CADAYS="-days 1095"	# 3 years
 | 
			
		||||
REQ="$OPENSSL req $SSLEAY_CONFIG"
 | 
			
		||||
CA="$OPENSSL ca $SSLEAY_CONFIG"
 | 
			
		||||
VERIFY="$OPENSSL verify"
 | 
			
		||||
X509="$OPENSSL x509"
 | 
			
		||||
DAYS="-days 365"
 | 
			
		||||
REQ="openssl req $SSLEAY_CONFIG"
 | 
			
		||||
CA="openssl ca $SSLEAY_CONFIG"
 | 
			
		||||
VERIFY="openssl verify"
 | 
			
		||||
X509="openssl x509"
 | 
			
		||||
 | 
			
		||||
CATOP=./demoCA
 | 
			
		||||
CAKEY=./cakey.pem
 | 
			
		||||
CAREQ=./careq.pem
 | 
			
		||||
CACERT=./cacert.pem
 | 
			
		||||
 | 
			
		||||
for i
 | 
			
		||||
@@ -53,15 +49,15 @@ case $i in
 | 
			
		||||
    ;;
 | 
			
		||||
-newcert) 
 | 
			
		||||
    # create a certificate
 | 
			
		||||
    $REQ -new -x509 -keyout newkey.pem -out newcert.pem $DAYS
 | 
			
		||||
    $REQ -new -x509 -keyout newreq.pem -out newreq.pem $DAYS
 | 
			
		||||
    RET=$?
 | 
			
		||||
    echo "Certificate is in newcert.pem, private key is in newkey.pem"
 | 
			
		||||
    echo "Certificate (and private key) is in newreq.pem"
 | 
			
		||||
    ;;
 | 
			
		||||
-newreq) 
 | 
			
		||||
    # create a certificate request
 | 
			
		||||
    $REQ -new -keyout newkey.pem -out newreq.pem $DAYS
 | 
			
		||||
    $REQ -new -keyout newreq.pem -out newreq.pem $DAYS
 | 
			
		||||
    RET=$?
 | 
			
		||||
    echo "Request is in newreq.pem, private key is in newkey.pem"
 | 
			
		||||
    echo "Request (and private key) is in newreq.pem"
 | 
			
		||||
    ;;
 | 
			
		||||
-newca)     
 | 
			
		||||
    # if explicitly asked for or it doesn't exist then setup the directory
 | 
			
		||||
@@ -74,7 +70,7 @@ case $i in
 | 
			
		||||
	mkdir ${CATOP}/crl 
 | 
			
		||||
	mkdir ${CATOP}/newcerts
 | 
			
		||||
	mkdir ${CATOP}/private
 | 
			
		||||
	echo "00" > ${CATOP}/serial
 | 
			
		||||
	echo "01" > ${CATOP}/serial
 | 
			
		||||
	touch ${CATOP}/index.txt
 | 
			
		||||
    fi
 | 
			
		||||
    if [ ! -f ${CATOP}/private/$CAKEY ]; then
 | 
			
		||||
@@ -87,11 +83,8 @@ case $i in
 | 
			
		||||
	    RET=$?
 | 
			
		||||
	else
 | 
			
		||||
	    echo "Making CA certificate ..."
 | 
			
		||||
	    $REQ -new -keyout ${CATOP}/private/$CAKEY \
 | 
			
		||||
			   -out ${CATOP}/$CAREQ
 | 
			
		||||
	    $CA -out ${CATOP}/$CACERT $CADAYS -batch \
 | 
			
		||||
			   -keyfile ${CATOP}/private/$CAKEY -selfsign \
 | 
			
		||||
			   -infiles ${CATOP}/$CAREQ 
 | 
			
		||||
	    $REQ -new -x509 -keyout ${CATOP}/private/$CAKEY \
 | 
			
		||||
			   -out ${CATOP}/$CACERT $DAYS
 | 
			
		||||
	    RET=$?
 | 
			
		||||
	fi
 | 
			
		||||
    fi
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										923
									
								
								apps/Makefile
									
									
									
									
									
								
							
							
						
						
									
										923
									
								
								apps/Makefile
									
									
									
									
									
								
							@@ -1,923 +0,0 @@
 | 
			
		||||
#
 | 
			
		||||
#  apps/Makefile
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
DIR=		apps
 | 
			
		||||
TOP=		..
 | 
			
		||||
CC=		cc
 | 
			
		||||
INCLUDES=	-I$(TOP) -I../include $(KRB5_INCLUDES)
 | 
			
		||||
CFLAG=		-g -static
 | 
			
		||||
MAKEFILE=	Makefile
 | 
			
		||||
PERL=		perl
 | 
			
		||||
RM=		rm -f
 | 
			
		||||
# KRB5 stuff
 | 
			
		||||
KRB5_INCLUDES=
 | 
			
		||||
LIBKRB5=
 | 
			
		||||
 | 
			
		||||
PEX_LIBS=
 | 
			
		||||
EX_LIBS= 
 | 
			
		||||
EXE_EXT= 
 | 
			
		||||
 | 
			
		||||
SHLIB_TARGET=
 | 
			
		||||
 | 
			
		||||
CFLAGS= -DMONOLITH $(INCLUDES) $(CFLAG)
 | 
			
		||||
 | 
			
		||||
GENERAL=Makefile makeapps.com install.com
 | 
			
		||||
 | 
			
		||||
DLIBCRYPTO=../libcrypto.a
 | 
			
		||||
DLIBSSL=../libssl.a
 | 
			
		||||
LIBCRYPTO=-L.. -lcrypto
 | 
			
		||||
LIBSSL=-L.. -lssl
 | 
			
		||||
 | 
			
		||||
PROGRAM= openssl
 | 
			
		||||
 | 
			
		||||
SCRIPTS=CA.sh CA.pl
 | 
			
		||||
 | 
			
		||||
EXE= $(PROGRAM)$(EXE_EXT)
 | 
			
		||||
 | 
			
		||||
E_EXE=	verify asn1pars req dgst dh dhparam enc passwd gendh errstr \
 | 
			
		||||
	ca crl rsa rsautl dsa dsaparam ec ecparam \
 | 
			
		||||
	x509 genrsa gendsa s_server s_client speed \
 | 
			
		||||
	s_time version pkcs7 crl2pkcs7 sess_id ciphers nseq pkcs12 \
 | 
			
		||||
	pkcs8 spkac smime rand engine ocsp prime
 | 
			
		||||
 | 
			
		||||
PROGS= $(PROGRAM).c
 | 
			
		||||
 | 
			
		||||
A_OBJ=apps.o
 | 
			
		||||
A_SRC=apps.c
 | 
			
		||||
S_OBJ=	s_cb.o s_socket.o
 | 
			
		||||
S_SRC=	s_cb.c s_socket.c
 | 
			
		||||
RAND_OBJ=app_rand.o
 | 
			
		||||
RAND_SRC=app_rand.c
 | 
			
		||||
 | 
			
		||||
E_OBJ=	verify.o asn1pars.o req.o dgst.o dh.o dhparam.o enc.o passwd.o gendh.o errstr.o \
 | 
			
		||||
	ca.o pkcs7.o crl2p7.o crl.o \
 | 
			
		||||
	rsa.o rsautl.o dsa.o dsaparam.o ec.o ecparam.o \
 | 
			
		||||
	x509.o genrsa.o gendsa.o s_server.o s_client.o speed.o \
 | 
			
		||||
	s_time.o $(A_OBJ) $(S_OBJ) $(RAND_OBJ) version.o sess_id.o \
 | 
			
		||||
	ciphers.o nseq.o pkcs12.o pkcs8.o spkac.o smime.o rand.o engine.o \
 | 
			
		||||
	ocsp.o prime.o
 | 
			
		||||
 | 
			
		||||
E_SRC=	verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.c \
 | 
			
		||||
	pkcs7.c crl2p7.c crl.c \
 | 
			
		||||
	rsa.c rsautl.c dsa.c dsaparam.c ec.c ecparam.c \
 | 
			
		||||
	x509.c genrsa.c gendsa.c s_server.c s_client.c speed.c \
 | 
			
		||||
	s_time.c $(A_SRC) $(S_SRC) $(RAND_SRC) version.c sess_id.c \
 | 
			
		||||
	ciphers.c nseq.c pkcs12.c pkcs8.c spkac.c smime.c rand.c engine.c \
 | 
			
		||||
	ocsp.c prime.c
 | 
			
		||||
 | 
			
		||||
SRC=$(E_SRC)
 | 
			
		||||
 | 
			
		||||
EXHEADER=
 | 
			
		||||
HEADER=	apps.h progs.h s_apps.h \
 | 
			
		||||
	testdsa.h testrsa.h \
 | 
			
		||||
	$(EXHEADER)
 | 
			
		||||
 | 
			
		||||
ALL=    $(GENERAL) $(SRC) $(HEADER)
 | 
			
		||||
 | 
			
		||||
top:
 | 
			
		||||
	@(cd ..; $(MAKE) DIRS=$(DIR) all)
 | 
			
		||||
 | 
			
		||||
all:	exe
 | 
			
		||||
 | 
			
		||||
exe:	$(EXE)
 | 
			
		||||
 | 
			
		||||
req: sreq.o $(A_OBJ) $(DLIBCRYPTO)
 | 
			
		||||
	shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
 | 
			
		||||
		shlib_target="$(SHLIB_TARGET)"; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	$(MAKE) -f $(TOP)/Makefile.shared -e \
 | 
			
		||||
		APPNAME=req OBJECTS="sreq.o $(A_OBJ) $(RAND_OBJ)" \
 | 
			
		||||
		LIBDEPS="$(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)" \
 | 
			
		||||
		link_app.$${shlib_target}
 | 
			
		||||
 | 
			
		||||
sreq.o: req.c 
 | 
			
		||||
	$(CC) -c $(INCLUDES) $(CFLAG) -o sreq.o req.c
 | 
			
		||||
 | 
			
		||||
files:
 | 
			
		||||
	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 | 
			
		||||
 | 
			
		||||
install:
 | 
			
		||||
	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
 | 
			
		||||
	@set -e; for i in $(EXE); \
 | 
			
		||||
	do  \
 | 
			
		||||
	(echo installing $$i; \
 | 
			
		||||
	 cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
 | 
			
		||||
	 chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
 | 
			
		||||
	 mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \
 | 
			
		||||
	 done;
 | 
			
		||||
	@set -e; for i in $(SCRIPTS); \
 | 
			
		||||
	do  \
 | 
			
		||||
	(echo installing $$i; \
 | 
			
		||||
	 cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
 | 
			
		||||
	 chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
 | 
			
		||||
	 mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
 | 
			
		||||
	 done
 | 
			
		||||
	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
 | 
			
		||||
	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
 | 
			
		||||
	mv -f  $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
 | 
			
		||||
 | 
			
		||||
tags:
 | 
			
		||||
	ctags $(SRC)
 | 
			
		||||
 | 
			
		||||
tests:
 | 
			
		||||
 | 
			
		||||
links:
 | 
			
		||||
 | 
			
		||||
lint:
 | 
			
		||||
	lint -DLINT $(INCLUDES) $(SRC)>fluff
 | 
			
		||||
 | 
			
		||||
depend:
 | 
			
		||||
	@if [ -z "$(THIS)" ]; then \
 | 
			
		||||
	    $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
 | 
			
		||||
	else \
 | 
			
		||||
	    $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \
 | 
			
		||||
	fi
 | 
			
		||||
 | 
			
		||||
dclean:
 | 
			
		||||
	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
 | 
			
		||||
	mv -f Makefile.new $(MAKEFILE)
 | 
			
		||||
 | 
			
		||||
clean:
 | 
			
		||||
	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE)
 | 
			
		||||
	rm -f req
 | 
			
		||||
 | 
			
		||||
$(DLIBSSL):
 | 
			
		||||
	(cd ..; $(MAKE) DIRS=ssl all)
 | 
			
		||||
 | 
			
		||||
$(DLIBCRYPTO):
 | 
			
		||||
	(cd ..; $(MAKE) DIRS=crypto all)
 | 
			
		||||
 | 
			
		||||
$(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
 | 
			
		||||
	$(RM) $(EXE)
 | 
			
		||||
	shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
 | 
			
		||||
		shlib_target="$(SHLIB_TARGET)"; \
 | 
			
		||||
	elif [ -n "$(FIPSCANLIB)" ]; then \
 | 
			
		||||
	  FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
 | 
			
		||||
	fi; \
 | 
			
		||||
	LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
 | 
			
		||||
	[ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
 | 
			
		||||
	$(MAKE) -f $(TOP)/Makefile.shared -e \
 | 
			
		||||
		CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
 | 
			
		||||
		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 | 
			
		||||
		link_app.$${shlib_target}
 | 
			
		||||
 | 
			
		||||
progs.h: progs.pl
 | 
			
		||||
	$(PERL) progs.pl $(E_EXE) >progs.h
 | 
			
		||||
	$(RM) $(PROGRAM).o
 | 
			
		||||
 | 
			
		||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
 | 
			
		||||
 | 
			
		||||
app_rand.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
app_rand.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
app_rand.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
app_rand.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
app_rand.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
app_rand.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
app_rand.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 | 
			
		||||
app_rand.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
app_rand.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 | 
			
		||||
app_rand.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 | 
			
		||||
app_rand.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
app_rand.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
app_rand.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
app_rand.o: ../include/openssl/x509_vfy.h app_rand.c apps.h
 | 
			
		||||
apps.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
apps.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
apps.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
apps.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
apps.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
apps.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
apps.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
apps.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 | 
			
		||||
apps.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
apps.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 | 
			
		||||
apps.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
apps.o: ../include/openssl/pkcs12.h ../include/openssl/pkcs7.h
 | 
			
		||||
apps.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
apps.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
apps.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 | 
			
		||||
apps.o: ../include/openssl/ui.h ../include/openssl/x509.h
 | 
			
		||||
apps.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.c apps.h
 | 
			
		||||
asn1pars.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
asn1pars.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
asn1pars.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
asn1pars.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
asn1pars.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
asn1pars.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
asn1pars.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
asn1pars.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
asn1pars.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
asn1pars.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
asn1pars.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
asn1pars.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
asn1pars.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
asn1pars.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
asn1pars.o: ../include/openssl/x509_vfy.h apps.h asn1pars.c
 | 
			
		||||
ca.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
ca.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
ca.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
ca.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
ca.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
ca.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
ca.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
ca.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 | 
			
		||||
ca.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
 | 
			
		||||
ca.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
ca.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
ca.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
ca.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
ca.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
ca.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
ca.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ca.c
 | 
			
		||||
ciphers.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
ciphers.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
ciphers.o: ../include/openssl/comp.h ../include/openssl/conf.h
 | 
			
		||||
ciphers.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
 | 
			
		||||
ciphers.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
ciphers.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
ciphers.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
ciphers.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
ciphers.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
 | 
			
		||||
ciphers.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
ciphers.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
ciphers.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
ciphers.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
ciphers.o: ../include/openssl/pq_compat.h ../include/openssl/pqueue.h
 | 
			
		||||
ciphers.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
ciphers.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 | 
			
		||||
ciphers.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 | 
			
		||||
ciphers.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
ciphers.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
 | 
			
		||||
ciphers.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
ciphers.o: ciphers.c
 | 
			
		||||
crl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
crl.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
crl.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
crl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
crl.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
crl.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
crl.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
crl.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
crl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
crl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
crl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
crl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
crl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
crl.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
crl.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h crl.c
 | 
			
		||||
crl2p7.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
crl2p7.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
crl2p7.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
crl2p7.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
crl2p7.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
crl2p7.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
crl2p7.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
crl2p7.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
crl2p7.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
crl2p7.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
crl2p7.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
crl2p7.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
crl2p7.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
crl2p7.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
crl2p7.o: ../include/openssl/x509_vfy.h apps.h crl2p7.c
 | 
			
		||||
dgst.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
dgst.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
dgst.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
dgst.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
dgst.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
dgst.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
dgst.o: ../include/openssl/fips.h ../include/openssl/hmac.h
 | 
			
		||||
dgst.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 | 
			
		||||
dgst.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
dgst.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 | 
			
		||||
dgst.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
dgst.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
 | 
			
		||||
dgst.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
dgst.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 | 
			
		||||
dgst.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h dgst.c
 | 
			
		||||
dh.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
dh.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
dh.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
dh.o: ../include/openssl/dh.h ../include/openssl/e_os2.h
 | 
			
		||||
dh.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
dh.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
dh.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
dh.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
dh.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
dh.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
dh.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
dh.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
dh.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
dh.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
dh.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
dh.o: ../include/openssl/x509_vfy.h apps.h dh.c
 | 
			
		||||
dsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
dsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
dsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
dsa.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
 | 
			
		||||
dsa.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
dsa.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
dsa.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
dsa.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
dsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
dsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
dsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
dsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
dsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
dsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
dsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
dsa.o: ../include/openssl/x509_vfy.h apps.h dsa.c
 | 
			
		||||
dsaparam.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
dsaparam.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
dsaparam.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
dsaparam.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
dsaparam.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
dsaparam.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
dsaparam.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
dsaparam.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
dsaparam.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 | 
			
		||||
dsaparam.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
dsaparam.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 | 
			
		||||
dsaparam.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
dsaparam.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 | 
			
		||||
dsaparam.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
dsaparam.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
dsaparam.o: ../include/openssl/store.h ../include/openssl/symhacks.h
 | 
			
		||||
dsaparam.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
 | 
			
		||||
dsaparam.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
dsaparam.o: dsaparam.c
 | 
			
		||||
ec.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
ec.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
ec.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
ec.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
ec.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
ec.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
ec.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
ec.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
ec.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
ec.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
ec.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
ec.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
ec.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
ec.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
ec.o: ../include/openssl/x509_vfy.h apps.h ec.c
 | 
			
		||||
ecparam.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
ecparam.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
ecparam.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
ecparam.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
ecparam.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
ecparam.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
ecparam.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
ecparam.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 | 
			
		||||
ecparam.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
ecparam.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 | 
			
		||||
ecparam.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
ecparam.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
 | 
			
		||||
ecparam.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
ecparam.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 | 
			
		||||
ecparam.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
ecparam.o: ecparam.c
 | 
			
		||||
enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
enc.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
enc.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
enc.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
enc.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
enc.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
enc.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
enc.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
enc.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
enc.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
enc.o: ../include/openssl/rand.h ../include/openssl/safestack.h
 | 
			
		||||
enc.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
enc.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 | 
			
		||||
enc.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h enc.c
 | 
			
		||||
engine.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
engine.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
engine.o: ../include/openssl/comp.h ../include/openssl/conf.h
 | 
			
		||||
engine.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
 | 
			
		||||
engine.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
engine.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
engine.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
engine.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
engine.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
 | 
			
		||||
engine.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
engine.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
engine.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
engine.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
engine.o: ../include/openssl/pq_compat.h ../include/openssl/pqueue.h
 | 
			
		||||
engine.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
engine.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 | 
			
		||||
engine.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 | 
			
		||||
engine.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
engine.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
 | 
			
		||||
engine.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
engine.o: engine.c
 | 
			
		||||
errstr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
errstr.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
errstr.o: ../include/openssl/comp.h ../include/openssl/conf.h
 | 
			
		||||
errstr.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
 | 
			
		||||
errstr.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
errstr.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
errstr.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
errstr.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
errstr.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
 | 
			
		||||
errstr.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
errstr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
errstr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
errstr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
errstr.o: ../include/openssl/pq_compat.h ../include/openssl/pqueue.h
 | 
			
		||||
errstr.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
errstr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 | 
			
		||||
errstr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 | 
			
		||||
errstr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
errstr.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
 | 
			
		||||
errstr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
errstr.o: errstr.c
 | 
			
		||||
gendh.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
gendh.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
gendh.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
gendh.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
gendh.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
gendh.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
gendh.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
gendh.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
gendh.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 | 
			
		||||
gendh.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
gendh.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 | 
			
		||||
gendh.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
gendh.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 | 
			
		||||
gendh.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
gendh.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
gendh.o: ../include/openssl/store.h ../include/openssl/symhacks.h
 | 
			
		||||
gendh.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
 | 
			
		||||
gendh.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h gendh.c
 | 
			
		||||
gendsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
gendsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
gendsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
gendsa.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
 | 
			
		||||
gendsa.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
gendsa.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
gendsa.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
gendsa.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
gendsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
gendsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
gendsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
gendsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
gendsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
gendsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
gendsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
gendsa.o: ../include/openssl/x509_vfy.h apps.h gendsa.c
 | 
			
		||||
genrsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
genrsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
genrsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
genrsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
genrsa.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
genrsa.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
genrsa.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
genrsa.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
genrsa.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 | 
			
		||||
genrsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
genrsa.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 | 
			
		||||
genrsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
genrsa.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 | 
			
		||||
genrsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
genrsa.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
genrsa.o: ../include/openssl/store.h ../include/openssl/symhacks.h
 | 
			
		||||
genrsa.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
 | 
			
		||||
genrsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
genrsa.o: genrsa.c
 | 
			
		||||
nseq.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
nseq.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
nseq.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
nseq.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
nseq.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
nseq.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
nseq.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
nseq.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
nseq.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
nseq.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
nseq.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
nseq.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
nseq.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
nseq.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
nseq.o: ../include/openssl/x509_vfy.h apps.h nseq.c
 | 
			
		||||
ocsp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
ocsp.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
ocsp.o: ../include/openssl/comp.h ../include/openssl/conf.h
 | 
			
		||||
ocsp.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
 | 
			
		||||
ocsp.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
ocsp.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
ocsp.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
ocsp.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
ocsp.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
 | 
			
		||||
ocsp.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
ocsp.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
 | 
			
		||||
ocsp.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 | 
			
		||||
ocsp.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
ocsp.o: ../include/openssl/pkcs7.h ../include/openssl/pq_compat.h
 | 
			
		||||
ocsp.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
 | 
			
		||||
ocsp.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 | 
			
		||||
ocsp.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
 | 
			
		||||
ocsp.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 | 
			
		||||
ocsp.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
 | 
			
		||||
ocsp.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
ocsp.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ocsp.c
 | 
			
		||||
openssl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
openssl.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
openssl.o: ../include/openssl/comp.h ../include/openssl/conf.h
 | 
			
		||||
openssl.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
 | 
			
		||||
openssl.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
openssl.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
openssl.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
openssl.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
openssl.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
 | 
			
		||||
openssl.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
openssl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
openssl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
openssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
openssl.o: ../include/openssl/pq_compat.h ../include/openssl/pqueue.h
 | 
			
		||||
openssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
openssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 | 
			
		||||
openssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 | 
			
		||||
openssl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
openssl.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
 | 
			
		||||
openssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
openssl.o: openssl.c progs.h s_apps.h
 | 
			
		||||
passwd.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
passwd.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
passwd.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
passwd.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h
 | 
			
		||||
passwd.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
passwd.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
passwd.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
passwd.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
passwd.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h
 | 
			
		||||
passwd.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
passwd.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 | 
			
		||||
passwd.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 | 
			
		||||
passwd.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
passwd.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
passwd.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
 | 
			
		||||
passwd.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
 | 
			
		||||
passwd.o: ../include/openssl/x509_vfy.h apps.h passwd.c
 | 
			
		||||
pkcs12.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
pkcs12.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
pkcs12.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
pkcs12.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
pkcs12.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
pkcs12.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
pkcs12.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
pkcs12.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
pkcs12.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
pkcs12.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
pkcs12.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h
 | 
			
		||||
pkcs12.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
 | 
			
		||||
pkcs12.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
pkcs12.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 | 
			
		||||
pkcs12.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
pkcs12.o: pkcs12.c
 | 
			
		||||
pkcs7.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
pkcs7.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
pkcs7.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
pkcs7.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
pkcs7.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
pkcs7.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
pkcs7.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
pkcs7.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
pkcs7.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
pkcs7.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
pkcs7.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
pkcs7.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
pkcs7.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
pkcs7.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
pkcs7.o: ../include/openssl/x509_vfy.h apps.h pkcs7.c
 | 
			
		||||
pkcs8.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
pkcs8.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
pkcs8.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
pkcs8.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
pkcs8.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
pkcs8.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
pkcs8.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
pkcs8.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
pkcs8.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
pkcs8.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
pkcs8.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h
 | 
			
		||||
pkcs8.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
 | 
			
		||||
pkcs8.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
pkcs8.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 | 
			
		||||
pkcs8.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h pkcs8.c
 | 
			
		||||
prime.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
prime.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
prime.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
prime.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
prime.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
prime.o: ../include/openssl/engine.h ../include/openssl/evp.h
 | 
			
		||||
prime.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
prime.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
prime.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
prime.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
 | 
			
		||||
prime.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
prime.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
prime.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
prime.o: ../include/openssl/x509_vfy.h apps.h prime.c
 | 
			
		||||
rand.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
rand.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
rand.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
rand.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
rand.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
rand.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
rand.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
rand.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
rand.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
rand.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
 | 
			
		||||
rand.o: ../include/openssl/rand.h ../include/openssl/safestack.h
 | 
			
		||||
rand.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
rand.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 | 
			
		||||
rand.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h rand.c
 | 
			
		||||
req.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
req.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
req.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
req.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
req.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
req.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
req.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
req.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
req.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 | 
			
		||||
req.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
req.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 | 
			
		||||
req.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
req.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 | 
			
		||||
req.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
req.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
req.o: ../include/openssl/store.h ../include/openssl/symhacks.h
 | 
			
		||||
req.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
 | 
			
		||||
req.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
 | 
			
		||||
req.o: ../include/openssl/x509v3.h apps.h req.c
 | 
			
		||||
rsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
rsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
rsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
rsa.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
rsa.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
rsa.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
rsa.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
rsa.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 | 
			
		||||
rsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
rsa.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 | 
			
		||||
rsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
rsa.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
 | 
			
		||||
rsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
rsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
rsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
rsa.o: ../include/openssl/x509_vfy.h apps.h rsa.c
 | 
			
		||||
rsautl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
rsautl.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
rsautl.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
rsautl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
rsautl.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
rsautl.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
rsautl.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
rsautl.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
rsautl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
rsautl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
rsautl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
rsautl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
rsautl.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
rsautl.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 | 
			
		||||
rsautl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
rsautl.o: rsautl.c
 | 
			
		||||
s_cb.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
s_cb.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
s_cb.o: ../include/openssl/comp.h ../include/openssl/conf.h
 | 
			
		||||
s_cb.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
 | 
			
		||||
s_cb.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
s_cb.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
s_cb.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
s_cb.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
s_cb.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
 | 
			
		||||
s_cb.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
s_cb.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
s_cb.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
s_cb.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
s_cb.o: ../include/openssl/pq_compat.h ../include/openssl/pqueue.h
 | 
			
		||||
s_cb.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
s_cb.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 | 
			
		||||
s_cb.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 | 
			
		||||
s_cb.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
s_cb.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
 | 
			
		||||
s_cb.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h s_apps.h
 | 
			
		||||
s_cb.o: s_cb.c
 | 
			
		||||
s_client.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
s_client.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
s_client.o: ../include/openssl/comp.h ../include/openssl/conf.h
 | 
			
		||||
s_client.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
 | 
			
		||||
s_client.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
s_client.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
s_client.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
s_client.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
s_client.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
 | 
			
		||||
s_client.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
s_client.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
s_client.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
s_client.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
s_client.o: ../include/openssl/pq_compat.h ../include/openssl/pqueue.h
 | 
			
		||||
s_client.o: ../include/openssl/rand.h ../include/openssl/safestack.h
 | 
			
		||||
s_client.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 | 
			
		||||
s_client.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
 | 
			
		||||
s_client.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 | 
			
		||||
s_client.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
 | 
			
		||||
s_client.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
s_client.o: ../include/openssl/x509_vfy.h apps.h s_apps.h s_client.c timeouts.h
 | 
			
		||||
s_server.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
s_server.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
s_server.o: ../include/openssl/comp.h ../include/openssl/conf.h
 | 
			
		||||
s_server.o: ../include/openssl/crypto.h ../include/openssl/dh.h
 | 
			
		||||
s_server.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h
 | 
			
		||||
s_server.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
s_server.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
s_server.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
s_server.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
s_server.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
 | 
			
		||||
s_server.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
s_server.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
s_server.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
s_server.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
s_server.o: ../include/openssl/pq_compat.h ../include/openssl/pqueue.h
 | 
			
		||||
s_server.o: ../include/openssl/rand.h ../include/openssl/rsa.h
 | 
			
		||||
s_server.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
s_server.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 | 
			
		||||
s_server.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 | 
			
		||||
s_server.o: ../include/openssl/stack.h ../include/openssl/store.h
 | 
			
		||||
s_server.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
 | 
			
		||||
s_server.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
 | 
			
		||||
s_server.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
s_server.o: s_apps.h s_server.c timeouts.h
 | 
			
		||||
s_socket.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
s_socket.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
s_socket.o: ../include/openssl/comp.h ../include/openssl/conf.h
 | 
			
		||||
s_socket.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
 | 
			
		||||
s_socket.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
s_socket.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
s_socket.o: ../include/openssl/engine.h ../include/openssl/evp.h
 | 
			
		||||
s_socket.o: ../include/openssl/fips.h ../include/openssl/kssl.h
 | 
			
		||||
s_socket.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
 | 
			
		||||
s_socket.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
s_socket.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 | 
			
		||||
s_socket.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
s_socket.o: ../include/openssl/pkcs7.h ../include/openssl/pq_compat.h
 | 
			
		||||
s_socket.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
 | 
			
		||||
s_socket.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 | 
			
		||||
s_socket.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
 | 
			
		||||
s_socket.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 | 
			
		||||
s_socket.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
 | 
			
		||||
s_socket.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
s_socket.o: ../include/openssl/x509_vfy.h apps.h s_apps.h s_socket.c
 | 
			
		||||
s_time.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
s_time.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
s_time.o: ../include/openssl/comp.h ../include/openssl/conf.h
 | 
			
		||||
s_time.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
 | 
			
		||||
s_time.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
s_time.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
s_time.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
s_time.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
s_time.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
 | 
			
		||||
s_time.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
s_time.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
s_time.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
s_time.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
s_time.o: ../include/openssl/pq_compat.h ../include/openssl/pqueue.h
 | 
			
		||||
s_time.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
s_time.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 | 
			
		||||
s_time.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 | 
			
		||||
s_time.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
s_time.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
 | 
			
		||||
s_time.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
s_time.o: s_apps.h s_time.c
 | 
			
		||||
sess_id.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
sess_id.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
sess_id.o: ../include/openssl/comp.h ../include/openssl/conf.h
 | 
			
		||||
sess_id.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
 | 
			
		||||
sess_id.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
sess_id.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
sess_id.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
sess_id.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
sess_id.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
 | 
			
		||||
sess_id.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
sess_id.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
sess_id.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
sess_id.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
sess_id.o: ../include/openssl/pq_compat.h ../include/openssl/pqueue.h
 | 
			
		||||
sess_id.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
sess_id.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 | 
			
		||||
sess_id.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 | 
			
		||||
sess_id.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
sess_id.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
 | 
			
		||||
sess_id.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
sess_id.o: sess_id.c
 | 
			
		||||
smime.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
smime.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
smime.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
smime.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
smime.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
smime.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
smime.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
smime.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
smime.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
smime.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
smime.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
smime.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
smime.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
smime.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
smime.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
 | 
			
		||||
smime.o: smime.c
 | 
			
		||||
speed.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h
 | 
			
		||||
speed.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
 | 
			
		||||
speed.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
speed.o: ../include/openssl/cast.h ../include/openssl/conf.h
 | 
			
		||||
speed.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
speed.o: ../include/openssl/des_old.h ../include/openssl/dsa.h
 | 
			
		||||
speed.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 | 
			
		||||
speed.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 | 
			
		||||
speed.o: ../include/openssl/engine.h ../include/openssl/err.h
 | 
			
		||||
speed.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
speed.o: ../include/openssl/hmac.h ../include/openssl/idea.h
 | 
			
		||||
speed.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 | 
			
		||||
speed.o: ../include/openssl/md4.h ../include/openssl/md5.h
 | 
			
		||||
speed.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
speed.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
speed.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
 | 
			
		||||
speed.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 | 
			
		||||
speed.o: ../include/openssl/rc4.h ../include/openssl/ripemd.h
 | 
			
		||||
speed.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
speed.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
speed.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 | 
			
		||||
speed.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
 | 
			
		||||
speed.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h speed.c
 | 
			
		||||
speed.o: testdsa.h testrsa.h
 | 
			
		||||
spkac.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
spkac.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
spkac.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
spkac.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
spkac.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
spkac.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
spkac.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
spkac.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
spkac.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
spkac.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
spkac.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
spkac.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
spkac.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
spkac.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
spkac.o: ../include/openssl/x509_vfy.h apps.h spkac.c
 | 
			
		||||
verify.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
verify.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
verify.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 | 
			
		||||
verify.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
verify.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
verify.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
verify.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
verify.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
verify.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
verify.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
verify.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
verify.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
verify.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
verify.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 | 
			
		||||
verify.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
 | 
			
		||||
verify.o: verify.c
 | 
			
		||||
version.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
version.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
version.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 | 
			
		||||
version.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
version.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h
 | 
			
		||||
version.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
version.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
version.o: ../include/openssl/evp.h ../include/openssl/fips.h
 | 
			
		||||
version.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 | 
			
		||||
version.o: ../include/openssl/md2.h ../include/openssl/obj_mac.h
 | 
			
		||||
version.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
version.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 | 
			
		||||
version.o: ../include/openssl/pkcs7.h ../include/openssl/rc4.h
 | 
			
		||||
version.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
version.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 | 
			
		||||
version.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
 | 
			
		||||
version.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
 | 
			
		||||
version.o: ../include/openssl/x509_vfy.h apps.h version.c
 | 
			
		||||
x509.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
x509.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 | 
			
		||||
x509.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
x509.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
 | 
			
		||||
x509.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 | 
			
		||||
x509.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 | 
			
		||||
x509.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
x509.o: ../include/openssl/fips.h ../include/openssl/lhash.h
 | 
			
		||||
x509.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 | 
			
		||||
x509.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
x509.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 | 
			
		||||
x509.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
x509.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
x509.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
x509.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 | 
			
		||||
x509.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
 | 
			
		||||
x509.o: ../include/openssl/x509v3.h apps.h x509.c
 | 
			
		||||
							
								
								
									
										804
									
								
								apps/Makefile.ssl
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										804
									
								
								apps/Makefile.ssl
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,804 @@
 | 
			
		||||
#
 | 
			
		||||
#  apps/Makefile.ssl
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
DIR=		apps
 | 
			
		||||
TOP=		..
 | 
			
		||||
CC=		cc
 | 
			
		||||
INCLUDES=	-I../include
 | 
			
		||||
CFLAG=		-g -static
 | 
			
		||||
INSTALL_PREFIX=
 | 
			
		||||
INSTALLTOP=	/usr/local/ssl
 | 
			
		||||
OPENSSLDIR=	/usr/local/ssl
 | 
			
		||||
MAKE=		make -f Makefile.ssl
 | 
			
		||||
MAKEDEPEND=	$(TOP)/util/domd $(TOP)
 | 
			
		||||
MAKEFILE=	Makefile.ssl
 | 
			
		||||
PERL=/usr/local/bin/perl
 | 
			
		||||
RM=		rm -f
 | 
			
		||||
 | 
			
		||||
PEX_LIBS=
 | 
			
		||||
EX_LIBS= 
 | 
			
		||||
 | 
			
		||||
CFLAGS= -DMONOLITH $(INCLUDES) $(CFLAG)
 | 
			
		||||
 | 
			
		||||
GENERAL=Makefile makeapps.com install.com
 | 
			
		||||
 | 
			
		||||
DLIBCRYPTO=../libcrypto.a
 | 
			
		||||
DLIBSSL=../libssl.a
 | 
			
		||||
LIBCRYPTO=-L.. -lcrypto
 | 
			
		||||
LIBSSL=-L.. -lssl
 | 
			
		||||
 | 
			
		||||
PROGRAM= openssl
 | 
			
		||||
 | 
			
		||||
SCRIPTS=CA.sh CA.pl der_chop
 | 
			
		||||
 | 
			
		||||
EXE= $(PROGRAM)
 | 
			
		||||
 | 
			
		||||
E_EXE=	verify asn1pars req dgst dh dhparam enc passwd gendh errstr \
 | 
			
		||||
	ca crl rsa dsa dsaparam \
 | 
			
		||||
	x509 genrsa gendsa s_server s_client speed \
 | 
			
		||||
	s_time version pkcs7 crl2pkcs7 sess_id ciphers nseq pkcs12 \
 | 
			
		||||
	pkcs8 spkac smime
 | 
			
		||||
 | 
			
		||||
PROGS= $(PROGRAM).c
 | 
			
		||||
 | 
			
		||||
A_OBJ=apps.o
 | 
			
		||||
A_SRC=apps.c
 | 
			
		||||
S_OBJ=	s_cb.o s_socket.o
 | 
			
		||||
S_SRC=	s_cb.c s_socket.c
 | 
			
		||||
RAND_OBJ=app_rand.o
 | 
			
		||||
RAND_SRC=app_rand.c
 | 
			
		||||
 | 
			
		||||
E_OBJ=	verify.o asn1pars.o req.o dgst.o dh.o dhparam.o enc.o passwd.o gendh.o errstr.o \
 | 
			
		||||
	ca.o pkcs7.o crl2p7.o crl.o \
 | 
			
		||||
	rsa.o dsa.o dsaparam.o \
 | 
			
		||||
	x509.o genrsa.o gendsa.o s_server.o s_client.o speed.o \
 | 
			
		||||
	s_time.o $(A_OBJ) $(S_OBJ) $(RAND_OBJ) version.o sess_id.o \
 | 
			
		||||
	ciphers.o nseq.o pkcs12.o pkcs8.o spkac.o smime.o
 | 
			
		||||
 | 
			
		||||
#	pem_mail.o
 | 
			
		||||
 | 
			
		||||
E_SRC=	verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.c \
 | 
			
		||||
	pkcs7.c crl2p7.c crl.c \
 | 
			
		||||
	rsa.c dsa.c dsaparam.c \
 | 
			
		||||
	x509.c genrsa.c gendsa.c s_server.c s_client.c speed.c \
 | 
			
		||||
	s_time.c $(A_SRC) $(S_SRC) $(RAND_SRC) version.c sess_id.c \
 | 
			
		||||
	ciphers.c nseq.c pkcs12.c pkcs8.c spkac.c smime.c
 | 
			
		||||
 | 
			
		||||
#	pem_mail.c
 | 
			
		||||
 | 
			
		||||
SRC=$(E_SRC)
 | 
			
		||||
 | 
			
		||||
EXHEADER=
 | 
			
		||||
HEADER=	apps.h progs.h s_apps.h \
 | 
			
		||||
	testdsa.h testrsa.h \
 | 
			
		||||
	$(EXHEADER)
 | 
			
		||||
 | 
			
		||||
ALL=    $(GENERAL) $(SRC) $(HEADER)
 | 
			
		||||
 | 
			
		||||
top:
 | 
			
		||||
	@(cd ..; $(MAKE) DIRS=$(DIR) all)
 | 
			
		||||
 | 
			
		||||
all:	exe
 | 
			
		||||
 | 
			
		||||
exe:	$(EXE)
 | 
			
		||||
 | 
			
		||||
req: sreq.o $(A_OBJ) $(DLIBCRYPTO)
 | 
			
		||||
	$(CC) -o req $(CFLAG) sreq.o $(A_OBJ) $(RAND_OBJ) $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
 | 
			
		||||
 | 
			
		||||
sreq.o: req.c 
 | 
			
		||||
	$(CC) -c $(INCLUDES) $(CFLAG) -o sreq.o req.c
 | 
			
		||||
 | 
			
		||||
files:
 | 
			
		||||
	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
 | 
			
		||||
 | 
			
		||||
install:
 | 
			
		||||
	@for i in $(EXE); \
 | 
			
		||||
	do  \
 | 
			
		||||
	(echo installing $$i; \
 | 
			
		||||
	 cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
 | 
			
		||||
	 chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \
 | 
			
		||||
	 done;
 | 
			
		||||
	@for i in $(SCRIPTS); \
 | 
			
		||||
	do  \
 | 
			
		||||
	(echo installing $$i; \
 | 
			
		||||
	 cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
 | 
			
		||||
	 chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
 | 
			
		||||
	 done
 | 
			
		||||
	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR); \
 | 
			
		||||
	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
 | 
			
		||||
 | 
			
		||||
tags:
 | 
			
		||||
	ctags $(SRC)
 | 
			
		||||
 | 
			
		||||
tests:
 | 
			
		||||
 | 
			
		||||
links:
 | 
			
		||||
	@$(TOP)/util/point.sh Makefile.ssl Makefile
 | 
			
		||||
 | 
			
		||||
lint:
 | 
			
		||||
	lint -DLINT $(INCLUDES) $(SRC)>fluff
 | 
			
		||||
 | 
			
		||||
depend:
 | 
			
		||||
	$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(SRC)
 | 
			
		||||
 | 
			
		||||
dclean:
 | 
			
		||||
	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
 | 
			
		||||
	mv -f Makefile.new $(MAKEFILE)
 | 
			
		||||
 | 
			
		||||
clean:
 | 
			
		||||
	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE)
 | 
			
		||||
	rm -f req
 | 
			
		||||
 | 
			
		||||
$(DLIBSSL):
 | 
			
		||||
	(cd ../ssl; $(MAKE))
 | 
			
		||||
 | 
			
		||||
$(DLIBCRYPTO):
 | 
			
		||||
	(cd ../crypto; $(MAKE))
 | 
			
		||||
 | 
			
		||||
$(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
 | 
			
		||||
	$(RM) $(PROGRAM)
 | 
			
		||||
	$(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)
 | 
			
		||||
	@(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
 | 
			
		||||
 | 
			
		||||
progs.h: progs.pl
 | 
			
		||||
	$(PERL) progs.pl $(E_EXE) >progs.h
 | 
			
		||||
	$(RM) $(PROGRAM).o
 | 
			
		||||
 | 
			
		||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
 | 
			
		||||
 | 
			
		||||
app_rand.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
app_rand.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
app_rand.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
app_rand.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
app_rand.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
app_rand.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
app_rand.o: ../include/openssl/evp.h ../include/openssl/idea.h
 | 
			
		||||
app_rand.o: ../include/openssl/md2.h ../include/openssl/md5.h
 | 
			
		||||
app_rand.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 | 
			
		||||
app_rand.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
app_rand.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 | 
			
		||||
app_rand.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
app_rand.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
app_rand.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
app_rand.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
app_rand.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
apps.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
apps.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
apps.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
apps.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
apps.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
apps.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
apps.o: ../include/openssl/evp.h ../include/openssl/idea.h
 | 
			
		||||
apps.o: ../include/openssl/md2.h ../include/openssl/md5.h
 | 
			
		||||
apps.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 | 
			
		||||
apps.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
apps.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 | 
			
		||||
apps.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 | 
			
		||||
apps.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 | 
			
		||||
apps.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
apps.o: ../include/openssl/stack.h ../include/openssl/x509.h
 | 
			
		||||
apps.o: ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
asn1pars.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
asn1pars.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
asn1pars.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
asn1pars.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
asn1pars.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
asn1pars.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
asn1pars.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
asn1pars.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
asn1pars.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
asn1pars.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
asn1pars.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
asn1pars.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
asn1pars.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
asn1pars.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
asn1pars.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
asn1pars.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
asn1pars.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
ca.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
ca.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
ca.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
ca.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
ca.o: ../include/openssl/des.h ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
ca.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
ca.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
ca.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 | 
			
		||||
ca.o: ../include/openssl/md2.h ../include/openssl/md5.h
 | 
			
		||||
ca.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 | 
			
		||||
ca.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
ca.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
ca.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 | 
			
		||||
ca.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 | 
			
		||||
ca.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 | 
			
		||||
ca.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
ca.o: ../include/openssl/stack.h ../include/openssl/txt_db.h
 | 
			
		||||
ca.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
 | 
			
		||||
ca.o: ../include/openssl/x509v3.h apps.h
 | 
			
		||||
ciphers.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
ciphers.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
ciphers.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
ciphers.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
ciphers.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
ciphers.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
ciphers.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
ciphers.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 | 
			
		||||
ciphers.o: ../include/openssl/md2.h ../include/openssl/md5.h
 | 
			
		||||
ciphers.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 | 
			
		||||
ciphers.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
ciphers.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
ciphers.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 | 
			
		||||
ciphers.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 | 
			
		||||
ciphers.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 | 
			
		||||
ciphers.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
ciphers.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 | 
			
		||||
ciphers.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 | 
			
		||||
ciphers.o: ../include/openssl/stack.h ../include/openssl/tls1.h
 | 
			
		||||
ciphers.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
crl.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
crl.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
crl.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
crl.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
crl.o: ../include/openssl/des.h ../include/openssl/dh.h
 | 
			
		||||
crl.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
 | 
			
		||||
crl.o: ../include/openssl/e_os2.h ../include/openssl/err.h
 | 
			
		||||
crl.o: ../include/openssl/evp.h ../include/openssl/idea.h
 | 
			
		||||
crl.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 | 
			
		||||
crl.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
crl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
crl.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
crl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
crl.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
crl.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
crl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
crl.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
crl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
 | 
			
		||||
crl.o: ../include/openssl/x509v3.h apps.h
 | 
			
		||||
crl2p7.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
crl2p7.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
crl2p7.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
crl2p7.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
crl2p7.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
crl2p7.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
crl2p7.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
crl2p7.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
crl2p7.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
crl2p7.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
crl2p7.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
crl2p7.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
crl2p7.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
crl2p7.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
crl2p7.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
crl2p7.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
crl2p7.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
dgst.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
dgst.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
dgst.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
dgst.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
dgst.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
dgst.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
dgst.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
dgst.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
dgst.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
dgst.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
dgst.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
dgst.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
dgst.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
dgst.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
dgst.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
dgst.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
dgst.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
dh.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
dh.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
dh.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
dh.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
dh.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
dh.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
dh.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
dh.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
dh.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
dh.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
dh.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
dh.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
dh.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
dh.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
dh.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
dh.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
dh.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
dsa.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
dsa.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
dsa.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
dsa.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
dsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
dsa.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
dsa.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
dsa.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
dsa.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
dsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
dsa.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
dsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
dsa.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
dsa.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
dsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
dsa.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
dsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
dsaparam.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
dsaparam.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
dsaparam.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
dsaparam.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
dsaparam.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
dsaparam.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
dsaparam.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
dsaparam.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
dsaparam.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
dsaparam.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
dsaparam.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
dsaparam.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
dsaparam.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
dsaparam.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
dsaparam.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
dsaparam.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
dsaparam.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
enc.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
enc.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
enc.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
enc.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
enc.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
enc.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
enc.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
enc.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
enc.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
enc.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
enc.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 | 
			
		||||
enc.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 | 
			
		||||
enc.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 | 
			
		||||
enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
enc.o: ../include/openssl/stack.h ../include/openssl/x509.h
 | 
			
		||||
enc.o: ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
errstr.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
errstr.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
errstr.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
errstr.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
errstr.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
errstr.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
errstr.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
errstr.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 | 
			
		||||
errstr.o: ../include/openssl/md2.h ../include/openssl/md5.h
 | 
			
		||||
errstr.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 | 
			
		||||
errstr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
errstr.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
errstr.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 | 
			
		||||
errstr.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 | 
			
		||||
errstr.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 | 
			
		||||
errstr.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
errstr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 | 
			
		||||
errstr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 | 
			
		||||
errstr.o: ../include/openssl/stack.h ../include/openssl/tls1.h
 | 
			
		||||
errstr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
gendh.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
gendh.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
gendh.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
gendh.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
gendh.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
gendh.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
gendh.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
gendh.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
gendh.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
gendh.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
gendh.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
gendh.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
gendh.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 | 
			
		||||
gendh.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 | 
			
		||||
gendh.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 | 
			
		||||
gendh.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
gendh.o: ../include/openssl/stack.h ../include/openssl/x509.h
 | 
			
		||||
gendh.o: ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
gendsa.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
gendsa.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
gendsa.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
gendsa.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
gendsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
gendsa.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
gendsa.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
gendsa.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
gendsa.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
gendsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
gendsa.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
gendsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
gendsa.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
gendsa.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
gendsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
gendsa.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
gendsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
genrsa.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
genrsa.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
genrsa.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
genrsa.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
genrsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
genrsa.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
genrsa.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
genrsa.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
genrsa.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
genrsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
genrsa.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
genrsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
genrsa.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
genrsa.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
genrsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
genrsa.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
genrsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
nseq.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
nseq.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
nseq.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
nseq.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
nseq.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
nseq.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
nseq.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
nseq.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
nseq.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
nseq.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
nseq.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
nseq.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
nseq.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
nseq.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
nseq.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
nseq.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
nseq.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
openssl.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
openssl.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
openssl.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
openssl.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
openssl.o: ../include/openssl/des.h ../include/openssl/dh.h
 | 
			
		||||
openssl.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
 | 
			
		||||
openssl.o: ../include/openssl/e_os2.h ../include/openssl/err.h
 | 
			
		||||
openssl.o: ../include/openssl/evp.h ../include/openssl/idea.h
 | 
			
		||||
openssl.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 | 
			
		||||
openssl.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
openssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
openssl.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
openssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
openssl.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
openssl.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
openssl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
openssl.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 | 
			
		||||
openssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
 | 
			
		||||
openssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 | 
			
		||||
openssl.o: ../include/openssl/tls1.h ../include/openssl/x509.h
 | 
			
		||||
openssl.o: ../include/openssl/x509_vfy.h apps.h progs.h s_apps.h
 | 
			
		||||
passwd.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
passwd.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
passwd.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
passwd.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
passwd.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
passwd.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
passwd.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
passwd.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
passwd.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
passwd.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
passwd.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
 | 
			
		||||
passwd.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 | 
			
		||||
passwd.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 | 
			
		||||
passwd.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 | 
			
		||||
passwd.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
passwd.o: ../include/openssl/stack.h ../include/openssl/x509.h
 | 
			
		||||
passwd.o: ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
pkcs12.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
pkcs12.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
pkcs12.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
pkcs12.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
pkcs12.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
pkcs12.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
pkcs12.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
pkcs12.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
pkcs12.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
pkcs12.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
pkcs12.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
pkcs12.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h
 | 
			
		||||
pkcs12.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 | 
			
		||||
pkcs12.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 | 
			
		||||
pkcs12.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 | 
			
		||||
pkcs12.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
pkcs12.o: ../include/openssl/stack.h ../include/openssl/x509.h
 | 
			
		||||
pkcs12.o: ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
pkcs7.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
pkcs7.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
pkcs7.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
pkcs7.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
pkcs7.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
pkcs7.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
pkcs7.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
pkcs7.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
pkcs7.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
pkcs7.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
pkcs7.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
pkcs7.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
pkcs7.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
pkcs7.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
pkcs7.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
pkcs7.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
pkcs7.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
pkcs8.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
pkcs8.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
pkcs8.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
pkcs8.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
pkcs8.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
pkcs8.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
pkcs8.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
pkcs8.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
pkcs8.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
pkcs8.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
pkcs8.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
pkcs8.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h
 | 
			
		||||
pkcs8.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 | 
			
		||||
pkcs8.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 | 
			
		||||
pkcs8.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 | 
			
		||||
pkcs8.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
pkcs8.o: ../include/openssl/stack.h ../include/openssl/x509.h
 | 
			
		||||
pkcs8.o: ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
req.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
req.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
req.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
req.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
req.o: ../include/openssl/des.h ../include/openssl/dh.h
 | 
			
		||||
req.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
 | 
			
		||||
req.o: ../include/openssl/e_os2.h ../include/openssl/err.h
 | 
			
		||||
req.o: ../include/openssl/evp.h ../include/openssl/idea.h
 | 
			
		||||
req.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 | 
			
		||||
req.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
req.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
req.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
req.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
req.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
req.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
req.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
req.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
req.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
 | 
			
		||||
req.o: ../include/openssl/x509v3.h apps.h
 | 
			
		||||
rsa.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
rsa.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
rsa.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
rsa.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
rsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
rsa.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
rsa.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
rsa.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
rsa.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
rsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
rsa.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
rsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
rsa.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
rsa.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
rsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
rsa.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
rsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
s_cb.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
s_cb.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
s_cb.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
s_cb.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
s_cb.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
s_cb.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
s_cb.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
s_cb.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 | 
			
		||||
s_cb.o: ../include/openssl/md2.h ../include/openssl/md5.h
 | 
			
		||||
s_cb.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 | 
			
		||||
s_cb.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
s_cb.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
s_cb.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 | 
			
		||||
s_cb.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 | 
			
		||||
s_cb.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 | 
			
		||||
s_cb.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
s_cb.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 | 
			
		||||
s_cb.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 | 
			
		||||
s_cb.o: ../include/openssl/stack.h ../include/openssl/tls1.h
 | 
			
		||||
s_cb.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h s_apps.h
 | 
			
		||||
s_client.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
s_client.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
s_client.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
s_client.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
s_client.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
s_client.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
s_client.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
s_client.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 | 
			
		||||
s_client.o: ../include/openssl/md2.h ../include/openssl/md5.h
 | 
			
		||||
s_client.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 | 
			
		||||
s_client.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
s_client.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
s_client.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 | 
			
		||||
s_client.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 | 
			
		||||
s_client.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 | 
			
		||||
s_client.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
s_client.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 | 
			
		||||
s_client.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 | 
			
		||||
s_client.o: ../include/openssl/stack.h ../include/openssl/tls1.h
 | 
			
		||||
s_client.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
s_client.o: s_apps.h
 | 
			
		||||
s_server.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
s_server.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
s_server.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
s_server.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
s_server.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
s_server.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
s_server.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
s_server.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 | 
			
		||||
s_server.o: ../include/openssl/md2.h ../include/openssl/md5.h
 | 
			
		||||
s_server.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 | 
			
		||||
s_server.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
s_server.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
s_server.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 | 
			
		||||
s_server.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 | 
			
		||||
s_server.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 | 
			
		||||
s_server.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
s_server.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 | 
			
		||||
s_server.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 | 
			
		||||
s_server.o: ../include/openssl/stack.h ../include/openssl/tls1.h
 | 
			
		||||
s_server.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
s_server.o: s_apps.h
 | 
			
		||||
s_socket.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
s_socket.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
s_socket.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
s_socket.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
s_socket.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
s_socket.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
s_socket.o: ../include/openssl/evp.h ../include/openssl/idea.h
 | 
			
		||||
s_socket.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 | 
			
		||||
s_socket.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
s_socket.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
s_socket.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
s_socket.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
s_socket.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
s_socket.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
s_socket.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
s_socket.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 | 
			
		||||
s_socket.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
 | 
			
		||||
s_socket.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 | 
			
		||||
s_socket.o: ../include/openssl/tls1.h ../include/openssl/x509.h
 | 
			
		||||
s_socket.o: ../include/openssl/x509_vfy.h apps.h s_apps.h
 | 
			
		||||
s_time.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
s_time.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
s_time.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
s_time.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
s_time.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
s_time.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
s_time.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
s_time.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 | 
			
		||||
s_time.o: ../include/openssl/md2.h ../include/openssl/md5.h
 | 
			
		||||
s_time.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 | 
			
		||||
s_time.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
s_time.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
s_time.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 | 
			
		||||
s_time.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 | 
			
		||||
s_time.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 | 
			
		||||
s_time.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
s_time.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 | 
			
		||||
s_time.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 | 
			
		||||
s_time.o: ../include/openssl/stack.h ../include/openssl/tls1.h
 | 
			
		||||
s_time.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
s_time.o: s_apps.h
 | 
			
		||||
sess_id.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
sess_id.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
sess_id.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
sess_id.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
sess_id.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
sess_id.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
sess_id.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
sess_id.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 | 
			
		||||
sess_id.o: ../include/openssl/md2.h ../include/openssl/md5.h
 | 
			
		||||
sess_id.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 | 
			
		||||
sess_id.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
sess_id.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 | 
			
		||||
sess_id.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 | 
			
		||||
sess_id.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 | 
			
		||||
sess_id.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 | 
			
		||||
sess_id.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
sess_id.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 | 
			
		||||
sess_id.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 | 
			
		||||
sess_id.o: ../include/openssl/stack.h ../include/openssl/tls1.h
 | 
			
		||||
sess_id.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
smime.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
smime.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
smime.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
smime.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
smime.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
smime.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
smime.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
smime.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
smime.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
smime.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
smime.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
smime.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
smime.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
smime.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
smime.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
smime.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
smime.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
speed.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
speed.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
speed.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
speed.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
speed.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
speed.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
speed.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
speed.o: ../include/openssl/hmac.h ../include/openssl/idea.h
 | 
			
		||||
speed.o: ../include/openssl/md2.h ../include/openssl/md5.h
 | 
			
		||||
speed.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 | 
			
		||||
speed.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
speed.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 | 
			
		||||
speed.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
speed.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
speed.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
speed.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
speed.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ./testdsa.h
 | 
			
		||||
speed.o: ./testrsa.h apps.h
 | 
			
		||||
spkac.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
spkac.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
spkac.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
spkac.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
spkac.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
spkac.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
spkac.o: ../include/openssl/err.h ../include/openssl/evp.h
 | 
			
		||||
spkac.o: ../include/openssl/idea.h ../include/openssl/md2.h
 | 
			
		||||
spkac.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
spkac.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
spkac.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
spkac.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
spkac.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
spkac.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
spkac.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
spkac.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
spkac.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
verify.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
verify.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
verify.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
verify.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
verify.o: ../include/openssl/des.h ../include/openssl/dh.h
 | 
			
		||||
verify.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
 | 
			
		||||
verify.o: ../include/openssl/e_os2.h ../include/openssl/err.h
 | 
			
		||||
verify.o: ../include/openssl/evp.h ../include/openssl/idea.h
 | 
			
		||||
verify.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 | 
			
		||||
verify.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
verify.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
verify.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
verify.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
verify.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
verify.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
verify.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
verify.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
verify.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
 | 
			
		||||
verify.o: ../include/openssl/x509v3.h apps.h
 | 
			
		||||
version.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
version.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
version.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
version.o: ../include/openssl/crypto.h ../include/openssl/des.h
 | 
			
		||||
version.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 | 
			
		||||
version.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 | 
			
		||||
version.o: ../include/openssl/evp.h ../include/openssl/idea.h
 | 
			
		||||
version.o: ../include/openssl/md2.h ../include/openssl/md5.h
 | 
			
		||||
version.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 | 
			
		||||
version.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 | 
			
		||||
version.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 | 
			
		||||
version.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 | 
			
		||||
version.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 | 
			
		||||
version.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 | 
			
		||||
version.o: ../include/openssl/stack.h ../include/openssl/x509.h
 | 
			
		||||
version.o: ../include/openssl/x509_vfy.h apps.h
 | 
			
		||||
x509.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 | 
			
		||||
x509.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 | 
			
		||||
x509.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 | 
			
		||||
x509.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 | 
			
		||||
x509.o: ../include/openssl/des.h ../include/openssl/dh.h
 | 
			
		||||
x509.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
 | 
			
		||||
x509.o: ../include/openssl/e_os2.h ../include/openssl/err.h
 | 
			
		||||
x509.o: ../include/openssl/evp.h ../include/openssl/idea.h
 | 
			
		||||
x509.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 | 
			
		||||
x509.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 | 
			
		||||
x509.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 | 
			
		||||
x509.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 | 
			
		||||
x509.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 | 
			
		||||
x509.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 | 
			
		||||
x509.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 | 
			
		||||
x509.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 | 
			
		||||
x509.o: ../include/openssl/sha.h ../include/openssl/stack.h
 | 
			
		||||
x509.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
 | 
			
		||||
x509.o: ../include/openssl/x509v3.h apps.h
 | 
			
		||||
@@ -56,7 +56,7 @@
 | 
			
		||||
 * [including the GNU Public Licence.]
 | 
			
		||||
 */
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 * Copyright (c) 1998-1999 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * Redistribution and use in source and binary forms, with or without
 | 
			
		||||
 * modification, are permitted provided that the following conditions
 | 
			
		||||
@@ -109,9 +109,7 @@
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#define NON_MAIN
 | 
			
		||||
#include "apps.h"
 | 
			
		||||
#undef NON_MAIN
 | 
			
		||||
#include <openssl/bio.h>
 | 
			
		||||
#include <openssl/rand.h>
 | 
			
		||||
 | 
			
		||||
@@ -124,7 +122,7 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
 | 
			
		||||
	int consider_randfile = (file == NULL);
 | 
			
		||||
	char buffer[200];
 | 
			
		||||
	
 | 
			
		||||
#ifdef OPENSSL_SYS_WINDOWS
 | 
			
		||||
#ifdef WINDOWS
 | 
			
		||||
	BIO_printf(bio_e,"Loading 'screen' into random state -");
 | 
			
		||||
	BIO_flush(bio_e);
 | 
			
		||||
	RAND_screen();
 | 
			
		||||
@@ -142,21 +140,18 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
 | 
			
		||||
		}
 | 
			
		||||
	if (file == NULL || !RAND_load_file(file, -1))
 | 
			
		||||
		{
 | 
			
		||||
		if (RAND_status() == 0)
 | 
			
		||||
		if (RAND_status() == 0 && !dont_warn)
 | 
			
		||||
			{
 | 
			
		||||
			if (!dont_warn)
 | 
			
		||||
			BIO_printf(bio_e,"unable to load 'random state'\n");
 | 
			
		||||
			BIO_printf(bio_e,"This means that the random number generator has not been seeded\n");
 | 
			
		||||
			BIO_printf(bio_e,"with much random data.\n");
 | 
			
		||||
			if (consider_randfile) /* explanation does not apply when a file is explicitly named */
 | 
			
		||||
				{
 | 
			
		||||
				BIO_printf(bio_e,"unable to load 'random state'\n");
 | 
			
		||||
				BIO_printf(bio_e,"This means that the random number generator has not been seeded\n");
 | 
			
		||||
				BIO_printf(bio_e,"with much random data.\n");
 | 
			
		||||
				if (consider_randfile) /* explanation does not apply when a file is explicitly named */
 | 
			
		||||
					{
 | 
			
		||||
					BIO_printf(bio_e,"Consider setting the RANDFILE environment variable to point at a file that\n");
 | 
			
		||||
					BIO_printf(bio_e,"'random' data can be kept in (the file will be overwritten).\n");
 | 
			
		||||
					}
 | 
			
		||||
				BIO_printf(bio_e,"Consider setting the RANDFILE environment variable to point at a file that\n");
 | 
			
		||||
				BIO_printf(bio_e,"'random' data can be kept in (the file will be overwritten).\n");
 | 
			
		||||
				}
 | 
			
		||||
			return 0;
 | 
			
		||||
			}
 | 
			
		||||
		return 0;
 | 
			
		||||
		}
 | 
			
		||||
	seeded = 1;
 | 
			
		||||
	return 1;
 | 
			
		||||
@@ -167,7 +162,7 @@ long app_RAND_load_files(char *name)
 | 
			
		||||
	char *p,*n;
 | 
			
		||||
	int last;
 | 
			
		||||
	long tot=0;
 | 
			
		||||
	int egd;
 | 
			
		||||
    int egd;
 | 
			
		||||
	
 | 
			
		||||
	for (;;)
 | 
			
		||||
		{
 | 
			
		||||
@@ -179,11 +174,9 @@ long app_RAND_load_files(char *name)
 | 
			
		||||
		name=p+1;
 | 
			
		||||
		if (*n == '\0') break;
 | 
			
		||||
 | 
			
		||||
		egd=RAND_egd(n);
 | 
			
		||||
		if (egd > 0)
 | 
			
		||||
			tot+=egd;
 | 
			
		||||
		else
 | 
			
		||||
			tot+=RAND_load_file(n,-1);
 | 
			
		||||
        egd=RAND_egd(n);
 | 
			
		||||
		if (egd > 0) tot+=egd;
 | 
			
		||||
		tot+=RAND_load_file(n,1024L*1024L);
 | 
			
		||||
		if (last) break;
 | 
			
		||||
		}
 | 
			
		||||
	if (tot > 512)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2001
									
								
								apps/apps.c
									
									
									
									
									
								
							
							
						
						
									
										2001
									
								
								apps/apps.c
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										231
									
								
								apps/apps.h
									
									
									
									
									
								
							
							
						
						
									
										231
									
								
								apps/apps.h
									
									
									
									
									
								
							@@ -55,74 +55,16 @@
 | 
			
		||||
 * copied and put under another distribution licence
 | 
			
		||||
 * [including the GNU Public Licence.]
 | 
			
		||||
 */
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * 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 above 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 acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 | 
			
		||||
 *    endorse or promote products derived from this software without
 | 
			
		||||
 *    prior written permission. For written permission, please contact
 | 
			
		||||
 *    openssl-core@openssl.org.
 | 
			
		||||
 *
 | 
			
		||||
 * 5. Products derived from this software may not be called "OpenSSL"
 | 
			
		||||
 *    nor may "OpenSSL" appear in their names without prior written
 | 
			
		||||
 *    permission of the OpenSSL Project.
 | 
			
		||||
 *
 | 
			
		||||
 * 6. Redistributions of any form whatsoever must retain the following
 | 
			
		||||
 *    acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 | 
			
		||||
 * EXPRESSED 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 OpenSSL PROJECT OR
 | 
			
		||||
 * ITS 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.
 | 
			
		||||
 * ====================================================================
 | 
			
		||||
 *
 | 
			
		||||
 * This product includes cryptographic software written by Eric Young
 | 
			
		||||
 * (eay@cryptsoft.com).  This product includes software written by Tim
 | 
			
		||||
 * Hudson (tjh@cryptsoft.com).
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#ifndef HEADER_APPS_H
 | 
			
		||||
#define HEADER_APPS_H
 | 
			
		||||
 | 
			
		||||
#include "e_os.h"
 | 
			
		||||
#include "openssl/e_os.h"
 | 
			
		||||
 | 
			
		||||
#include <openssl/buffer.h>
 | 
			
		||||
#include <openssl/bio.h>
 | 
			
		||||
#include <openssl/crypto.h>
 | 
			
		||||
#include <openssl/x509.h>
 | 
			
		||||
#include <openssl/lhash.h>
 | 
			
		||||
#include <openssl/conf.h>
 | 
			
		||||
#include <openssl/txt_db.h>
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
#include <openssl/engine.h>
 | 
			
		||||
#endif
 | 
			
		||||
#include <openssl/ossl_typ.h>
 | 
			
		||||
 | 
			
		||||
int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);
 | 
			
		||||
int app_RAND_write_file(const char *file, BIO *bio_e);
 | 
			
		||||
@@ -134,9 +76,13 @@ long app_RAND_load_files(char *file); /* `file' is a list of files to read,
 | 
			
		||||
                                       * (see e_os.h).  The string is
 | 
			
		||||
                                       * destroyed! */
 | 
			
		||||
 | 
			
		||||
#ifdef OPENSSL_SYS_WIN32
 | 
			
		||||
#ifdef NO_STDIO
 | 
			
		||||
BIO_METHOD *BIO_s_file();
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef WIN32
 | 
			
		||||
#define rename(from,to) WIN32_rename((from),(to))
 | 
			
		||||
int WIN32_rename(const char *oldname,const char *newname);
 | 
			
		||||
int WIN32_rename(char *oldname,char *newname);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifndef MONOLITH
 | 
			
		||||
@@ -144,28 +90,22 @@ int WIN32_rename(const char *oldname,const char *newname);
 | 
			
		||||
#define MAIN(a,v)	main(a,v)
 | 
			
		||||
 | 
			
		||||
#ifndef NON_MAIN
 | 
			
		||||
CONF *config=NULL;
 | 
			
		||||
BIO *bio_err=NULL;
 | 
			
		||||
int in_FIPS_mode=0;
 | 
			
		||||
#else
 | 
			
		||||
extern CONF *config;
 | 
			
		||||
extern BIO *bio_err;
 | 
			
		||||
extern int in_FIPS_mode;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#else
 | 
			
		||||
 | 
			
		||||
#define MAIN(a,v)	PROG(a,v)
 | 
			
		||||
extern CONF *config;
 | 
			
		||||
#include <openssl/conf.h>
 | 
			
		||||
extern LHASH *config;
 | 
			
		||||
extern char *default_config_file;
 | 
			
		||||
extern BIO *bio_err;
 | 
			
		||||
extern int in_FIPS_mode;
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_SYS_NETWARE
 | 
			
		||||
#include <signal.h>
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef SIGPIPE
 | 
			
		||||
#define do_pipe_sig()	signal(SIGPIPE,SIG_IGN)
 | 
			
		||||
@@ -174,60 +114,20 @@ extern int in_FIPS_mode;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if defined(MONOLITH) && !defined(OPENSSL_C)
 | 
			
		||||
#  define apps_startup() \
 | 
			
		||||
		do_pipe_sig()
 | 
			
		||||
#  define apps_shutdown()
 | 
			
		||||
#  define apps_startup()	do_pipe_sig()
 | 
			
		||||
#else
 | 
			
		||||
#  ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
#    if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
 | 
			
		||||
     defined(OPENSSL_SYS_WIN32)
 | 
			
		||||
#      ifdef _O_BINARY
 | 
			
		||||
#        define apps_startup() \
 | 
			
		||||
			do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
 | 
			
		||||
			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
 | 
			
		||||
			ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
 | 
			
		||||
#      else
 | 
			
		||||
#        define apps_startup() \
 | 
			
		||||
			do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
 | 
			
		||||
			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
 | 
			
		||||
			ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
 | 
			
		||||
#      endif
 | 
			
		||||
#  if defined(MSDOS) || defined(WIN16) || defined(WIN32)
 | 
			
		||||
#    ifdef _O_BINARY
 | 
			
		||||
#      define apps_startup() \
 | 
			
		||||
		_fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
 | 
			
		||||
		SSLeay_add_all_algorithms()
 | 
			
		||||
#    else
 | 
			
		||||
#      define apps_startup() \
 | 
			
		||||
			do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
 | 
			
		||||
			ERR_load_crypto_strings(); ENGINE_load_builtin_engines(); \
 | 
			
		||||
			setup_ui_method(); } while(0)
 | 
			
		||||
		_fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
 | 
			
		||||
		SSLeay_add_all_algorithms()
 | 
			
		||||
#    endif
 | 
			
		||||
#    define apps_shutdown() \
 | 
			
		||||
			do { CONF_modules_unload(1); destroy_ui_method(); \
 | 
			
		||||
			EVP_cleanup(); ENGINE_cleanup(); \
 | 
			
		||||
			CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
 | 
			
		||||
			ERR_free_strings(); } while(0)
 | 
			
		||||
#  else
 | 
			
		||||
#    if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
 | 
			
		||||
     defined(OPENSSL_SYS_WIN32)
 | 
			
		||||
#      ifdef _O_BINARY
 | 
			
		||||
#        define apps_startup() \
 | 
			
		||||
			do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
 | 
			
		||||
			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
 | 
			
		||||
			setup_ui_method(); } while(0)
 | 
			
		||||
#      else
 | 
			
		||||
#        define apps_startup() \
 | 
			
		||||
			do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
 | 
			
		||||
			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
 | 
			
		||||
			setup_ui_method(); } while(0)
 | 
			
		||||
#      endif
 | 
			
		||||
#    else
 | 
			
		||||
#      define apps_startup() \
 | 
			
		||||
			do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
 | 
			
		||||
			ERR_load_crypto_strings(); \
 | 
			
		||||
			setup_ui_method(); } while(0)
 | 
			
		||||
#    endif
 | 
			
		||||
#    define apps_shutdown() \
 | 
			
		||||
			do { CONF_modules_unload(1); destroy_ui_method(); \
 | 
			
		||||
			EVP_cleanup(); \
 | 
			
		||||
			CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
 | 
			
		||||
			ERR_free_strings(); } while(0)
 | 
			
		||||
#    define apps_startup()	do_pipe_sig(); SSLeay_add_all_algorithms();
 | 
			
		||||
#  endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
@@ -237,19 +137,6 @@ typedef struct args_st
 | 
			
		||||
	int count;
 | 
			
		||||
	} ARGS;
 | 
			
		||||
 | 
			
		||||
#define PW_MIN_LENGTH 4
 | 
			
		||||
typedef struct pw_cb_data
 | 
			
		||||
	{
 | 
			
		||||
	const void *password;
 | 
			
		||||
	const char *prompt_info;
 | 
			
		||||
	} PW_CB_DATA;
 | 
			
		||||
 | 
			
		||||
int password_callback(char *buf, int bufsiz, int verify,
 | 
			
		||||
	PW_CB_DATA *cb_data);
 | 
			
		||||
 | 
			
		||||
int setup_ui_method(void);
 | 
			
		||||
void destroy_ui_method(void);
 | 
			
		||||
 | 
			
		||||
int should_retry(int i);
 | 
			
		||||
int args_from_file(char *file, int *argc, char **argv[]);
 | 
			
		||||
int str2fmt(char *s);
 | 
			
		||||
@@ -257,92 +144,14 @@ void program_name(char *in,char *out,int size);
 | 
			
		||||
int chopup_args(ARGS *arg,char *buf, int *argc, char **argv[]);
 | 
			
		||||
#ifdef HEADER_X509_H
 | 
			
		||||
int dump_cert_text(BIO *out, X509 *x);
 | 
			
		||||
void print_name(BIO *out, const char *title, X509_NAME *nm, unsigned long lflags);
 | 
			
		||||
#endif
 | 
			
		||||
int set_cert_ex(unsigned long *flags, const char *arg);
 | 
			
		||||
int set_name_ex(unsigned long *flags, const char *arg);
 | 
			
		||||
int set_ext_copy(int *copy_type, const char *arg);
 | 
			
		||||
int copy_extensions(X509 *x, X509_REQ *req, int copy_type);
 | 
			
		||||
int app_passwd(BIO *err, char *arg1, char *arg2, char **pass1, char **pass2);
 | 
			
		||||
int add_oid_section(BIO *err, CONF *conf);
 | 
			
		||||
X509 *load_cert(BIO *err, const char *file, int format,
 | 
			
		||||
	const char *pass, ENGINE *e, const char *cert_descrip);
 | 
			
		||||
EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
 | 
			
		||||
	const char *pass, ENGINE *e, const char *key_descrip);
 | 
			
		||||
EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin,
 | 
			
		||||
	const char *pass, ENGINE *e, const char *key_descrip);
 | 
			
		||||
STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
 | 
			
		||||
	const char *pass, ENGINE *e, const char *cert_descrip);
 | 
			
		||||
X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath);
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
ENGINE *setup_engine(BIO *err, const char *engine, int debug);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
int load_config(BIO *err, CONF *cnf);
 | 
			
		||||
char *make_config_name(void);
 | 
			
		||||
 | 
			
		||||
/* Functions defined in ca.c and also used in ocsp.c */
 | 
			
		||||
int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
 | 
			
		||||
			ASN1_GENERALIZEDTIME **pinvtm, const char *str);
 | 
			
		||||
 | 
			
		||||
#define DB_type         0
 | 
			
		||||
#define DB_exp_date     1
 | 
			
		||||
#define DB_rev_date     2
 | 
			
		||||
#define DB_serial       3       /* index - unique */
 | 
			
		||||
#define DB_file         4       
 | 
			
		||||
#define DB_name         5       /* index - unique when active and not disabled */
 | 
			
		||||
#define DB_NUMBER       6
 | 
			
		||||
 | 
			
		||||
#define DB_TYPE_REV	'R'
 | 
			
		||||
#define DB_TYPE_EXP	'E'
 | 
			
		||||
#define DB_TYPE_VAL	'V'
 | 
			
		||||
 | 
			
		||||
typedef struct db_attr_st
 | 
			
		||||
	{
 | 
			
		||||
	int unique_subject;
 | 
			
		||||
	} DB_ATTR;
 | 
			
		||||
typedef struct ca_db_st
 | 
			
		||||
	{
 | 
			
		||||
	DB_ATTR attributes;
 | 
			
		||||
	TXT_DB *db;
 | 
			
		||||
	} CA_DB;
 | 
			
		||||
 | 
			
		||||
BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai);
 | 
			
		||||
int save_serial(char *serialfile, char *suffix, BIGNUM *serial, ASN1_INTEGER **retai);
 | 
			
		||||
int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix);
 | 
			
		||||
int rand_serial(BIGNUM *b, ASN1_INTEGER *ai);
 | 
			
		||||
CA_DB *load_index(char *dbfile, DB_ATTR *dbattr);
 | 
			
		||||
int index_index(CA_DB *db);
 | 
			
		||||
int save_index(const char *dbfile, const char *suffix, CA_DB *db);
 | 
			
		||||
int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix);
 | 
			
		||||
void free_index(CA_DB *db);
 | 
			
		||||
int index_name_cmp(const char **a, const char **b);
 | 
			
		||||
int parse_yesno(const char *str, int def);
 | 
			
		||||
 | 
			
		||||
X509_NAME *parse_name(char *str, long chtype, int multirdn);
 | 
			
		||||
int args_verify(char ***pargs, int *pargc,
 | 
			
		||||
			int *badarg, BIO *err, X509_VERIFY_PARAM **pm);
 | 
			
		||||
void policies_print(BIO *out, X509_STORE_CTX *ctx);
 | 
			
		||||
 | 
			
		||||
#define FORMAT_UNDEF    0
 | 
			
		||||
#define FORMAT_ASN1     1
 | 
			
		||||
#define FORMAT_TEXT     2
 | 
			
		||||
#define FORMAT_PEM      3
 | 
			
		||||
#define FORMAT_NETSCAPE 4
 | 
			
		||||
#define FORMAT_PKCS12   5
 | 
			
		||||
#define FORMAT_SMIME    6
 | 
			
		||||
#define FORMAT_ENGINE   7
 | 
			
		||||
#define FORMAT_IISSGC	8	/* XXX this stupid macro helps us to avoid
 | 
			
		||||
				 * adding yet another param to load_*key() */
 | 
			
		||||
 | 
			
		||||
#define EXT_COPY_NONE	0
 | 
			
		||||
#define EXT_COPY_ADD	1
 | 
			
		||||
#define EXT_COPY_ALL	2
 | 
			
		||||
 | 
			
		||||
#define NETSCAPE_CERT_HDR	"certificate"
 | 
			
		||||
 | 
			
		||||
#define APP_PASS_LEN	1024
 | 
			
		||||
 | 
			
		||||
#define SERIAL_RAND_BITS	64
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										177
									
								
								apps/asn1pars.c
									
									
									
									
									
								
							
							
						
						
									
										177
									
								
								apps/asn1pars.c
									
									
									
									
									
								
							@@ -82,19 +82,15 @@
 | 
			
		||||
 | 
			
		||||
int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
	int i,badops=0,offset=0,ret=1,j;
 | 
			
		||||
	unsigned int length=0;
 | 
			
		||||
	long num,tmplen;
 | 
			
		||||
	BIO *in=NULL,*out=NULL,*b64=NULL, *derout = NULL;
 | 
			
		||||
	int informat,indent=0, noout = 0, dump = 0;
 | 
			
		||||
	int informat,indent=0, noout = 0;
 | 
			
		||||
	char *infile=NULL,*str=NULL,*prog,*oidfile=NULL, *derfile=NULL;
 | 
			
		||||
	char *genstr=NULL, *genconf=NULL;
 | 
			
		||||
	unsigned char *tmpbuf;
 | 
			
		||||
	const unsigned char *ctmpbuf;
 | 
			
		||||
	BUF_MEM *buf=NULL;
 | 
			
		||||
	STACK *osk=NULL;
 | 
			
		||||
	ASN1_TYPE *at=NULL;
 | 
			
		||||
@@ -107,15 +103,12 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
	prog=argv[0];
 | 
			
		||||
	argc--;
 | 
			
		||||
	argv++;
 | 
			
		||||
	if ((osk=sk_new_null()) == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err,"Memory allocation failure\n");
 | 
			
		||||
		BIO_printf(bio_err,"Malloc failure\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
	while (argc >= 1)
 | 
			
		||||
@@ -156,31 +149,11 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			length= atoi(*(++argv));
 | 
			
		||||
			if (length == 0) goto bad;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-dump") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			dump= -1;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-dlimit") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			dump= atoi(*(++argv));
 | 
			
		||||
			if (dump <= 0) goto bad;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-strparse") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			sk_push(osk,*(++argv));
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-genstr") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			genstr= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-genconf") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			genconf= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err,"unknown option %s\n",*argv);
 | 
			
		||||
@@ -196,21 +169,18 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
bad:
 | 
			
		||||
		BIO_printf(bio_err,"%s [options] <infile\n",prog);
 | 
			
		||||
		BIO_printf(bio_err,"where options are\n");
 | 
			
		||||
		BIO_printf(bio_err," -inform arg   input format - one of DER PEM\n");
 | 
			
		||||
		BIO_printf(bio_err," -inform arg   input format - one of DER TXT PEM\n");
 | 
			
		||||
		BIO_printf(bio_err," -in arg       input file\n");
 | 
			
		||||
		BIO_printf(bio_err," -out arg      output file (output format is always DER\n");
 | 
			
		||||
		BIO_printf(bio_err," -out arg      output file\n");
 | 
			
		||||
		BIO_printf(bio_err," -noout arg    don't produce any output\n");
 | 
			
		||||
		BIO_printf(bio_err," -offset arg   offset into file\n");
 | 
			
		||||
		BIO_printf(bio_err," -length arg   length of section in file\n");
 | 
			
		||||
		BIO_printf(bio_err," -i            indent entries\n");
 | 
			
		||||
		BIO_printf(bio_err," -dump         dump unknown data in hex form\n");
 | 
			
		||||
		BIO_printf(bio_err," -dlimit arg   dump the first arg bytes of unknown data in hex form\n");
 | 
			
		||||
		BIO_printf(bio_err," -oid file     file of extra oid definitions\n");
 | 
			
		||||
		BIO_printf(bio_err," -strparse offset\n");
 | 
			
		||||
		BIO_printf(bio_err,"               a series of these can be used to 'dig' into multiple\n");
 | 
			
		||||
		BIO_printf(bio_err,"               ASN1 blob wrappings\n");
 | 
			
		||||
		BIO_printf(bio_err," -genstr str   string to generate ASN1 structure from\n");
 | 
			
		||||
		BIO_printf(bio_err," -genconf file file to generate ASN1 structure from\n");
 | 
			
		||||
		BIO_printf(bio_err," -out filename output DER encoding to file\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
@@ -224,12 +194,6 @@ bad:
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
	BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
	{
 | 
			
		||||
	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
	out = BIO_push(tmpbio, out);
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	if (oidfile != NULL)
 | 
			
		||||
		{
 | 
			
		||||
@@ -264,39 +228,25 @@ bad:
 | 
			
		||||
	if ((buf=BUF_MEM_new()) == NULL) goto end;
 | 
			
		||||
	if (!BUF_MEM_grow(buf,BUFSIZ*8)) goto end; /* Pre-allocate :-) */
 | 
			
		||||
 | 
			
		||||
	if (genstr || genconf)
 | 
			
		||||
	if (informat == FORMAT_PEM)
 | 
			
		||||
		{
 | 
			
		||||
		num = do_generate(bio_err, genstr, genconf, buf);
 | 
			
		||||
		if (num < 0)
 | 
			
		||||
			{
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
		BIO *tmp;
 | 
			
		||||
 | 
			
		||||
		if ((b64=BIO_new(BIO_f_base64())) == NULL)
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		BIO_push(b64,in);
 | 
			
		||||
		tmp=in;
 | 
			
		||||
		in=b64;
 | 
			
		||||
		b64=tmp;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	else
 | 
			
		||||
	num=0;
 | 
			
		||||
	for (;;)
 | 
			
		||||
		{
 | 
			
		||||
 | 
			
		||||
		if (informat == FORMAT_PEM)
 | 
			
		||||
			{
 | 
			
		||||
			BIO *tmp;
 | 
			
		||||
 | 
			
		||||
			if ((b64=BIO_new(BIO_f_base64())) == NULL)
 | 
			
		||||
				goto end;
 | 
			
		||||
			BIO_push(b64,in);
 | 
			
		||||
			tmp=in;
 | 
			
		||||
			in=b64;
 | 
			
		||||
			b64=tmp;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		num=0;
 | 
			
		||||
		for (;;)
 | 
			
		||||
			{
 | 
			
		||||
			if (!BUF_MEM_grow(buf,(int)num+BUFSIZ)) goto end;
 | 
			
		||||
			i=BIO_read(in,&(buf->data[num]),BUFSIZ);
 | 
			
		||||
			if (i <= 0) break;
 | 
			
		||||
			num+=i;
 | 
			
		||||
			}
 | 
			
		||||
		if (!BUF_MEM_grow(buf,(int)num+BUFSIZ)) goto end;
 | 
			
		||||
		i=BIO_read(in,&(buf->data[num]),BUFSIZ);
 | 
			
		||||
		if (i <= 0) break;
 | 
			
		||||
		num+=i;
 | 
			
		||||
		}
 | 
			
		||||
	str=buf->data;
 | 
			
		||||
 | 
			
		||||
@@ -309,7 +259,6 @@ bad:
 | 
			
		||||
		for (i=0; i<sk_num(osk); i++)
 | 
			
		||||
			{
 | 
			
		||||
			ASN1_TYPE *atmp;
 | 
			
		||||
			int typ;
 | 
			
		||||
			j=atoi(sk_value(osk,i));
 | 
			
		||||
			if (j == 0)
 | 
			
		||||
				{
 | 
			
		||||
@@ -319,8 +268,7 @@ bad:
 | 
			
		||||
			tmpbuf+=j;
 | 
			
		||||
			tmplen-=j;
 | 
			
		||||
			atmp = at;
 | 
			
		||||
			ctmpbuf = tmpbuf;
 | 
			
		||||
			at = d2i_ASN1_TYPE(NULL,&ctmpbuf,tmplen);
 | 
			
		||||
			at = d2i_ASN1_TYPE(NULL,&tmpbuf,tmplen);
 | 
			
		||||
			ASN1_TYPE_free(atmp);
 | 
			
		||||
			if(!at)
 | 
			
		||||
				{
 | 
			
		||||
@@ -328,15 +276,6 @@ bad:
 | 
			
		||||
				ERR_print_errors(bio_err);
 | 
			
		||||
				goto end;
 | 
			
		||||
				}
 | 
			
		||||
			typ = ASN1_TYPE_get(at);
 | 
			
		||||
			if ((typ == V_ASN1_OBJECT)
 | 
			
		||||
				|| (typ == V_ASN1_NULL))
 | 
			
		||||
				{
 | 
			
		||||
				BIO_printf(bio_err, "Can't parse %s type\n",
 | 
			
		||||
					typ == V_ASN1_NULL ? "NULL" : "OBJECT");
 | 
			
		||||
				ERR_print_errors(bio_err);
 | 
			
		||||
				goto end;
 | 
			
		||||
				}
 | 
			
		||||
			/* hmm... this is a little evil but it works */
 | 
			
		||||
			tmpbuf=at->value.asn1_string->data;
 | 
			
		||||
			tmplen=at->value.asn1_string->length;
 | 
			
		||||
@@ -345,15 +284,7 @@ bad:
 | 
			
		||||
		num=tmplen;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (offset >= num)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err, "Error: offset too large\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	num -= offset;
 | 
			
		||||
 | 
			
		||||
	if ((length == 0) || ((long)length > num)) length=(unsigned int)num;
 | 
			
		||||
	if (length == 0) length=(unsigned int)num;
 | 
			
		||||
	if(derout) {
 | 
			
		||||
		if(BIO_write(derout, str + offset, length) != (int)length) {
 | 
			
		||||
			BIO_printf(bio_err, "Error writing output\n");
 | 
			
		||||
@@ -362,8 +293,7 @@ bad:
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	if (!noout &&
 | 
			
		||||
	    !ASN1_parse_dump(out,(unsigned char *)&(str[offset]),length,
 | 
			
		||||
		    indent,dump))
 | 
			
		||||
	    !ASN1_parse(out,(unsigned char *)&(str[offset]),length,indent))
 | 
			
		||||
		{
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		goto end;
 | 
			
		||||
@@ -372,7 +302,7 @@ bad:
 | 
			
		||||
end:
 | 
			
		||||
	BIO_free(derout);
 | 
			
		||||
	if (in != NULL) BIO_free(in);
 | 
			
		||||
	if (out != NULL) BIO_free_all(out);
 | 
			
		||||
	if (out != NULL) BIO_free(out);
 | 
			
		||||
	if (b64 != NULL) BIO_free(b64);
 | 
			
		||||
	if (ret != 0)
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
@@ -380,65 +310,6 @@ end:
 | 
			
		||||
	if (at != NULL) ASN1_TYPE_free(at);
 | 
			
		||||
	if (osk != NULL) sk_free(osk);
 | 
			
		||||
	OBJ_cleanup();
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)
 | 
			
		||||
	{
 | 
			
		||||
	CONF *cnf = NULL;
 | 
			
		||||
	int len;
 | 
			
		||||
	long errline;
 | 
			
		||||
	unsigned char *p;
 | 
			
		||||
	ASN1_TYPE *atyp = NULL;
 | 
			
		||||
 | 
			
		||||
	if (genconf)
 | 
			
		||||
		{
 | 
			
		||||
		cnf = NCONF_new(NULL);
 | 
			
		||||
		if (!NCONF_load(cnf, genconf, &errline))
 | 
			
		||||
			goto conferr;
 | 
			
		||||
		if (!genstr)
 | 
			
		||||
			genstr = NCONF_get_string(cnf, "default", "asn1");
 | 
			
		||||
		if (!genstr)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio, "Can't find 'asn1' in '%s'\n", genconf);
 | 
			
		||||
			goto err;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	atyp = ASN1_generate_nconf(genstr, cnf);
 | 
			
		||||
	NCONF_free(cnf);
 | 
			
		||||
 | 
			
		||||
	if (!atyp)
 | 
			
		||||
		return -1;
 | 
			
		||||
 | 
			
		||||
	len = i2d_ASN1_TYPE(atyp, NULL);
 | 
			
		||||
 | 
			
		||||
	if (len <= 0)
 | 
			
		||||
		goto err;
 | 
			
		||||
 | 
			
		||||
	if (!BUF_MEM_grow(buf,len))
 | 
			
		||||
		goto err;
 | 
			
		||||
 | 
			
		||||
	p=(unsigned char *)buf->data;
 | 
			
		||||
 | 
			
		||||
	i2d_ASN1_TYPE(atyp, &p);
 | 
			
		||||
 | 
			
		||||
	ASN1_TYPE_free(atyp);
 | 
			
		||||
	return len;
 | 
			
		||||
 | 
			
		||||
	conferr:
 | 
			
		||||
 | 
			
		||||
	if (errline > 0)
 | 
			
		||||
		BIO_printf(bio, "Error on line %ld of config file '%s'\n",
 | 
			
		||||
							errline, genconf);
 | 
			
		||||
	else
 | 
			
		||||
		BIO_printf(bio, "Error loading config file '%s'\n", genconf);
 | 
			
		||||
 | 
			
		||||
	err:
 | 
			
		||||
	NCONF_free(cnf);
 | 
			
		||||
	ASN1_TYPE_free(atyp);
 | 
			
		||||
 | 
			
		||||
	return -1;
 | 
			
		||||
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1 @@
 | 
			
		||||
07
 | 
			
		||||
05
 | 
			
		||||
 
 | 
			
		||||
@@ -59,7 +59,7 @@
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#ifdef OPENSSL_NO_STDIO
 | 
			
		||||
#ifdef NO_STDIO
 | 
			
		||||
#define APPS_WIN16
 | 
			
		||||
#endif
 | 
			
		||||
#include "apps.h"
 | 
			
		||||
@@ -69,12 +69,11 @@
 | 
			
		||||
#undef PROG
 | 
			
		||||
#define PROG	ciphers_main
 | 
			
		||||
 | 
			
		||||
static const char *ciphers_usage[]={
 | 
			
		||||
static char *ciphers_usage[]={
 | 
			
		||||
"usage: ciphers args\n",
 | 
			
		||||
" -v          - verbose mode, a textual listing of the ciphers in SSLeay\n",
 | 
			
		||||
" -ssl2       - SSL2 mode\n",
 | 
			
		||||
" -ssl3       - SSL3 mode\n",
 | 
			
		||||
" -tls1       - TLS1 mode\n",
 | 
			
		||||
NULL
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@@ -84,7 +83,7 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
	int ret=1,i;
 | 
			
		||||
	int verbose=0;
 | 
			
		||||
	const char **pp;
 | 
			
		||||
	char **pp;
 | 
			
		||||
	const char *p;
 | 
			
		||||
	int badops=0;
 | 
			
		||||
	SSL_CTX *ctx=NULL;
 | 
			
		||||
@@ -95,11 +94,11 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	char buf[512];
 | 
			
		||||
	BIO *STDout=NULL;
 | 
			
		||||
 | 
			
		||||
#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
 | 
			
		||||
#if !defined(NO_SSL2) && !defined(NO_SSL3)
 | 
			
		||||
	meth=SSLv23_server_method();
 | 
			
		||||
#elif !defined(OPENSSL_NO_SSL3)
 | 
			
		||||
#elif !defined(NO_SSL3)
 | 
			
		||||
	meth=SSLv3_server_method();
 | 
			
		||||
#elif !defined(OPENSSL_NO_SSL2)
 | 
			
		||||
#elif !defined(NO_SSL2)
 | 
			
		||||
	meth=SSLv2_server_method();
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
@@ -108,12 +107,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	if (bio_err == NULL)
 | 
			
		||||
		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 | 
			
		||||
	STDout=BIO_new_fp(stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
	{
 | 
			
		||||
	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
	STDout = BIO_push(tmpbio, STDout);
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	argc--;
 | 
			
		||||
	argv++;
 | 
			
		||||
@@ -121,17 +114,13 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		{
 | 
			
		||||
		if (strcmp(*argv,"-v") == 0)
 | 
			
		||||
			verbose=1;
 | 
			
		||||
#ifndef OPENSSL_NO_SSL2
 | 
			
		||||
#ifndef NO_SSL2
 | 
			
		||||
		else if (strcmp(*argv,"-ssl2") == 0)
 | 
			
		||||
			meth=SSLv2_client_method();
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SSL3
 | 
			
		||||
#ifndef NO_SSL3
 | 
			
		||||
		else if (strcmp(*argv,"-ssl3") == 0)
 | 
			
		||||
			meth=SSLv3_client_method();
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_TLS1
 | 
			
		||||
		else if (strcmp(*argv,"-tls1") == 0)
 | 
			
		||||
			meth=TLSv1_client_method();
 | 
			
		||||
#endif
 | 
			
		||||
		else if ((strncmp(*argv,"-h",2) == 0) ||
 | 
			
		||||
			 (strcmp(*argv,"-?") == 0))
 | 
			
		||||
@@ -150,7 +139,7 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	if (badops)
 | 
			
		||||
		{
 | 
			
		||||
		for (pp=ciphers_usage; (*pp != NULL); pp++)
 | 
			
		||||
			BIO_printf(bio_err,"%s",*pp);
 | 
			
		||||
			BIO_printf(bio_err,*pp);
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
@@ -187,7 +176,7 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_puts(STDout,SSL_CIPHER_description(
 | 
			
		||||
				sk_SSL_CIPHER_value(sk,i),
 | 
			
		||||
				buf,sizeof buf));
 | 
			
		||||
				buf,512));
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
@@ -201,8 +190,7 @@ err:
 | 
			
		||||
end:
 | 
			
		||||
	if (ctx != NULL) SSL_CTX_free(ctx);
 | 
			
		||||
	if (ssl != NULL) SSL_free(ssl);
 | 
			
		||||
	if (STDout != NULL) BIO_free_all(STDout);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	if (STDout != NULL) BIO_free(STDout);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										85
									
								
								apps/crl.c
									
									
									
									
									
								
							
							
						
						
									
										85
									
								
								apps/crl.c
									
									
									
									
									
								
							@@ -72,7 +72,7 @@
 | 
			
		||||
#undef POSTFIX
 | 
			
		||||
#define	POSTFIX	".rvk"
 | 
			
		||||
 | 
			
		||||
static const char *crl_usage[]={
 | 
			
		||||
static char *crl_usage[]={
 | 
			
		||||
"usage: crl args\n",
 | 
			
		||||
"\n",
 | 
			
		||||
" -inform arg     - input format - default PEM (DER or PEM)\n",
 | 
			
		||||
@@ -81,14 +81,12 @@ static const char *crl_usage[]={
 | 
			
		||||
" -in arg         - input file - default stdin\n",
 | 
			
		||||
" -out arg        - output file - default stdout\n",
 | 
			
		||||
" -hash           - print hash value\n",
 | 
			
		||||
" -fingerprint    - print the crl fingerprint\n",
 | 
			
		||||
" -issuer         - print issuer DN\n",
 | 
			
		||||
" -lastupdate     - lastUpdate field\n",
 | 
			
		||||
" -nextupdate     - nextUpdate field\n",
 | 
			
		||||
" -noout          - no CRL output\n",
 | 
			
		||||
" -CAfile  name   - verify CRL using certificates in file \"name\"\n",
 | 
			
		||||
" -CApath  dir    - verify CRL using certificates in \"dir\"\n",
 | 
			
		||||
" -nameopt arg    - various certificate name options\n",
 | 
			
		||||
NULL
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@@ -99,7 +97,6 @@ int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
	unsigned long nmflag = 0;
 | 
			
		||||
	X509_CRL *x=NULL;
 | 
			
		||||
	char *CAfile = NULL, *CApath = NULL;
 | 
			
		||||
	int ret=1,i,num,badops=0;
 | 
			
		||||
@@ -107,15 +104,13 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	int informat,outformat;
 | 
			
		||||
	char *infile=NULL,*outfile=NULL;
 | 
			
		||||
	int hash=0,issuer=0,lastupdate=0,nextupdate=0,noout=0,text=0;
 | 
			
		||||
	int fingerprint = 0;
 | 
			
		||||
	const char **pp;
 | 
			
		||||
	char **pp,buf[256];
 | 
			
		||||
	X509_STORE *store = NULL;
 | 
			
		||||
	X509_STORE_CTX ctx;
 | 
			
		||||
	X509_LOOKUP *lookup = NULL;
 | 
			
		||||
	X509_OBJECT xobj;
 | 
			
		||||
	EVP_PKEY *pkey;
 | 
			
		||||
	int do_ver = 0;
 | 
			
		||||
	const EVP_MD *md_alg,*digest=EVP_sha1();
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
 | 
			
		||||
@@ -123,20 +118,9 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
	if (bio_out == NULL)
 | 
			
		||||
		if ((bio_out=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_set_fp(bio_out,stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
			{
 | 
			
		||||
			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
			bio_out = BIO_push(tmpbio, bio_out);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
	informat=FORMAT_PEM;
 | 
			
		||||
	outformat=FORMAT_PEM;
 | 
			
		||||
@@ -191,11 +175,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			text = 1;
 | 
			
		||||
		else if (strcmp(*argv,"-hash") == 0)
 | 
			
		||||
			hash= ++num;
 | 
			
		||||
		else if (strcmp(*argv,"-nameopt") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			if (!set_name_ex(&nmflag, *(++argv))) goto bad;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-issuer") == 0)
 | 
			
		||||
			issuer= ++num;
 | 
			
		||||
		else if (strcmp(*argv,"-lastupdate") == 0)
 | 
			
		||||
@@ -204,13 +183,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			nextupdate= ++num;
 | 
			
		||||
		else if (strcmp(*argv,"-noout") == 0)
 | 
			
		||||
			noout= ++num;
 | 
			
		||||
		else if (strcmp(*argv,"-fingerprint") == 0)
 | 
			
		||||
			fingerprint= ++num;
 | 
			
		||||
		else if ((md_alg=EVP_get_digestbyname(*argv + 1)))
 | 
			
		||||
			{
 | 
			
		||||
			/* ok */
 | 
			
		||||
			digest=md_alg;
 | 
			
		||||
			}
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err,"unknown option %s\n",*argv);
 | 
			
		||||
@@ -225,7 +197,7 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		{
 | 
			
		||||
bad:
 | 
			
		||||
		for (pp=crl_usage; (*pp != NULL); pp++)
 | 
			
		||||
			BIO_printf(bio_err,"%s",*pp);
 | 
			
		||||
			BIO_printf(bio_err,*pp);
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
@@ -246,11 +218,7 @@ bad:
 | 
			
		||||
			X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
 | 
			
		||||
		ERR_clear_error();
 | 
			
		||||
 | 
			
		||||
		if(!X509_STORE_CTX_init(&ctx, store, NULL, NULL)) {
 | 
			
		||||
			BIO_printf(bio_err,
 | 
			
		||||
				"Error initialising X509 store\n");
 | 
			
		||||
			goto end;
 | 
			
		||||
		}
 | 
			
		||||
		X509_STORE_CTX_init(&ctx, store, NULL, NULL);
 | 
			
		||||
 | 
			
		||||
		i = X509_STORE_get_by_subject(&ctx, X509_LU_X509, 
 | 
			
		||||
					X509_CRL_get_issuer(x), &xobj);
 | 
			
		||||
@@ -279,7 +247,9 @@ bad:
 | 
			
		||||
			{
 | 
			
		||||
			if (issuer == i)
 | 
			
		||||
				{
 | 
			
		||||
				print_name(bio_out, "issuer=", X509_CRL_get_issuer(x), nmflag);
 | 
			
		||||
				X509_NAME_oneline(X509_CRL_get_issuer(x),
 | 
			
		||||
								buf,256);
 | 
			
		||||
				BIO_printf(bio_out,"issuer= %s\n",buf);
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
			if (hash == i)
 | 
			
		||||
@@ -304,26 +274,6 @@ bad:
 | 
			
		||||
					BIO_printf(bio_out,"NONE");
 | 
			
		||||
				BIO_printf(bio_out,"\n");
 | 
			
		||||
				}
 | 
			
		||||
			if (fingerprint == i)
 | 
			
		||||
				{
 | 
			
		||||
				int j;
 | 
			
		||||
				unsigned int n;
 | 
			
		||||
				unsigned char md[EVP_MAX_MD_SIZE];
 | 
			
		||||
 | 
			
		||||
				if (!X509_CRL_digest(x,digest,md,&n))
 | 
			
		||||
					{
 | 
			
		||||
					BIO_printf(bio_err,"out of memory\n");
 | 
			
		||||
					goto end;
 | 
			
		||||
					}
 | 
			
		||||
				BIO_printf(bio_out,"%s Fingerprint=",
 | 
			
		||||
						OBJ_nid2sn(EVP_MD_type(digest)));
 | 
			
		||||
				for (j=0; j<(int)n; j++)
 | 
			
		||||
					{
 | 
			
		||||
					BIO_printf(bio_out,"%02X%c",md[j],
 | 
			
		||||
						(j+1 == (int)n)
 | 
			
		||||
						?'\n':':');
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
@@ -335,15 +285,7 @@ bad:
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (outfile == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_write_filename(out,outfile) <= 0)
 | 
			
		||||
@@ -355,11 +297,7 @@ bad:
 | 
			
		||||
 | 
			
		||||
	if (text) X509_CRL_print(out, x);
 | 
			
		||||
 | 
			
		||||
	if (noout) 
 | 
			
		||||
		{
 | 
			
		||||
		ret = 0;
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
	if (noout) goto end;
 | 
			
		||||
 | 
			
		||||
	if 	(outformat == FORMAT_ASN1)
 | 
			
		||||
		i=(int)i2d_X509_CRL_bio(out,x);
 | 
			
		||||
@@ -373,16 +311,15 @@ bad:
 | 
			
		||||
	if (!i) { BIO_printf(bio_err,"unable to write CRL\n"); goto end; }
 | 
			
		||||
	ret=0;
 | 
			
		||||
end:
 | 
			
		||||
	BIO_free_all(out);
 | 
			
		||||
	BIO_free_all(bio_out);
 | 
			
		||||
	BIO_free(out);
 | 
			
		||||
	BIO_free(bio_out);
 | 
			
		||||
	bio_out=NULL;
 | 
			
		||||
	X509_CRL_free(x);
 | 
			
		||||
	if(store) {
 | 
			
		||||
		X509_STORE_CTX_cleanup(&ctx);
 | 
			
		||||
		X509_STORE_free(store);
 | 
			
		||||
	}
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
static X509_CRL *load_crl(char *infile, int format)
 | 
			
		||||
 
 | 
			
		||||
@@ -141,7 +141,7 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		else if (strcmp(*argv,"-certfile") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			if(!certflst) certflst = sk_new_null();
 | 
			
		||||
			if(!certflst) certflst = sk_new(NULL);
 | 
			
		||||
			sk_push(certflst,*(++argv));
 | 
			
		||||
			}
 | 
			
		||||
		else
 | 
			
		||||
@@ -166,8 +166,7 @@ bad:
 | 
			
		||||
		BIO_printf(bio_err," -certfile arg  certificates file of chain to a trusted CA\n");
 | 
			
		||||
		BIO_printf(bio_err,"                (can be used more than once)\n");
 | 
			
		||||
		BIO_printf(bio_err," -nocrl         no crl to load, just certs from '-certfile'\n");
 | 
			
		||||
		ret = 1;
 | 
			
		||||
		goto end;
 | 
			
		||||
		EXIT(1);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	ERR_load_crypto_strings();
 | 
			
		||||
@@ -216,15 +215,15 @@ bad:
 | 
			
		||||
	p7s->contents->type=OBJ_nid2obj(NID_pkcs7_data);
 | 
			
		||||
 | 
			
		||||
	if (!ASN1_INTEGER_set(p7s->version,1)) goto end;
 | 
			
		||||
	if ((crl_stack=sk_X509_CRL_new_null()) == NULL) goto end;
 | 
			
		||||
	if ((crl_stack=sk_X509_CRL_new(NULL)) == NULL) goto end;
 | 
			
		||||
	p7s->crl=crl_stack;
 | 
			
		||||
	if (crl != NULL)
 | 
			
		||||
		{
 | 
			
		||||
		sk_X509_CRL_push(crl_stack,crl);
 | 
			
		||||
		crl=NULL; /* now part of p7 for OPENSSL_freeing */
 | 
			
		||||
		crl=NULL; /* now part of p7 for Freeing */
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
 | 
			
		||||
	if ((cert_stack=sk_X509_new(NULL)) == NULL) goto end;
 | 
			
		||||
	p7s->cert=cert_stack;
 | 
			
		||||
 | 
			
		||||
	if(certflst) for(i = 0; i < sk_num(certflst); i++) {
 | 
			
		||||
@@ -240,15 +239,7 @@ bad:
 | 
			
		||||
	sk_free(certflst);
 | 
			
		||||
 | 
			
		||||
	if (outfile == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_write_filename(out,outfile) <= 0)
 | 
			
		||||
@@ -275,12 +266,11 @@ bad:
 | 
			
		||||
	ret=0;
 | 
			
		||||
end:
 | 
			
		||||
	if (in != NULL) BIO_free(in);
 | 
			
		||||
	if (out != NULL) BIO_free_all(out);
 | 
			
		||||
	if (out != NULL) BIO_free(out);
 | 
			
		||||
	if (p7 != NULL) PKCS7_free(p7);
 | 
			
		||||
	if (crl != NULL) X509_CRL_free(crl);
 | 
			
		||||
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
@@ -337,7 +327,7 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
 | 
			
		||||
 | 
			
		||||
	ret=count;
 | 
			
		||||
end:
 | 
			
		||||
 	/* never need to OPENSSL_free x */
 | 
			
		||||
 	/* never need to Free x */
 | 
			
		||||
	if (in != NULL) BIO_free(in);
 | 
			
		||||
	if (sk != NULL) sk_X509_INFO_free(sk);
 | 
			
		||||
	return(ret);
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										305
									
								
								apps/der_chop.in
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										305
									
								
								apps/der_chop.in
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,305 @@
 | 
			
		||||
#!/usr/local/bin/perl
 | 
			
		||||
#
 | 
			
		||||
# der_chop ... this is one total hack that Eric is really not proud of
 | 
			
		||||
#              so don't look at it and don't ask for support
 | 
			
		||||
#
 | 
			
		||||
# The "documentation" for this (i.e. all the comments) are my fault --tjh
 | 
			
		||||
#
 | 
			
		||||
# This program takes the "raw" output of derparse/asn1parse and 
 | 
			
		||||
# converts it into tokens and then runs regular expression matches
 | 
			
		||||
# to try to figure out what to grab to get the things that are needed
 | 
			
		||||
# and it is possible that this will do the wrong thing as it is a *hack*
 | 
			
		||||
#
 | 
			
		||||
# SSLeay 0.5.2+ should have direct read support for x509 (via -inform NET)
 | 
			
		||||
# [I know ... promises promises :-)]
 | 
			
		||||
#
 | 
			
		||||
# To convert a Netscape Certificate:
 | 
			
		||||
#    der_chop < ServerCert.der > cert.pem
 | 
			
		||||
# To convert a Netscape Key (and encrypt it again to protect it)
 | 
			
		||||
#    rsa -inform NET -in ServerKey.der -des > key.pem
 | 
			
		||||
#
 | 
			
		||||
# 23-Apr-96 eay    Added the extra ASN.1 string types, I still think this
 | 
			
		||||
#		   is an evil hack.  If nothing else the parsing should
 | 
			
		||||
#		   be relative, not absolute.
 | 
			
		||||
# 19-Apr-96 tjh    hacked (with eay) into 0.5.x format
 | 
			
		||||
#
 | 
			
		||||
# Tim Hudson
 | 
			
		||||
# tjh@cryptsoft.com
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
require 'getopts.pl';
 | 
			
		||||
 | 
			
		||||
$debug=0;
 | 
			
		||||
 | 
			
		||||
# this was the 0.4.x way of doing things ...
 | 
			
		||||
$cmd="derparse";
 | 
			
		||||
$x509_cmd="x509";
 | 
			
		||||
$crl_cmd="crl";
 | 
			
		||||
$rc4_cmd="rc4";
 | 
			
		||||
$md2_cmd="md2";
 | 
			
		||||
$md4_cmd="md4";
 | 
			
		||||
$rsa_cmd="rsa -des -inform der ";
 | 
			
		||||
 | 
			
		||||
# this was the 0.5.x way of doing things ...
 | 
			
		||||
$cmd="openssl asn1parse";
 | 
			
		||||
$x509_cmd="openssl x509";
 | 
			
		||||
$crl_cmd="openssl crl";
 | 
			
		||||
$rc4_cmd="openssl rc4";
 | 
			
		||||
$md2_cmd="openssl md2";
 | 
			
		||||
$md4_cmd="openssl md4";
 | 
			
		||||
$rsa_cmd="openssl rsa -des -inform der ";
 | 
			
		||||
 | 
			
		||||
&Getopts('vd:') || die "usage:$0 [-v] [-d num] file";
 | 
			
		||||
$depth=($opt_d =~ /^\d+$/)?$opt_d:0;
 | 
			
		||||
 | 
			
		||||
&init_der();
 | 
			
		||||
 | 
			
		||||
if ($#ARGV != -1)
 | 
			
		||||
	{
 | 
			
		||||
	foreach $file (@ARGV)
 | 
			
		||||
		{
 | 
			
		||||
		print STDERR "doing $file\n";
 | 
			
		||||
		&dofile($file);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
else
 | 
			
		||||
	{
 | 
			
		||||
	$file="/tmp/a$$.DER";
 | 
			
		||||
	open(OUT,">$file") || die "unable to open $file:$!\n";
 | 
			
		||||
	for (;;)
 | 
			
		||||
		{
 | 
			
		||||
		$i=sysread(STDIN,$b,1024*10);
 | 
			
		||||
		last if ($i <= 0);
 | 
			
		||||
		$i=syswrite(OUT,$b,$i);
 | 
			
		||||
		}
 | 
			
		||||
	&dofile($file);
 | 
			
		||||
	unlink($file);
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
sub dofile
 | 
			
		||||
	{
 | 
			
		||||
	local($file)=@_;
 | 
			
		||||
	local(@p);
 | 
			
		||||
 | 
			
		||||
	$b=&load_file($file);
 | 
			
		||||
	@p=&load_file_parse($file);
 | 
			
		||||
 | 
			
		||||
	foreach $_ (@p)
 | 
			
		||||
		{
 | 
			
		||||
		($off,$d,$hl,$len)=&parse_line($_);
 | 
			
		||||
		$d-=$depth;
 | 
			
		||||
		next if ($d != 0);
 | 
			
		||||
		next if ($len == 0);
 | 
			
		||||
 | 
			
		||||
		$o=substr($b,$off,$len+$hl);
 | 
			
		||||
		($str,@data)=&der_str($o);
 | 
			
		||||
		print "$str\n" if ($opt_v);
 | 
			
		||||
		if ($str =~ /^$crl/)
 | 
			
		||||
			{
 | 
			
		||||
			open(OUT,"|$crl_cmd -inform d -hash -issuer") ||
 | 
			
		||||
				die "unable to run $crl_cmd:$!\n";
 | 
			
		||||
			print OUT $o;
 | 
			
		||||
			close(OUT);
 | 
			
		||||
			}
 | 
			
		||||
		elsif ($str =~ /^$x509/)
 | 
			
		||||
			{
 | 
			
		||||
			open(OUT,"|$x509_cmd -inform d -hash -subject -issuer")
 | 
			
		||||
				|| die "unable to run $x509_cmd:$!\n";
 | 
			
		||||
			print OUT $o;
 | 
			
		||||
			close(OUT);
 | 
			
		||||
			}
 | 
			
		||||
		elsif ($str =~ /^$rsa/)
 | 
			
		||||
			{
 | 
			
		||||
			($type)=($data[3] =~ /OBJECT_IDENTIFIER :(.*)\s*$/);
 | 
			
		||||
			next unless ($type eq "rsaEncryption");
 | 
			
		||||
			($off,$d,$hl,$len)=&parse_line($data[5]);
 | 
			
		||||
			$os=substr($o,$off+$hl,$len);
 | 
			
		||||
			open(OUT,"|$rsa_cmd")
 | 
			
		||||
				|| die "unable to run $rsa_cmd:$!\n";
 | 
			
		||||
			print OUT $os;
 | 
			
		||||
			close(OUT);
 | 
			
		||||
			}
 | 
			
		||||
		elsif ($str =~ /^0G-1D-1G/)
 | 
			
		||||
			{
 | 
			
		||||
			($off,$d,$hl,$len)=&parse_line($data[1]);
 | 
			
		||||
			$os=substr($o,$off+$hl,$len);
 | 
			
		||||
			print STDERR "<$os>\n" if $opt_v;
 | 
			
		||||
			&do_certificate($o,@data)
 | 
			
		||||
				if (($os eq "certificate") &&
 | 
			
		||||
				    ($str =! /^0G-1D-1G-2G-3F-3E-2D/));
 | 
			
		||||
			&do_private_key($o,@data)
 | 
			
		||||
				if (($os eq "private-key") &&
 | 
			
		||||
				    ($str =! /^0G-1D-1G-2G-3F-3E-2D/));
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
sub der_str
 | 
			
		||||
	{
 | 
			
		||||
	local($str)=@_;
 | 
			
		||||
	local(*OUT,*IN,@a,$t,$d,$ret);
 | 
			
		||||
	local($file)="/tmp/b$$.DER";
 | 
			
		||||
	local(@ret);
 | 
			
		||||
 | 
			
		||||
	open(OUT,">$file");
 | 
			
		||||
	print OUT $str;
 | 
			
		||||
	close(OUT);
 | 
			
		||||
	open(IN,"$cmd -inform 'd' -in $file |") ||
 | 
			
		||||
		die "unable to run $cmd:$!\n";
 | 
			
		||||
	$ret="";
 | 
			
		||||
	while (<IN>)
 | 
			
		||||
		{
 | 
			
		||||
		chop;
 | 
			
		||||
		push(@ret,$_);
 | 
			
		||||
 | 
			
		||||
		print STDERR "$_\n" if ($debug);
 | 
			
		||||
 | 
			
		||||
		@a=split(/\s*:\s*/);
 | 
			
		||||
		($d)=($a[1] =~ /d=\s*(\d+)/);
 | 
			
		||||
		$a[2] =~ s/\s+$//;
 | 
			
		||||
		$t=$DER_s2i{$a[2]};
 | 
			
		||||
		$ret.="$d$t-";
 | 
			
		||||
		}
 | 
			
		||||
	close(IN);
 | 
			
		||||
	unlink($file);
 | 
			
		||||
	chop $ret;
 | 
			
		||||
	$ret =~ s/(-3H(-4G-5F-5[IJKMQRS])+)+/-NAME/g;
 | 
			
		||||
	$ret =~ s/(-3G-4B-4L)+/-RCERT/g;
 | 
			
		||||
	return($ret,@ret);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
sub init_der
 | 
			
		||||
	{
 | 
			
		||||
	$crl= "0G-1G-2G-3F-3E-2G-NAME-2L-2L-2G-RCERT-1G-2F-2E-1C";
 | 
			
		||||
	$x509="0G-1G-2B-2G-3F-3E-2G-NAME-2G-3L-3L-2G-NAME-2G-3G-4F-4E-3C-1G-2F-2E-1C";
 | 
			
		||||
	$rsa= "0G-1B-1G-2F-2E-1D";
 | 
			
		||||
 | 
			
		||||
	%DER_i2s=(
 | 
			
		||||
		# SSLeay 0.4.x has this list
 | 
			
		||||
		"A","EOC",
 | 
			
		||||
		"B","INTEGER",
 | 
			
		||||
		"C","BIT STRING",
 | 
			
		||||
		"D","OCTET STRING",
 | 
			
		||||
		"E","NULL",
 | 
			
		||||
		"F","OBJECT",
 | 
			
		||||
		"G","SEQUENCE",
 | 
			
		||||
		"H","SET",
 | 
			
		||||
		"I","PRINTABLESTRING",
 | 
			
		||||
		"J","T61STRING",
 | 
			
		||||
		"K","IA5STRING",
 | 
			
		||||
		"L","UTCTIME",
 | 
			
		||||
		"M","NUMERICSTRING",
 | 
			
		||||
		"N","VIDEOTEXSTRING",
 | 
			
		||||
		"O","GENERALIZEDTIME",
 | 
			
		||||
		"P","GRAPHICSTRING",
 | 
			
		||||
		"Q","ISO64STRING",
 | 
			
		||||
		"R","GENERALSTRING",
 | 
			
		||||
		"S","UNIVERSALSTRING",
 | 
			
		||||
 | 
			
		||||
		# SSLeay 0.5.x changed some things ... and I'm
 | 
			
		||||
		# leaving in the old stuff but adding in these
 | 
			
		||||
		# to handle the new as well --tjh
 | 
			
		||||
		# - Well I've just taken them out and added the extra new
 | 
			
		||||
		# ones :-) - eay
 | 
			
		||||
		);
 | 
			
		||||
 | 
			
		||||
	foreach (keys %DER_i2s)
 | 
			
		||||
		{ $DER_s2i{$DER_i2s{$_}}=$_; }
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
sub parse_line
 | 
			
		||||
	{
 | 
			
		||||
	local($_)=@_;
 | 
			
		||||
 | 
			
		||||
	return(/\s*(\d+):d=\s*(\d+)\s+hl=\s*(\d+)\s+l=\s*(\d+|inf)\s/);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
#  0:d=0 hl=4 l=377 cons: univ: SEQUENCE          
 | 
			
		||||
#  4:d=1 hl=2 l= 11 prim: univ: OCTET_STRING      
 | 
			
		||||
# 17:d=1 hl=4 l=360 cons: univ: SEQUENCE          
 | 
			
		||||
# 21:d=2 hl=2 l= 12 cons: univ: SEQUENCE          
 | 
			
		||||
# 23:d=3 hl=2 l=  8 prim: univ: OBJECT_IDENTIFIER :rc4
 | 
			
		||||
# 33:d=3 hl=2 l=  0 prim: univ: NULL              
 | 
			
		||||
# 35:d=2 hl=4 l=342 prim: univ: OCTET_STRING
 | 
			
		||||
sub do_private_key
 | 
			
		||||
	{
 | 
			
		||||
	local($data,@struct)=@_;
 | 
			
		||||
	local($file)="/tmp/b$$.DER";
 | 
			
		||||
	local($off,$d,$hl,$len,$_,$b,@p,$s);
 | 
			
		||||
 | 
			
		||||
	($type)=($struct[4] =~ /OBJECT_IDENTIFIER :(.*)\s*$/);
 | 
			
		||||
	if ($type eq "rc4")
 | 
			
		||||
		{
 | 
			
		||||
		($off,$d,$hl,$len)=&parse_line($struct[6]);
 | 
			
		||||
		open(OUT,"|$rc4_cmd >$file") ||
 | 
			
		||||
			die "unable to run $rc4_cmd:$!\n";
 | 
			
		||||
		print OUT substr($data,$off+$hl,$len);
 | 
			
		||||
		close(OUT);
 | 
			
		||||
 | 
			
		||||
		$b=&load_file($file);
 | 
			
		||||
		unlink($file);
 | 
			
		||||
 | 
			
		||||
		($s,@p)=&der_str($b);
 | 
			
		||||
		die "unknown rsa key type\n$s\n"
 | 
			
		||||
			if ($s ne '0G-1B-1G-2F-2E-1D');
 | 
			
		||||
		local($off,$d,$hl,$len)=&parse_line($p[5]);
 | 
			
		||||
		$b=substr($b,$off+$hl,$len);
 | 
			
		||||
		($s,@p)=&der_str($b);
 | 
			
		||||
		open(OUT,"|$rsa_cmd") || die "unable to run $rsa_cmd:$!\n";
 | 
			
		||||
		print OUT $b;
 | 
			
		||||
		close(OUT);
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		print "'$type' is unknown\n";
 | 
			
		||||
		exit(1);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
sub do_certificate
 | 
			
		||||
	{
 | 
			
		||||
	local($data,@struct)=@_;
 | 
			
		||||
	local($file)="/tmp/b$$.DER";
 | 
			
		||||
	local($off,$d,$hl,$len,$_,$b,@p,$s);
 | 
			
		||||
 | 
			
		||||
	($off,$d,$hl,$len)=&parse_line($struct[2]);
 | 
			
		||||
	$b=substr($data,$off,$len+$hl);
 | 
			
		||||
 | 
			
		||||
	open(OUT,"|$x509_cmd -inform d") || die "unable to run $x509_cmd:$!\n";
 | 
			
		||||
	print OUT $b;
 | 
			
		||||
	close(OUT);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
sub load_file
 | 
			
		||||
	{
 | 
			
		||||
	local($file)=@_;
 | 
			
		||||
	local(*IN,$r,$b,$i);
 | 
			
		||||
 | 
			
		||||
	$r="";
 | 
			
		||||
	open(IN,"<$file") || die "unable to open $file:$!\n";
 | 
			
		||||
	for (;;)
 | 
			
		||||
		{
 | 
			
		||||
		$i=sysread(IN,$b,10240);
 | 
			
		||||
		last if ($i <= 0);
 | 
			
		||||
		$r.=$b;
 | 
			
		||||
		}
 | 
			
		||||
	close(IN);
 | 
			
		||||
	return($r);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
sub load_file_parse
 | 
			
		||||
	{
 | 
			
		||||
	local($file)=@_;
 | 
			
		||||
	local(*IN,$r,@ret,$_,$i,$n,$b);
 | 
			
		||||
 | 
			
		||||
	open(IN,"$cmd -inform d -in $file|")
 | 
			
		||||
		|| die "unable to run der_parse\n";
 | 
			
		||||
	while (<IN>)
 | 
			
		||||
		{
 | 
			
		||||
		chop;
 | 
			
		||||
		push(@ret,$_);
 | 
			
		||||
		}
 | 
			
		||||
	return($r,@ret);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										388
									
								
								apps/dgst.c
									
									
									
									
									
								
							
							
						
						
									
										388
									
								
								apps/dgst.c
									
									
									
									
									
								
							@@ -66,7 +66,6 @@
 | 
			
		||||
#include <openssl/objects.h>
 | 
			
		||||
#include <openssl/x509.h>
 | 
			
		||||
#include <openssl/pem.h>
 | 
			
		||||
#include <openssl/hmac.h>
 | 
			
		||||
 | 
			
		||||
#undef BUFSIZE
 | 
			
		||||
#define BUFSIZE	1024*8
 | 
			
		||||
@@ -74,44 +73,26 @@
 | 
			
		||||
#undef PROG
 | 
			
		||||
#define PROG	dgst_main
 | 
			
		||||
 | 
			
		||||
int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 | 
			
		||||
	  EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,
 | 
			
		||||
	  const char *file,BIO *bmd,const char *hmac_key, int non_fips_allow);
 | 
			
		||||
void do_fp(unsigned char *buf,BIO *f,int sep);
 | 
			
		||||
 | 
			
		||||
int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
	ENGINE *e = NULL;
 | 
			
		||||
	unsigned char *buf=NULL;
 | 
			
		||||
	int i,err=0;
 | 
			
		||||
	const EVP_MD *md=NULL,*m;
 | 
			
		||||
	BIO *in=NULL,*inp;
 | 
			
		||||
	BIO *bmd=NULL;
 | 
			
		||||
	BIO *out = NULL;
 | 
			
		||||
	const char *name;
 | 
			
		||||
#define PROG_NAME_SIZE  39
 | 
			
		||||
	char pname[PROG_NAME_SIZE+1];
 | 
			
		||||
#define PROG_NAME_SIZE  16
 | 
			
		||||
	char pname[PROG_NAME_SIZE];
 | 
			
		||||
	int separator=0;
 | 
			
		||||
	int debug=0;
 | 
			
		||||
	int keyform=FORMAT_PEM;
 | 
			
		||||
	const char *outfile = NULL, *keyfile = NULL;
 | 
			
		||||
	const char *sigfile = NULL, *randfile = NULL;
 | 
			
		||||
	int out_bin = -1, want_pub = 0, do_verify = 0;
 | 
			
		||||
	EVP_PKEY *sigkey = NULL;
 | 
			
		||||
	unsigned char *sigbuf = NULL;
 | 
			
		||||
	int siglen = 0;
 | 
			
		||||
	unsigned int sig_flags = 0;
 | 
			
		||||
	char *passargin = NULL, *passin = NULL;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	char *engine=NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	char *hmac_key=NULL;
 | 
			
		||||
	int non_fips_allow = 0;
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
ERR_load_crypto_strings();
 | 
			
		||||
	if ((buf=(unsigned char *)OPENSSL_malloc(BUFSIZE)) == NULL)
 | 
			
		||||
 | 
			
		||||
	if ((buf=(unsigned char *)Malloc(BUFSIZE)) == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err,"out of memory\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
@@ -120,11 +101,8 @@ ERR_load_crypto_strings();
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
	/* first check the program name */
 | 
			
		||||
	program_name(argv[0],pname,sizeof pname);
 | 
			
		||||
	program_name(argv[0],pname,PROG_NAME_SIZE);
 | 
			
		||||
 | 
			
		||||
	md=EVP_get_digestbyname(pname);
 | 
			
		||||
 | 
			
		||||
@@ -135,92 +113,8 @@ ERR_load_crypto_strings();
 | 
			
		||||
		if ((*argv)[0] != '-') break;
 | 
			
		||||
		if (strcmp(*argv,"-c") == 0)
 | 
			
		||||
			separator=1;
 | 
			
		||||
		else if (strcmp(*argv,"-rand") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) break;
 | 
			
		||||
			randfile=*(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-out") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) break;
 | 
			
		||||
			outfile=*(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-sign") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) break;
 | 
			
		||||
			keyfile=*(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (!strcmp(*argv,"-passin"))
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1)
 | 
			
		||||
				break;
 | 
			
		||||
			passargin=*++argv;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-verify") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) break;
 | 
			
		||||
			keyfile=*(++argv);
 | 
			
		||||
			want_pub = 1;
 | 
			
		||||
			do_verify = 1;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-prverify") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) break;
 | 
			
		||||
			keyfile=*(++argv);
 | 
			
		||||
			do_verify = 1;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-x931") == 0)
 | 
			
		||||
			sig_flags = EVP_MD_CTX_FLAG_PAD_X931;
 | 
			
		||||
		else if (strcmp(*argv,"-pss_saltlen") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			int saltlen;
 | 
			
		||||
			if (--argc < 1) break;
 | 
			
		||||
			saltlen=atoi(*(++argv));
 | 
			
		||||
			if (saltlen == -1)
 | 
			
		||||
				sig_flags = EVP_MD_CTX_FLAG_PSS_MREC;
 | 
			
		||||
			else if (saltlen == -2)
 | 
			
		||||
				sig_flags = EVP_MD_CTX_FLAG_PSS_MDLEN;
 | 
			
		||||
			else if (saltlen < -2 || saltlen >= 0xFFFE)
 | 
			
		||||
				{
 | 
			
		||||
				BIO_printf(bio_err, "Invalid PSS salt length %d\n", saltlen);
 | 
			
		||||
				goto end;
 | 
			
		||||
				}
 | 
			
		||||
			else
 | 
			
		||||
				sig_flags = saltlen;
 | 
			
		||||
			sig_flags <<= 16;
 | 
			
		||||
			sig_flags |= EVP_MD_CTX_FLAG_PAD_PSS;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-signature") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) break;
 | 
			
		||||
			sigfile=*(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-keyform") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) break;
 | 
			
		||||
			keyform=str2fmt(*(++argv));
 | 
			
		||||
			}
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		else if (strcmp(*argv,"-engine") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) break;
 | 
			
		||||
			engine= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
		else if (strcmp(*argv,"-hex") == 0)
 | 
			
		||||
			out_bin = 0;
 | 
			
		||||
		else if (strcmp(*argv,"-binary") == 0)
 | 
			
		||||
			out_bin = 1;
 | 
			
		||||
		else if (strcmp(*argv,"-d") == 0)
 | 
			
		||||
			debug=1;
 | 
			
		||||
		else if (strcmp(*argv,"-non-fips-allow") == 0)
 | 
			
		||||
			non_fips_allow=1;
 | 
			
		||||
		else if (!strcmp(*argv,"-hmac"))
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1)
 | 
			
		||||
				break;
 | 
			
		||||
			hmac_key=*++argv;
 | 
			
		||||
			}
 | 
			
		||||
		else if ((m=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
 | 
			
		||||
			md=m;
 | 
			
		||||
		else
 | 
			
		||||
@@ -232,79 +126,35 @@ ERR_load_crypto_strings();
 | 
			
		||||
	if (md == NULL)
 | 
			
		||||
		md=EVP_md5();
 | 
			
		||||
 | 
			
		||||
	if(do_verify && !sigfile) {
 | 
			
		||||
		BIO_printf(bio_err, "No signature to verify: use the -signature option\n");
 | 
			
		||||
		err = 1; 
 | 
			
		||||
		goto end;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if ((argc > 0) && (argv[0][0] == '-')) /* bad option */
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err,"unknown option '%s'\n",*argv);
 | 
			
		||||
		BIO_printf(bio_err,"options are\n");
 | 
			
		||||
		BIO_printf(bio_err,"-c              to output the digest with separating colons\n");
 | 
			
		||||
		BIO_printf(bio_err,"-d              to output debug info\n");
 | 
			
		||||
		BIO_printf(bio_err,"-hex            output as hex dump\n");
 | 
			
		||||
		BIO_printf(bio_err,"-binary         output in binary form\n");
 | 
			
		||||
		BIO_printf(bio_err,"-sign   file    sign digest using private key in file\n");
 | 
			
		||||
		BIO_printf(bio_err,"-verify file    verify a signature using public key in file\n");
 | 
			
		||||
		BIO_printf(bio_err,"-prverify file  verify a signature using private key in file\n");
 | 
			
		||||
		BIO_printf(bio_err,"-keyform arg    key file format (PEM or ENGINE)\n");
 | 
			
		||||
		BIO_printf(bio_err,"-signature file signature to verify\n");
 | 
			
		||||
		BIO_printf(bio_err,"-binary         output in binary form\n");
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		BIO_printf(bio_err,"-engine e       use engine e, possibly a hardware device.\n");
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm (default)\n",
 | 
			
		||||
		BIO_printf(bio_err,"-c   to output the digest with separating colons\n");
 | 
			
		||||
		BIO_printf(bio_err,"-d   to output debug info\n");
 | 
			
		||||
		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm (default)\n",
 | 
			
		||||
			LN_md5,LN_md5);
 | 
			
		||||
		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 | 
			
		||||
			LN_md4,LN_md4);
 | 
			
		||||
		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 | 
			
		||||
		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
 | 
			
		||||
			LN_md2,LN_md2);
 | 
			
		||||
#ifndef OPENSSL_NO_SHA
 | 
			
		||||
		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 | 
			
		||||
		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
 | 
			
		||||
			LN_sha1,LN_sha1);
 | 
			
		||||
		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 | 
			
		||||
		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
 | 
			
		||||
			LN_sha,LN_sha);
 | 
			
		||||
#ifndef OPENSSL_NO_SHA256
 | 
			
		||||
		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 | 
			
		||||
			LN_sha224,LN_sha224);
 | 
			
		||||
		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 | 
			
		||||
			LN_sha256,LN_sha256);
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SHA512
 | 
			
		||||
		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 | 
			
		||||
			LN_sha384,LN_sha384);
 | 
			
		||||
		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 | 
			
		||||
			LN_sha512,LN_sha512);
 | 
			
		||||
#endif
 | 
			
		||||
#endif
 | 
			
		||||
		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 | 
			
		||||
		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
 | 
			
		||||
			LN_mdc2,LN_mdc2);
 | 
			
		||||
		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 | 
			
		||||
		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
 | 
			
		||||
			LN_ripemd160,LN_ripemd160);
 | 
			
		||||
		err=1;
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
	
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
        e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	in=BIO_new(BIO_s_file());
 | 
			
		||||
	bmd=BIO_new(BIO_f_md());
 | 
			
		||||
	if (debug)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_callback(in,BIO_debug_callback);
 | 
			
		||||
		/* needed for windows 3.1 */
 | 
			
		||||
		BIO_set_callback_arg(in,(char *)bio_err);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if(!app_passwd(bio_err, passargin, NULL, &passin, NULL))
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err, "Error getting password\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
		BIO_set_callback_arg(in,bio_err);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if ((in == NULL) || (bmd == NULL))
 | 
			
		||||
@@ -313,236 +163,60 @@ ERR_load_crypto_strings();
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if(out_bin == -1) {
 | 
			
		||||
		if(keyfile) out_bin = 1;
 | 
			
		||||
		else out_bin = 0;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if(randfile)
 | 
			
		||||
		app_RAND_load_file(randfile, bio_err, 0);
 | 
			
		||||
 | 
			
		||||
	if(outfile) {
 | 
			
		||||
		if(out_bin)
 | 
			
		||||
			out = BIO_new_file(outfile, "wb");
 | 
			
		||||
		else    out = BIO_new_file(outfile, "w");
 | 
			
		||||
	} else {
 | 
			
		||||
		out = BIO_new_fp(stdout, BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if(!out) {
 | 
			
		||||
		BIO_printf(bio_err, "Error opening output file %s\n", 
 | 
			
		||||
					outfile ? outfile : "(stdout)");
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		goto end;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if(keyfile)
 | 
			
		||||
		{
 | 
			
		||||
		if (want_pub)
 | 
			
		||||
			sigkey = load_pubkey(bio_err, keyfile, keyform, 0, NULL,
 | 
			
		||||
				e, "key file");
 | 
			
		||||
		else
 | 
			
		||||
			sigkey = load_key(bio_err, keyfile, keyform, 0, passin,
 | 
			
		||||
				e, "key file");
 | 
			
		||||
		if (!sigkey)
 | 
			
		||||
			{
 | 
			
		||||
			/* load_[pub]key() has already printed an appropriate
 | 
			
		||||
			   message */
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if(sigfile && sigkey) {
 | 
			
		||||
		BIO *sigbio;
 | 
			
		||||
		sigbio = BIO_new_file(sigfile, "rb");
 | 
			
		||||
		siglen = EVP_PKEY_size(sigkey);
 | 
			
		||||
		sigbuf = OPENSSL_malloc(siglen);
 | 
			
		||||
		if(!sigbio) {
 | 
			
		||||
			BIO_printf(bio_err, "Error opening signature file %s\n",
 | 
			
		||||
								sigfile);
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
			goto end;
 | 
			
		||||
		}
 | 
			
		||||
		siglen = BIO_read(sigbio, sigbuf, siglen);
 | 
			
		||||
		BIO_free(sigbio);
 | 
			
		||||
		if(siglen <= 0) {
 | 
			
		||||
			BIO_printf(bio_err, "Error reading signature file %s\n",
 | 
			
		||||
								sigfile);
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
			goto end;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (non_fips_allow)
 | 
			
		||||
		{
 | 
			
		||||
		EVP_MD_CTX *md_ctx;
 | 
			
		||||
		BIO_get_md_ctx(bmd,&md_ctx);
 | 
			
		||||
		EVP_MD_CTX_set_flags(md_ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (sig_flags)
 | 
			
		||||
		{
 | 
			
		||||
		EVP_MD_CTX *md_ctx;
 | 
			
		||||
		BIO_get_md_ctx(bmd,&md_ctx);
 | 
			
		||||
		EVP_MD_CTX_set_flags(md_ctx, sig_flags);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	/* we use md as a filter, reading from 'in' */
 | 
			
		||||
	if (!BIO_set_md(bmd,md))
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err, "Error setting digest %s\n", pname);
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
	BIO_set_md(bmd,md);
 | 
			
		||||
	inp=BIO_push(bmd,in);
 | 
			
		||||
 | 
			
		||||
	if (argc == 0)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_fp(in,stdin,BIO_NOCLOSE);
 | 
			
		||||
		err=do_fp(out, buf,inp,separator, out_bin, sigkey, sigbuf,
 | 
			
		||||
			  siglen,"","(stdin)",bmd,hmac_key,non_fips_allow);
 | 
			
		||||
		do_fp(buf,inp,separator);
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		name=OBJ_nid2sn(md->type);
 | 
			
		||||
		for (i=0; i<argc; i++)
 | 
			
		||||
			{
 | 
			
		||||
			char *tmp,*tofree=NULL;
 | 
			
		||||
			int r;
 | 
			
		||||
 | 
			
		||||
			if (BIO_read_filename(in,argv[i]) <= 0)
 | 
			
		||||
				{
 | 
			
		||||
				perror(argv[i]);
 | 
			
		||||
				err++;
 | 
			
		||||
				continue;
 | 
			
		||||
				}
 | 
			
		||||
			if(!out_bin)
 | 
			
		||||
				{
 | 
			
		||||
				size_t len = strlen(name)+strlen(argv[i])+(hmac_key ? 5 : 0)+5;
 | 
			
		||||
				tmp=tofree=OPENSSL_malloc(len);
 | 
			
		||||
				BIO_snprintf(tmp,len,"%s%s(%s)= ",
 | 
			
		||||
							 hmac_key ? "HMAC-" : "",name,argv[i]);
 | 
			
		||||
				}
 | 
			
		||||
			else
 | 
			
		||||
				tmp="";
 | 
			
		||||
			r=do_fp(out,buf,inp,separator,out_bin,sigkey,sigbuf,
 | 
			
		||||
				siglen,tmp,argv[i],bmd,hmac_key,non_fips_allow);
 | 
			
		||||
			if(r)
 | 
			
		||||
			    err=r;
 | 
			
		||||
			if(tofree)
 | 
			
		||||
				OPENSSL_free(tofree);
 | 
			
		||||
			printf("%s(%s)= ",name,argv[i]);
 | 
			
		||||
			do_fp(buf,inp,separator);
 | 
			
		||||
			(void)BIO_reset(bmd);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
end:
 | 
			
		||||
	if (buf != NULL)
 | 
			
		||||
		{
 | 
			
		||||
		OPENSSL_cleanse(buf,BUFSIZE);
 | 
			
		||||
		OPENSSL_free(buf);
 | 
			
		||||
		memset(buf,0,BUFSIZE);
 | 
			
		||||
		Free(buf);
 | 
			
		||||
		}
 | 
			
		||||
	if (in != NULL) BIO_free(in);
 | 
			
		||||
	if (passin)
 | 
			
		||||
		OPENSSL_free(passin);
 | 
			
		||||
	BIO_free_all(out);
 | 
			
		||||
	EVP_PKEY_free(sigkey);
 | 
			
		||||
	if(sigbuf) OPENSSL_free(sigbuf);
 | 
			
		||||
	if (bmd != NULL) BIO_free(bmd);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(err);
 | 
			
		||||
	EXIT(err);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 | 
			
		||||
	  EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,
 | 
			
		||||
	  const char *file,BIO *bmd,const char *hmac_key,int non_fips_allow)
 | 
			
		||||
void do_fp(unsigned char *buf, BIO *bp, int sep)
 | 
			
		||||
	{
 | 
			
		||||
	unsigned int len;
 | 
			
		||||
	int len;
 | 
			
		||||
	int i;
 | 
			
		||||
	EVP_MD_CTX *md_ctx;
 | 
			
		||||
	HMAC_CTX hmac_ctx;
 | 
			
		||||
 | 
			
		||||
	if (hmac_key)
 | 
			
		||||
		{
 | 
			
		||||
		EVP_MD *md;
 | 
			
		||||
 | 
			
		||||
		BIO_get_md(bmd,&md);
 | 
			
		||||
		HMAC_CTX_init(&hmac_ctx);
 | 
			
		||||
		HMAC_Init_ex(&hmac_ctx,hmac_key,strlen(hmac_key),md, NULL);
 | 
			
		||||
		BIO_get_md_ctx(bmd,&md_ctx);
 | 
			
		||||
		BIO_set_md_ctx(bmd,&hmac_ctx.md_ctx);
 | 
			
		||||
		}
 | 
			
		||||
	for (;;)
 | 
			
		||||
		{
 | 
			
		||||
		i=BIO_read(bp,(char *)buf,BUFSIZE);
 | 
			
		||||
		if(i < 0)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err, "Read Error in %s\n",file);
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
			return 1;
 | 
			
		||||
			}
 | 
			
		||||
		if (i == 0) break;
 | 
			
		||||
		if (i <= 0) break;
 | 
			
		||||
		}
 | 
			
		||||
	if(sigin)
 | 
			
		||||
		{
 | 
			
		||||
		EVP_MD_CTX *ctx;
 | 
			
		||||
		BIO_get_md_ctx(bp, &ctx);
 | 
			
		||||
		i = EVP_VerifyFinal(ctx, sigin, (unsigned int)siglen, key); 
 | 
			
		||||
		if(i > 0)
 | 
			
		||||
			BIO_printf(out, "Verified OK\n");
 | 
			
		||||
		else if(i == 0)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(out, "Verification Failure\n");
 | 
			
		||||
			return 1;
 | 
			
		||||
			}
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err, "Error Verifying Data\n");
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
			return 1;
 | 
			
		||||
			}
 | 
			
		||||
		return 0;
 | 
			
		||||
		}
 | 
			
		||||
	if(key)
 | 
			
		||||
		{
 | 
			
		||||
		EVP_MD_CTX *ctx;
 | 
			
		||||
		BIO_get_md_ctx(bp, &ctx);
 | 
			
		||||
		if(!EVP_SignFinal(ctx, buf, (unsigned int *)&len, key)) 
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err, "Error Signing Data\n");
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
			return 1;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	else if(hmac_key)
 | 
			
		||||
		{
 | 
			
		||||
		HMAC_Final(&hmac_ctx,buf,&len);
 | 
			
		||||
		HMAC_CTX_cleanup(&hmac_ctx);
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		len=BIO_gets(bp,(char *)buf,BUFSIZE);
 | 
			
		||||
	len=BIO_gets(bp,(char *)buf,BUFSIZE);
 | 
			
		||||
 | 
			
		||||
	if(binout) BIO_write(out, buf, len);
 | 
			
		||||
	else 
 | 
			
		||||
	for (i=0; i<len; i++)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_write(out,title,strlen(title));
 | 
			
		||||
		for (i=0; i<(int)len; i++)
 | 
			
		||||
			{
 | 
			
		||||
			if (sep && (i != 0))
 | 
			
		||||
				BIO_printf(out, ":");
 | 
			
		||||
			BIO_printf(out, "%02x",buf[i]);
 | 
			
		||||
			}
 | 
			
		||||
		BIO_printf(out, "\n");
 | 
			
		||||
		if (sep && (i != 0))
 | 
			
		||||
			putc(':',stdout);
 | 
			
		||||
		printf("%02x",buf[i]);
 | 
			
		||||
		}
 | 
			
		||||
	if (hmac_key)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_md_ctx(bmd,md_ctx);
 | 
			
		||||
		}
 | 
			
		||||
	return 0;
 | 
			
		||||
	printf("\n");
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										53
									
								
								apps/dh.c
									
									
									
									
									
								
							
							
						
						
									
										53
									
								
								apps/dh.c
									
									
									
									
									
								
							@@ -1,5 +1,4 @@
 | 
			
		||||
/* apps/dh.c */
 | 
			
		||||
/* obsoleted by dhparam.c */
 | 
			
		||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 | 
			
		||||
 * All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
@@ -57,8 +56,7 @@
 | 
			
		||||
 * [including the GNU Public Licence.]
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include <openssl/opensslconf.h>	/* for OPENSSL_NO_DH */
 | 
			
		||||
#ifndef OPENSSL_NO_DH
 | 
			
		||||
#ifndef NO_DH
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <time.h>
 | 
			
		||||
@@ -88,17 +86,11 @@ int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	ENGINE *e = NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	DH *dh=NULL;
 | 
			
		||||
	int i,badops=0,text=0;
 | 
			
		||||
	BIO *in=NULL,*out=NULL;
 | 
			
		||||
	int informat,outformat,check=0,noout=0,C=0,ret=1;
 | 
			
		||||
	char *infile,*outfile,*prog;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	char *engine;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
 | 
			
		||||
@@ -106,12 +98,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	engine=NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	infile=NULL;
 | 
			
		||||
	outfile=NULL;
 | 
			
		||||
	informat=FORMAT_PEM;
 | 
			
		||||
@@ -142,13 +128,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			outfile= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		else if (strcmp(*argv,"-engine") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			engine= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
		else if (strcmp(*argv,"-check") == 0)
 | 
			
		||||
			check=1;
 | 
			
		||||
		else if (strcmp(*argv,"-text") == 0)
 | 
			
		||||
@@ -180,18 +159,11 @@ bad:
 | 
			
		||||
		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
 | 
			
		||||
		BIO_printf(bio_err," -C            Output C code\n");
 | 
			
		||||
		BIO_printf(bio_err," -noout        no output\n");
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
 | 
			
		||||
#endif
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	ERR_load_crypto_strings();
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
        e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	in=BIO_new(BIO_s_file());
 | 
			
		||||
	out=BIO_new(BIO_s_file());
 | 
			
		||||
	if ((in == NULL) || (out == NULL))
 | 
			
		||||
@@ -211,15 +183,7 @@ bad:
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	if (outfile == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_write_filename(out,outfile) <= 0)
 | 
			
		||||
@@ -270,8 +234,8 @@ bad:
 | 
			
		||||
			}
 | 
			
		||||
		if (i & DH_CHECK_P_NOT_PRIME)
 | 
			
		||||
			printf("p value is not prime\n");
 | 
			
		||||
		if (i & DH_CHECK_P_NOT_SAFE_PRIME)
 | 
			
		||||
			printf("p value is not a safe prime\n");
 | 
			
		||||
		if (i & DH_CHECK_P_NOT_STRONG_PRIME)
 | 
			
		||||
			printf("p value is not a strong prime\n");
 | 
			
		||||
		if (i & DH_UNABLE_TO_CHECK_GENERATOR)
 | 
			
		||||
			printf("unable to check the generator value\n");
 | 
			
		||||
		if (i & DH_NOT_SUITABLE_GENERATOR)
 | 
			
		||||
@@ -286,10 +250,10 @@ bad:
 | 
			
		||||
 | 
			
		||||
		len=BN_num_bytes(dh->p);
 | 
			
		||||
		bits=BN_num_bits(dh->p);
 | 
			
		||||
		data=(unsigned char *)OPENSSL_malloc(len);
 | 
			
		||||
		data=(unsigned char *)Malloc(len);
 | 
			
		||||
		if (data == NULL)
 | 
			
		||||
			{
 | 
			
		||||
			perror("OPENSSL_malloc");
 | 
			
		||||
			perror("Malloc");
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		l=BN_bn2bin(dh->p,data);
 | 
			
		||||
@@ -320,7 +284,7 @@ bad:
 | 
			
		||||
		printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
 | 
			
		||||
		printf("\t\treturn(NULL);\n");
 | 
			
		||||
		printf("\treturn(dh);\n\t}\n");
 | 
			
		||||
		OPENSSL_free(data);
 | 
			
		||||
		Free(data);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -344,9 +308,8 @@ bad:
 | 
			
		||||
	ret=0;
 | 
			
		||||
end:
 | 
			
		||||
	if (in != NULL) BIO_free(in);
 | 
			
		||||
	if (out != NULL) BIO_free_all(out);
 | 
			
		||||
	if (out != NULL) BIO_free(out);
 | 
			
		||||
	if (dh != NULL) DH_free(dh);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
@@ -1,10 +1,5 @@
 | 
			
		||||
-----BEGIN DH PARAMETERS-----
 | 
			
		||||
MIGHAoGBAPSI/VhOSdvNILSd5JEHNmszbDgNRR0PfIizHHxbLY7288kjwEPwpVsY
 | 
			
		||||
jY67VYy4XTjTNP18F1dDox0YbN4zISy1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6
 | 
			
		||||
ypUM2Zafq9AKUJsCRtMIPWakXUGfnHy9iUsiGSa6q6Jew1XpL3jHAgEC
 | 
			
		||||
MIGHAoGBAJf2QmHKtQXdKCjhPx1ottPb0PMTBH9A6FbaWMsTuKG/K3g6TG1Z1fkq
 | 
			
		||||
/Gz/PWk/eLI9TzFgqVAuPvr3q14a1aZeVUMTgo2oO5/y2UHe6VaJ+trqCTat3xlx
 | 
			
		||||
/mNbIK9HA2RgPC3gWfVLZQrY+gz3ASHHR5nXWHEyvpuZm7m3h+irAgEC
 | 
			
		||||
-----END DH PARAMETERS-----
 | 
			
		||||
 | 
			
		||||
These are the 1024 bit DH parameters from "Assigned Number for SKIP Protocols"
 | 
			
		||||
(http://www.skip-vpn.org/spec/numbers.html).
 | 
			
		||||
See there for how they were generated.
 | 
			
		||||
Note that g is not a generator, but this is not a problem since p is a safe prime.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,12 +0,0 @@
 | 
			
		||||
-----BEGIN DH PARAMETERS-----
 | 
			
		||||
MIIBCAKCAQEA9kJXtwh/CBdyorrWqULzBej5UxE5T7bxbrlLOCDaAadWoxTpj0BV
 | 
			
		||||
89AHxstDqZSt90xkhkn4DIO9ZekX1KHTUPj1WV/cdlJPPT2N286Z4VeSWc39uK50
 | 
			
		||||
T8X8dryDxUcwYc58yWb/Ffm7/ZFexwGq01uejaClcjrUGvC/RgBYK+X0iP1YTknb
 | 
			
		||||
zSC0neSRBzZrM2w4DUUdD3yIsxx8Wy2O9vPJI8BD8KVbGI2Ou1WMuF040zT9fBdX
 | 
			
		||||
Q6MdGGzeMyEstSr/POGxKUAYEY18hKcKctaGxAMZyAcpesqVDNmWn6vQClCbAkbT
 | 
			
		||||
CD1mpF1Bn5x8vYlLIhkmuquiXsNV6TILOwIBAg==
 | 
			
		||||
-----END DH PARAMETERS-----
 | 
			
		||||
 | 
			
		||||
These are the 2048 bit DH parameters from "Assigned Number for SKIP Protocols"
 | 
			
		||||
(http://www.skip-vpn.org/spec/numbers.html).
 | 
			
		||||
See there for how they were generated.
 | 
			
		||||
@@ -1,18 +0,0 @@
 | 
			
		||||
-----BEGIN DH PARAMETERS-----
 | 
			
		||||
MIICCAKCAgEA+hRyUsFN4VpJ1O8JLcCo/VWr19k3BCgJ4uk+d+KhehjdRqNDNyOQ
 | 
			
		||||
l/MOyQNQfWXPeGKmOmIig6Ev/nm6Nf9Z2B1h3R4hExf+zTiHnvVPeRBhjdQi81rt
 | 
			
		||||
Xeoh6TNrSBIKIHfUJWBh3va0TxxjQIs6IZOLeVNRLMqzeylWqMf49HsIXqbcokUS
 | 
			
		||||
Vt1BkvLdW48j8PPv5DsKRN3tloTxqDJGo9tKvj1Fuk74A+Xda1kNhB7KFlqMyN98
 | 
			
		||||
VETEJ6c7KpfOo30mnK30wqw3S8OtaIR/maYX72tGOno2ehFDkq3pnPtEbD2CScxc
 | 
			
		||||
alJC+EL7RPk5c/tgeTvCngvc1KZn92Y//EI7G9tPZtylj2b56sHtMftIoYJ9+ODM
 | 
			
		||||
sccD5Piz/rejE3Ome8EOOceUSCYAhXn8b3qvxVI1ddd1pED6FHRhFvLrZxFvBEM9
 | 
			
		||||
ERRMp5QqOaHJkM+Dxv8Cj6MqrCbfC4u+ZErxodzuusgDgvZiLF22uxMZbobFWyte
 | 
			
		||||
OvOzKGtwcTqO/1wV5gKkzu1ZVswVUQd5Gg8lJicwqRWyyNRczDDoG9jVDxmogKTH
 | 
			
		||||
AaqLulO7R8Ifa1SwF2DteSGVtgWEN8gDpN3RBmmPTDngyF2DHb5qmpnznwtFKdTL
 | 
			
		||||
KWbuHn491xNO25CQWMtem80uKw+pTnisBRF/454n1Jnhub144YRBoN8CAQI=
 | 
			
		||||
-----END DH PARAMETERS-----
 | 
			
		||||
 | 
			
		||||
These are the 4096 bit DH parameters from "Assigned Number for SKIP Protocols"
 | 
			
		||||
(http://www.skip-vpn.org/spec/numbers.html).
 | 
			
		||||
See there for how they were generated.
 | 
			
		||||
Note that g is not a generator, but this is not a problem since p is a safe prime.
 | 
			
		||||
@@ -1,9 +0,0 @@
 | 
			
		||||
-----BEGIN DH PARAMETERS-----
 | 
			
		||||
MEYCQQD1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWak
 | 
			
		||||
XUGfnHy9iUsiGSa6q6Jew1XpKgVfAgEC
 | 
			
		||||
-----END DH PARAMETERS-----
 | 
			
		||||
 | 
			
		||||
These are the 512 bit DH parameters from "Assigned Number for SKIP Protocols"
 | 
			
		||||
(http://www.skip-vpn.org/spec/numbers.html).
 | 
			
		||||
See there for how they were generated.
 | 
			
		||||
Note that g is not a generator, but this is not a problem since p is a safe prime.
 | 
			
		||||
							
								
								
									
										263
									
								
								apps/dhparam.c
									
									
									
									
									
								
							
							
						
						
									
										263
									
								
								apps/dhparam.c
									
									
									
									
									
								
							@@ -55,62 +55,8 @@
 | 
			
		||||
 * copied and put under another distribution licence
 | 
			
		||||
 * [including the GNU Public Licence.]
 | 
			
		||||
 */
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * 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 above 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 acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 | 
			
		||||
 *    endorse or promote products derived from this software without
 | 
			
		||||
 *    prior written permission. For written permission, please contact
 | 
			
		||||
 *    openssl-core@openssl.org.
 | 
			
		||||
 *
 | 
			
		||||
 * 5. Products derived from this software may not be called "OpenSSL"
 | 
			
		||||
 *    nor may "OpenSSL" appear in their names without prior written
 | 
			
		||||
 *    permission of the OpenSSL Project.
 | 
			
		||||
 *
 | 
			
		||||
 * 6. Redistributions of any form whatsoever must retain the following
 | 
			
		||||
 *    acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 | 
			
		||||
 * EXPRESSED 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 OpenSSL PROJECT OR
 | 
			
		||||
 * ITS 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.
 | 
			
		||||
 * ====================================================================
 | 
			
		||||
 *
 | 
			
		||||
 * This product includes cryptographic software written by Eric Young
 | 
			
		||||
 * (eay@cryptsoft.com).  This product includes software written by Tim
 | 
			
		||||
 * Hudson (tjh@cryptsoft.com).
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include <openssl/opensslconf.h>	/* for OPENSSL_NO_DH */
 | 
			
		||||
#ifndef OPENSSL_NO_DH
 | 
			
		||||
#ifndef NO_DH
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <time.h>
 | 
			
		||||
@@ -123,10 +69,6 @@
 | 
			
		||||
#include <openssl/x509.h>
 | 
			
		||||
#include <openssl/pem.h>
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_DSA
 | 
			
		||||
#include <openssl/dsa.h>
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#undef PROG
 | 
			
		||||
#define PROG	dhparam_main
 | 
			
		||||
 | 
			
		||||
@@ -136,34 +78,24 @@
 | 
			
		||||
 * -outform arg - output format - default PEM
 | 
			
		||||
 * -in arg	- input file - default stdin
 | 
			
		||||
 * -out arg	- output file - default stdout
 | 
			
		||||
 * -dsaparam  - read or generate DSA parameters, convert to DH
 | 
			
		||||
 * -check	- check the parameters are ok
 | 
			
		||||
 * -noout
 | 
			
		||||
 * -text
 | 
			
		||||
 * -C
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
 | 
			
		||||
static void MS_CALLBACK dh_cb(int p, int n, void *arg);
 | 
			
		||||
 | 
			
		||||
int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	ENGINE *e = NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	DH *dh=NULL;
 | 
			
		||||
	int i,badops=0,text=0;
 | 
			
		||||
#ifndef OPENSSL_NO_DSA
 | 
			
		||||
	int dsaparam=0;
 | 
			
		||||
#endif
 | 
			
		||||
	BIO *in=NULL,*out=NULL;
 | 
			
		||||
	int informat,outformat,check=0,noout=0,C=0,ret=1;
 | 
			
		||||
	char *infile,*outfile,*prog;
 | 
			
		||||
	char *inrand=NULL;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	char *engine=NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	int num = 0, g = 0;
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
@@ -172,9 +104,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
	infile=NULL;
 | 
			
		||||
	outfile=NULL;
 | 
			
		||||
	informat=FORMAT_PEM;
 | 
			
		||||
@@ -205,21 +134,10 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			outfile= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		else if (strcmp(*argv,"-engine") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			engine= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
		else if (strcmp(*argv,"-check") == 0)
 | 
			
		||||
			check=1;
 | 
			
		||||
		else if (strcmp(*argv,"-text") == 0)
 | 
			
		||||
			text=1;
 | 
			
		||||
#ifndef OPENSSL_NO_DSA
 | 
			
		||||
		else if (strcmp(*argv,"-dsaparam") == 0)
 | 
			
		||||
			dsaparam=1;
 | 
			
		||||
#endif
 | 
			
		||||
		else if (strcmp(*argv,"-C") == 0)
 | 
			
		||||
			C=1;
 | 
			
		||||
		else if (strcmp(*argv,"-noout") == 0)
 | 
			
		||||
@@ -248,19 +166,13 @@ bad:
 | 
			
		||||
		BIO_printf(bio_err," -outform arg  output format - one of DER PEM\n");
 | 
			
		||||
		BIO_printf(bio_err," -in arg       input file\n");
 | 
			
		||||
		BIO_printf(bio_err," -out arg      output file\n");
 | 
			
		||||
#ifndef OPENSSL_NO_DSA
 | 
			
		||||
		BIO_printf(bio_err," -dsaparam     read or generate DSA parameters, convert to DH\n");
 | 
			
		||||
#endif
 | 
			
		||||
		BIO_printf(bio_err," -check        check the DH parameters\n");
 | 
			
		||||
		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
 | 
			
		||||
		BIO_printf(bio_err," -C            Output C code\n");
 | 
			
		||||
		BIO_printf(bio_err," -2            generate parameters using  2 as the generator value\n");
 | 
			
		||||
		BIO_printf(bio_err," -5            generate parameters using  5 as the generator value\n");
 | 
			
		||||
		BIO_printf(bio_err," numbits       number of bits in to generate (default 512)\n");
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
 | 
			
		||||
#endif
 | 
			
		||||
		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 | 
			
		||||
		BIO_printf(bio_err," -rand file:file:...\n");
 | 
			
		||||
		BIO_printf(bio_err,"               - load the file (or the files in the directory) into\n");
 | 
			
		||||
		BIO_printf(bio_err,"               the random number generator\n");
 | 
			
		||||
		BIO_printf(bio_err," -noout        no output\n");
 | 
			
		||||
@@ -269,34 +181,11 @@ bad:
 | 
			
		||||
 | 
			
		||||
	ERR_load_crypto_strings();
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
        e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	if (g && !num)
 | 
			
		||||
		num = DEFBITS;
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_DSA
 | 
			
		||||
	if (dsaparam)
 | 
			
		||||
		{
 | 
			
		||||
		if (g)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err, "generator may not be chosen for DSA parameters\n");
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
#endif
 | 
			
		||||
		{
 | 
			
		||||
		/* DH parameters */
 | 
			
		||||
		if (num && !g)
 | 
			
		||||
			g = 2;
 | 
			
		||||
		}
 | 
			
		||||
	if(g && !num) num = DEFBITS;
 | 
			
		||||
	else if(num && !g) g = 2;
 | 
			
		||||
 | 
			
		||||
	if(num) {
 | 
			
		||||
 | 
			
		||||
		BN_GENCB cb;
 | 
			
		||||
		BN_GENCB_set(&cb, dh_cb, bio_err);
 | 
			
		||||
		if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
 | 
			
		||||
@@ -305,41 +194,11 @@ bad:
 | 
			
		||||
			BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 | 
			
		||||
				app_RAND_load_files(inrand));
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_DSA
 | 
			
		||||
		if (dsaparam)
 | 
			
		||||
			{
 | 
			
		||||
			DSA *dsa = DSA_new();
 | 
			
		||||
		BIO_printf(bio_err,"Generating DH parameters, %d bit long strong prime, generator of %d\n",num,g);
 | 
			
		||||
		BIO_printf(bio_err,"This is going to take a long time\n");
 | 
			
		||||
		dh=DH_generate_parameters(num,g,dh_cb,bio_err);
 | 
			
		||||
			
 | 
			
		||||
			BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
 | 
			
		||||
			if(!dsa || !DSA_generate_parameters_ex(dsa, num,
 | 
			
		||||
						NULL, 0, NULL, NULL, &cb))
 | 
			
		||||
				{
 | 
			
		||||
				if(dsa) DSA_free(dsa);
 | 
			
		||||
				ERR_print_errors(bio_err);
 | 
			
		||||
				goto end;
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
			dh = DSA_dup_DH(dsa);
 | 
			
		||||
			DSA_free(dsa);
 | 
			
		||||
			if (dh == NULL)
 | 
			
		||||
				{
 | 
			
		||||
				ERR_print_errors(bio_err);
 | 
			
		||||
				goto end;
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		else
 | 
			
		||||
#endif
 | 
			
		||||
			{
 | 
			
		||||
			dh = DH_new();
 | 
			
		||||
			BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
 | 
			
		||||
			BIO_printf(bio_err,"This is going to take a long time\n");
 | 
			
		||||
			if(!dh || !DH_generate_parameters_ex(dh, num, g, &cb))
 | 
			
		||||
				{
 | 
			
		||||
				if(dh) DH_free(dh);
 | 
			
		||||
				ERR_print_errors(bio_err);
 | 
			
		||||
				goto end;
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		if (dh == NULL) goto end;
 | 
			
		||||
 | 
			
		||||
		app_RAND_write_file(NULL, bio_err);
 | 
			
		||||
	} else {
 | 
			
		||||
@@ -361,54 +220,22 @@ bad:
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		if	(informat != FORMAT_ASN1 && informat != FORMAT_PEM)
 | 
			
		||||
		if	(informat == FORMAT_ASN1)
 | 
			
		||||
			dh=d2i_DHparams_bio(in,NULL);
 | 
			
		||||
		else if (informat == FORMAT_PEM)
 | 
			
		||||
			dh=PEM_read_bio_DHparams(in,NULL,NULL,NULL);
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err,"bad input format specified\n");
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_DSA
 | 
			
		||||
		if (dsaparam)
 | 
			
		||||
		if (dh == NULL)
 | 
			
		||||
			{
 | 
			
		||||
			DSA *dsa;
 | 
			
		||||
			
 | 
			
		||||
			if (informat == FORMAT_ASN1)
 | 
			
		||||
				dsa=d2i_DSAparams_bio(in,NULL);
 | 
			
		||||
			else /* informat == FORMAT_PEM */
 | 
			
		||||
				dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL);
 | 
			
		||||
			
 | 
			
		||||
			if (dsa == NULL)
 | 
			
		||||
				{
 | 
			
		||||
				BIO_printf(bio_err,"unable to load DSA parameters\n");
 | 
			
		||||
				ERR_print_errors(bio_err);
 | 
			
		||||
				goto end;
 | 
			
		||||
				}
 | 
			
		||||
			
 | 
			
		||||
			dh = DSA_dup_DH(dsa);
 | 
			
		||||
			DSA_free(dsa);
 | 
			
		||||
			if (dh == NULL)
 | 
			
		||||
				{
 | 
			
		||||
				ERR_print_errors(bio_err);
 | 
			
		||||
				goto end;
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		else
 | 
			
		||||
#endif
 | 
			
		||||
			{
 | 
			
		||||
			if (informat == FORMAT_ASN1)
 | 
			
		||||
				dh=d2i_DHparams_bio(in,NULL);
 | 
			
		||||
			else /* informat == FORMAT_PEM */
 | 
			
		||||
				dh=PEM_read_bio_DHparams(in,NULL,NULL,NULL);
 | 
			
		||||
			
 | 
			
		||||
			if (dh == NULL)
 | 
			
		||||
				{
 | 
			
		||||
				BIO_printf(bio_err,"unable to load DH parameters\n");
 | 
			
		||||
				ERR_print_errors(bio_err);
 | 
			
		||||
				goto end;
 | 
			
		||||
				}
 | 
			
		||||
			BIO_printf(bio_err,"unable to load DH parameters\n");
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		/* dh != NULL */
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	out=BIO_new(BIO_s_file());
 | 
			
		||||
@@ -418,15 +245,7 @@ bad:
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
	if (outfile == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_write_filename(out,outfile) <= 0)
 | 
			
		||||
@@ -437,6 +256,7 @@ bad:
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	
 | 
			
		||||
 | 
			
		||||
	if (text)
 | 
			
		||||
		{
 | 
			
		||||
		DHparams_print(out,dh);
 | 
			
		||||
@@ -451,8 +271,8 @@ bad:
 | 
			
		||||
			}
 | 
			
		||||
		if (i & DH_CHECK_P_NOT_PRIME)
 | 
			
		||||
			printf("p value is not prime\n");
 | 
			
		||||
		if (i & DH_CHECK_P_NOT_SAFE_PRIME)
 | 
			
		||||
			printf("p value is not a safe prime\n");
 | 
			
		||||
		if (i & DH_CHECK_P_NOT_STRONG_PRIME)
 | 
			
		||||
			printf("p value is not a strong prime\n");
 | 
			
		||||
		if (i & DH_UNABLE_TO_CHECK_GENERATOR)
 | 
			
		||||
			printf("unable to check the generator value\n");
 | 
			
		||||
		if (i & DH_NOT_SUITABLE_GENERATOR)
 | 
			
		||||
@@ -467,35 +287,31 @@ bad:
 | 
			
		||||
 | 
			
		||||
		len=BN_num_bytes(dh->p);
 | 
			
		||||
		bits=BN_num_bits(dh->p);
 | 
			
		||||
		data=(unsigned char *)OPENSSL_malloc(len);
 | 
			
		||||
		data=(unsigned char *)Malloc(len);
 | 
			
		||||
		if (data == NULL)
 | 
			
		||||
			{
 | 
			
		||||
			perror("OPENSSL_malloc");
 | 
			
		||||
			perror("Malloc");
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		printf("#ifndef HEADER_DH_H\n"
 | 
			
		||||
		       "#include <openssl/dh.h>\n"
 | 
			
		||||
		       "#endif\n");
 | 
			
		||||
		printf("DH *get_dh%d()\n\t{\n",bits);
 | 
			
		||||
 | 
			
		||||
		l=BN_bn2bin(dh->p,data);
 | 
			
		||||
		printf("\tstatic unsigned char dh%d_p[]={",bits);
 | 
			
		||||
		printf("static unsigned char dh%d_p[]={",bits);
 | 
			
		||||
		for (i=0; i<l; i++)
 | 
			
		||||
			{
 | 
			
		||||
			if ((i%12) == 0) printf("\n\t\t");
 | 
			
		||||
			if ((i%12) == 0) printf("\n\t");
 | 
			
		||||
			printf("0x%02X,",data[i]);
 | 
			
		||||
			}
 | 
			
		||||
		printf("\n\t\t};\n");
 | 
			
		||||
		printf("\n\t};\n");
 | 
			
		||||
 | 
			
		||||
		l=BN_bn2bin(dh->g,data);
 | 
			
		||||
		printf("\tstatic unsigned char dh%d_g[]={",bits);
 | 
			
		||||
		printf("static unsigned char dh%d_g[]={",bits);
 | 
			
		||||
		for (i=0; i<l; i++)
 | 
			
		||||
			{
 | 
			
		||||
			if ((i%12) == 0) printf("\n\t\t");
 | 
			
		||||
			if ((i%12) == 0) printf("\n\t");
 | 
			
		||||
			printf("0x%02X,",data[i]);
 | 
			
		||||
			}
 | 
			
		||||
		printf("\n\t\t};\n");
 | 
			
		||||
		printf("\n\t};\n\n");
 | 
			
		||||
 | 
			
		||||
		printf("DH *get_dh%d()\n\t{\n",bits);
 | 
			
		||||
		printf("\tDH *dh;\n\n");
 | 
			
		||||
		printf("\tif ((dh=DH_new()) == NULL) return(NULL);\n");
 | 
			
		||||
		printf("\tdh->p=BN_bin2bn(dh%d_p,sizeof(dh%d_p),NULL);\n",
 | 
			
		||||
@@ -503,11 +319,9 @@ bad:
 | 
			
		||||
		printf("\tdh->g=BN_bin2bn(dh%d_g,sizeof(dh%d_g),NULL);\n",
 | 
			
		||||
			bits,bits);
 | 
			
		||||
		printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
 | 
			
		||||
		printf("\t\t{ DH_free(dh); return(NULL); }\n");
 | 
			
		||||
		if (dh->length)
 | 
			
		||||
			printf("\tdh->length = %ld;\n", dh->length);
 | 
			
		||||
		printf("\t\treturn(NULL);\n");
 | 
			
		||||
		printf("\treturn(dh);\n\t}\n");
 | 
			
		||||
		OPENSSL_free(data);
 | 
			
		||||
		Free(data);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -531,14 +345,12 @@ bad:
 | 
			
		||||
	ret=0;
 | 
			
		||||
end:
 | 
			
		||||
	if (in != NULL) BIO_free(in);
 | 
			
		||||
	if (out != NULL) BIO_free_all(out);
 | 
			
		||||
	if (out != NULL) BIO_free(out);
 | 
			
		||||
	if (dh != NULL) DH_free(dh);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
/* dh_cb is identical to dsa_cb in apps/dsaparam.c */
 | 
			
		||||
static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
 | 
			
		||||
static void MS_CALLBACK dh_cb(int p, int n, void *arg)
 | 
			
		||||
	{
 | 
			
		||||
	char c='*';
 | 
			
		||||
 | 
			
		||||
@@ -546,12 +358,11 @@ static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
 | 
			
		||||
	if (p == 1) c='+';
 | 
			
		||||
	if (p == 2) c='*';
 | 
			
		||||
	if (p == 3) c='\n';
 | 
			
		||||
	BIO_write(cb->arg,&c,1);
 | 
			
		||||
	(void)BIO_flush(cb->arg);
 | 
			
		||||
	BIO_write((BIO *)arg,&c,1);
 | 
			
		||||
	(void)BIO_flush((BIO *)arg);
 | 
			
		||||
#ifdef LINT
 | 
			
		||||
	p=n;
 | 
			
		||||
#endif
 | 
			
		||||
	return 1;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										67
									
								
								apps/dsa.c
									
									
									
									
									
								
							
							
						
						
									
										67
									
								
								apps/dsa.c
									
									
									
									
									
								
							@@ -56,8 +56,7 @@
 | 
			
		||||
 * [including the GNU Public Licence.]
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include <openssl/opensslconf.h>	/* for OPENSSL_NO_DSA */
 | 
			
		||||
#ifndef OPENSSL_NO_DSA
 | 
			
		||||
#ifndef NO_DSA
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
@@ -69,7 +68,6 @@
 | 
			
		||||
#include <openssl/evp.h>
 | 
			
		||||
#include <openssl/x509.h>
 | 
			
		||||
#include <openssl/pem.h>
 | 
			
		||||
#include <openssl/bn.h>
 | 
			
		||||
 | 
			
		||||
#undef PROG
 | 
			
		||||
#define PROG	dsa_main
 | 
			
		||||
@@ -81,13 +79,6 @@
 | 
			
		||||
 * -des		- encrypt output if PEM format with DES in cbc mode
 | 
			
		||||
 * -des3	- encrypt output if PEM format
 | 
			
		||||
 * -idea	- encrypt output if PEM format
 | 
			
		||||
 * -aes128	- encrypt output if PEM format
 | 
			
		||||
 * -aes192	- encrypt output if PEM format
 | 
			
		||||
 * -aes256	- encrypt output if PEM format
 | 
			
		||||
 * -camellia128 - encrypt output if PEM format
 | 
			
		||||
 * -camellia192 - encrypt output if PEM format
 | 
			
		||||
 * -camellia256 - encrypt output if PEM format
 | 
			
		||||
 * -seed        - encrypt output if PEM format
 | 
			
		||||
 * -text	- print a text version
 | 
			
		||||
 * -modulus	- print the DSA public key
 | 
			
		||||
 */
 | 
			
		||||
@@ -96,9 +87,6 @@ int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	ENGINE *e = NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	int ret=1;
 | 
			
		||||
	DSA *dsa=NULL;
 | 
			
		||||
	int i,badops=0;
 | 
			
		||||
@@ -107,9 +95,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	int informat,outformat,text=0,noout=0;
 | 
			
		||||
	int pubin = 0, pubout = 0;
 | 
			
		||||
	char *infile,*outfile,*prog;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	char *engine;
 | 
			
		||||
#endif
 | 
			
		||||
	char *passargin = NULL, *passargout = NULL;
 | 
			
		||||
	char *passin = NULL, *passout = NULL;
 | 
			
		||||
	int modulus=0;
 | 
			
		||||
@@ -120,12 +105,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	engine=NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	infile=NULL;
 | 
			
		||||
	outfile=NULL;
 | 
			
		||||
	informat=FORMAT_PEM;
 | 
			
		||||
@@ -166,13 +145,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			passargout= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		else if (strcmp(*argv,"-engine") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			engine= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
		else if (strcmp(*argv,"-noout") == 0)
 | 
			
		||||
			noout=1;
 | 
			
		||||
		else if (strcmp(*argv,"-text") == 0)
 | 
			
		||||
@@ -204,24 +176,10 @@ bad:
 | 
			
		||||
		BIO_printf(bio_err," -passin arg     input file pass phrase source\n");
 | 
			
		||||
		BIO_printf(bio_err," -out arg        output file\n");
 | 
			
		||||
		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
 | 
			
		||||
#endif
 | 
			
		||||
		BIO_printf(bio_err," -des            encrypt PEM output with cbc des\n");
 | 
			
		||||
		BIO_printf(bio_err," -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
 | 
			
		||||
#ifndef OPENSSL_NO_IDEA
 | 
			
		||||
#ifndef NO_IDEA
 | 
			
		||||
		BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_AES
 | 
			
		||||
		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
 | 
			
		||||
		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAMELLIA
 | 
			
		||||
		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
 | 
			
		||||
		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SEED
 | 
			
		||||
		BIO_printf(bio_err," -seed           encrypt PEM output with cbc seed\n");
 | 
			
		||||
#endif
 | 
			
		||||
		BIO_printf(bio_err," -text           print the key in text\n");
 | 
			
		||||
		BIO_printf(bio_err," -noout          don't print key out\n");
 | 
			
		||||
@@ -231,10 +189,6 @@ bad:
 | 
			
		||||
 | 
			
		||||
	ERR_load_crypto_strings();
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
        e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
 | 
			
		||||
		BIO_printf(bio_err, "Error getting passwords\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
@@ -279,15 +233,7 @@ bad:
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (outfile == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_write_filename(out,outfile) <= 0)
 | 
			
		||||
@@ -335,11 +281,10 @@ bad:
 | 
			
		||||
		ret=0;
 | 
			
		||||
end:
 | 
			
		||||
	if(in != NULL) BIO_free(in);
 | 
			
		||||
	if(out != NULL) BIO_free_all(out);
 | 
			
		||||
	if(out != NULL) BIO_free(out);
 | 
			
		||||
	if(dsa != NULL) DSA_free(dsa);
 | 
			
		||||
	if(passin) OPENSSL_free(passin);
 | 
			
		||||
	if(passout) OPENSSL_free(passout);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	if(passin) Free(passin);
 | 
			
		||||
	if(passout) Free(passout);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										133
									
								
								apps/dsaparam.c
									
									
									
									
									
								
							
							
						
						
									
										133
									
								
								apps/dsaparam.c
									
									
									
									
									
								
							@@ -56,14 +56,7 @@
 | 
			
		||||
 * [including the GNU Public Licence.]
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include <openssl/opensslconf.h>	/* for OPENSSL_NO_DSA */
 | 
			
		||||
/* Until the key-gen callbacks are modified to use newer prototypes, we allow
 | 
			
		||||
 * deprecated functions for openssl-internal code */
 | 
			
		||||
#ifdef OPENSSL_NO_DEPRECATED
 | 
			
		||||
#undef OPENSSL_NO_DEPRECATED
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_DSA
 | 
			
		||||
#ifndef NO_DSA
 | 
			
		||||
#include <assert.h>
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
@@ -89,31 +82,14 @@
 | 
			
		||||
 * -C
 | 
			
		||||
 * -noout
 | 
			
		||||
 * -genkey
 | 
			
		||||
 *  #ifdef GENCB_TEST
 | 
			
		||||
 * -timebomb n  - interrupt keygen after <n> seconds
 | 
			
		||||
 *  #endif
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#ifdef GENCB_TEST
 | 
			
		||||
 | 
			
		||||
static int stop_keygen_flag = 0;
 | 
			
		||||
 | 
			
		||||
static void timebomb_sigalarm(int foo)
 | 
			
		||||
	{
 | 
			
		||||
	stop_keygen_flag = 1;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb);
 | 
			
		||||
static void MS_CALLBACK dsa_cb(int p, int n, void *arg);
 | 
			
		||||
 | 
			
		||||
int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	ENGINE *e = NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	DSA *dsa=NULL;
 | 
			
		||||
	int i,badops=0,text=0;
 | 
			
		||||
	BIO *in=NULL,*out=NULL;
 | 
			
		||||
@@ -121,12 +97,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	char *infile,*outfile,*prog,*inrand=NULL;
 | 
			
		||||
	int numbits= -1,num,genkey=0;
 | 
			
		||||
	int need_rand=0;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	char *engine=NULL;
 | 
			
		||||
#endif
 | 
			
		||||
#ifdef GENCB_TEST
 | 
			
		||||
	int timebomb=0;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
 | 
			
		||||
@@ -134,9 +104,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
	infile=NULL;
 | 
			
		||||
	outfile=NULL;
 | 
			
		||||
	informat=FORMAT_PEM;
 | 
			
		||||
@@ -167,20 +134,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			outfile= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		else if(strcmp(*argv, "-engine") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			engine = *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
#ifdef GENCB_TEST
 | 
			
		||||
		else if(strcmp(*argv, "-timebomb") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			timebomb = atoi(*(++argv));
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
		else if (strcmp(*argv,"-text") == 0)
 | 
			
		||||
			text=1;
 | 
			
		||||
		else if (strcmp(*argv,"-C") == 0)
 | 
			
		||||
@@ -223,17 +176,10 @@ bad:
 | 
			
		||||
		BIO_printf(bio_err," -outform arg  output format - DER or PEM\n");
 | 
			
		||||
		BIO_printf(bio_err," -in arg       input file\n");
 | 
			
		||||
		BIO_printf(bio_err," -out arg      output file\n");
 | 
			
		||||
		BIO_printf(bio_err," -text         print as text\n");
 | 
			
		||||
		BIO_printf(bio_err," -text         print the key in text\n");
 | 
			
		||||
		BIO_printf(bio_err," -C            Output C code\n");
 | 
			
		||||
		BIO_printf(bio_err," -noout        no output\n");
 | 
			
		||||
		BIO_printf(bio_err," -genkey       generate a DSA key\n");
 | 
			
		||||
		BIO_printf(bio_err," -rand         files to use for random number input\n");
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifdef GENCB_TEST
 | 
			
		||||
		BIO_printf(bio_err," -timebomb n   interrupt keygen after <n> seconds\n");
 | 
			
		||||
#endif
 | 
			
		||||
		BIO_printf(bio_err," number        number of bits to use for generating private key\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
@@ -259,15 +205,7 @@ bad:
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	if (outfile == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_write_filename(out,outfile) <= 0)
 | 
			
		||||
@@ -277,10 +215,6 @@ bad:
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
        e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	if (need_rand)
 | 
			
		||||
		{
 | 
			
		||||
		app_RAND_load_file(NULL, bio_err, (inrand != NULL));
 | 
			
		||||
@@ -291,47 +225,10 @@ bad:
 | 
			
		||||
 | 
			
		||||
	if (numbits > 0)
 | 
			
		||||
		{
 | 
			
		||||
		BN_GENCB cb;
 | 
			
		||||
		BN_GENCB_set(&cb, dsa_cb, bio_err);
 | 
			
		||||
		assert(need_rand);
 | 
			
		||||
		dsa = DSA_new();
 | 
			
		||||
		if(!dsa)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err,"Error allocating DSA object\n");
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
 | 
			
		||||
	        BIO_printf(bio_err,"This could take some time\n");
 | 
			
		||||
#ifdef GENCB_TEST
 | 
			
		||||
		if(timebomb > 0)
 | 
			
		||||
	{
 | 
			
		||||
		struct sigaction act;
 | 
			
		||||
		act.sa_handler = timebomb_sigalarm;
 | 
			
		||||
		act.sa_flags = 0;
 | 
			
		||||
		BIO_printf(bio_err,"(though I'll stop it if not done within %d secs)\n",
 | 
			
		||||
				timebomb);
 | 
			
		||||
		if(sigaction(SIGALRM, &act, NULL) != 0)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err,"Error, couldn't set SIGALRM handler\n");
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		alarm(timebomb);
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
	        if(!DSA_generate_parameters_ex(dsa,num,NULL,0,NULL,NULL, &cb))
 | 
			
		||||
			{
 | 
			
		||||
#ifdef GENCB_TEST
 | 
			
		||||
			if(stop_keygen_flag)
 | 
			
		||||
				{
 | 
			
		||||
				BIO_printf(bio_err,"DSA key generation time-stopped\n");
 | 
			
		||||
				/* This is an asked-for behaviour! */
 | 
			
		||||
				ret = 0;
 | 
			
		||||
				goto end;
 | 
			
		||||
				}
 | 
			
		||||
#endif
 | 
			
		||||
			BIO_printf(bio_err,"Error, DSA key generation failed\n");
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
	        dsa=DSA_generate_parameters(num,NULL,0,NULL,NULL, dsa_cb,bio_err);
 | 
			
		||||
		}
 | 
			
		||||
	else if	(informat == FORMAT_ASN1)
 | 
			
		||||
		dsa=d2i_DSAparams_bio(in,NULL);
 | 
			
		||||
@@ -363,10 +260,10 @@ bad:
 | 
			
		||||
		bits_p=BN_num_bits(dsa->p);
 | 
			
		||||
		bits_q=BN_num_bits(dsa->q);
 | 
			
		||||
		bits_g=BN_num_bits(dsa->g);
 | 
			
		||||
		data=(unsigned char *)OPENSSL_malloc(len+20);
 | 
			
		||||
		data=(unsigned char *)Malloc(len+20);
 | 
			
		||||
		if (data == NULL)
 | 
			
		||||
			{
 | 
			
		||||
			perror("OPENSSL_malloc");
 | 
			
		||||
			perror("Malloc");
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		l=BN_bn2bin(dsa->p,data);
 | 
			
		||||
@@ -406,7 +303,7 @@ bad:
 | 
			
		||||
		printf("\tdsa->g=BN_bin2bn(dsa%d_g,sizeof(dsa%d_g),NULL);\n",
 | 
			
		||||
			bits_p,bits_p);
 | 
			
		||||
		printf("\tif ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))\n");
 | 
			
		||||
		printf("\t\t{ DSA_free(dsa); return(NULL); }\n");
 | 
			
		||||
		printf("\t\treturn(NULL);\n");
 | 
			
		||||
		printf("\treturn(dsa);\n\t}\n");
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
@@ -450,13 +347,12 @@ bad:
 | 
			
		||||
	ret=0;
 | 
			
		||||
end:
 | 
			
		||||
	if (in != NULL) BIO_free(in);
 | 
			
		||||
	if (out != NULL) BIO_free_all(out);
 | 
			
		||||
	if (out != NULL) BIO_free(out);
 | 
			
		||||
	if (dsa != NULL) DSA_free(dsa);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb)
 | 
			
		||||
static void MS_CALLBACK dsa_cb(int p, int n, void *arg)
 | 
			
		||||
	{
 | 
			
		||||
	char c='*';
 | 
			
		||||
 | 
			
		||||
@@ -464,15 +360,10 @@ static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb)
 | 
			
		||||
	if (p == 1) c='+';
 | 
			
		||||
	if (p == 2) c='*';
 | 
			
		||||
	if (p == 3) c='\n';
 | 
			
		||||
	BIO_write(cb->arg,&c,1);
 | 
			
		||||
	(void)BIO_flush(cb->arg);
 | 
			
		||||
	BIO_write(arg,&c,1);
 | 
			
		||||
	(void)BIO_flush(arg);
 | 
			
		||||
#ifdef LINT
 | 
			
		||||
	p=n;
 | 
			
		||||
#endif
 | 
			
		||||
#ifdef GENCB_TEST
 | 
			
		||||
	if(stop_keygen_flag)
 | 
			
		||||
		return 0;
 | 
			
		||||
#endif
 | 
			
		||||
	return 1;
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										131
									
								
								apps/eay.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										131
									
								
								apps/eay.c
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,131 @@
 | 
			
		||||
/* apps/eay.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 <string.h>
 | 
			
		||||
 | 
			
		||||
#define MONOLITH
 | 
			
		||||
#define USE_SOCKETS
 | 
			
		||||
 | 
			
		||||
#include "openssl/e_os.h"
 | 
			
		||||
 | 
			
		||||
#include <openssl/bio.h>
 | 
			
		||||
#include <openssl/stack.h>
 | 
			
		||||
#include <openssl/lhash.h>
 | 
			
		||||
 | 
			
		||||
#include <openssl/err.h>
 | 
			
		||||
 | 
			
		||||
#include <openssl/bn.h>
 | 
			
		||||
 | 
			
		||||
#include <openssl/evp.h>
 | 
			
		||||
 | 
			
		||||
#include <openssl/rand.h>
 | 
			
		||||
#include <openssl/conf.h>
 | 
			
		||||
#include <openssl/txt_db.h>
 | 
			
		||||
 | 
			
		||||
#include <openssl/err.h>
 | 
			
		||||
 | 
			
		||||
#include <openssl/x509.h>
 | 
			
		||||
#include <openssl/pkcs7.h>
 | 
			
		||||
#include <openssl/pem.h>
 | 
			
		||||
#include <openssl/asn1.h>
 | 
			
		||||
#include <openssl/objects.h>
 | 
			
		||||
 | 
			
		||||
#define MONOLITH
 | 
			
		||||
 | 
			
		||||
#include "openssl.c"
 | 
			
		||||
#include "apps.c"
 | 
			
		||||
#include "asn1pars.c"
 | 
			
		||||
#ifndef NO_RSA
 | 
			
		||||
#include "ca.c"
 | 
			
		||||
#include "genrsa.c"
 | 
			
		||||
#include "req.c"
 | 
			
		||||
#include "rsa.c"
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef NO_DH
 | 
			
		||||
#include "gendh.c"
 | 
			
		||||
#include "dh.c"
 | 
			
		||||
#endif
 | 
			
		||||
#include "crl.c"
 | 
			
		||||
#include "crl2p7.c"
 | 
			
		||||
#include "dgst.c"
 | 
			
		||||
#include "enc.c"
 | 
			
		||||
#include "errstr.c"
 | 
			
		||||
#if !defined(NO_SSL2) || !defined(NO_SSL3)
 | 
			
		||||
#ifndef NO_SOCK
 | 
			
		||||
#include "s_cb.c"
 | 
			
		||||
#include "s_client.c"
 | 
			
		||||
#include "s_server.c"
 | 
			
		||||
#include "s_socket.c"
 | 
			
		||||
#include "s_time.c"
 | 
			
		||||
#endif
 | 
			
		||||
#endif
 | 
			
		||||
#include "speed.c"
 | 
			
		||||
#include "verify.c"
 | 
			
		||||
#include "version.c"
 | 
			
		||||
#include "x509.c"
 | 
			
		||||
#include "ciphers.c"
 | 
			
		||||
#include "sess_id.c"
 | 
			
		||||
#include "pkcs7.c"
 | 
			
		||||
#ifndef NO_DSA
 | 
			
		||||
#include "dsaparam.c"
 | 
			
		||||
#include "dsa.c"
 | 
			
		||||
#include "gendsa.c"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										403
									
								
								apps/ec.c
									
									
									
									
									
								
							
							
						
						
									
										403
									
								
								apps/ec.c
									
									
									
									
									
								
							@@ -1,403 +0,0 @@
 | 
			
		||||
/* apps/ec.c */
 | 
			
		||||
/*
 | 
			
		||||
 * Written by Nils Larsch for the OpenSSL project.
 | 
			
		||||
 */
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * 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 above 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 acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 | 
			
		||||
 *    endorse or promote products derived from this software without
 | 
			
		||||
 *    prior written permission. For written permission, please contact
 | 
			
		||||
 *    openssl-core@openssl.org.
 | 
			
		||||
 *
 | 
			
		||||
 * 5. Products derived from this software may not be called "OpenSSL"
 | 
			
		||||
 *    nor may "OpenSSL" appear in their names without prior written
 | 
			
		||||
 *    permission of the OpenSSL Project.
 | 
			
		||||
 *
 | 
			
		||||
 * 6. Redistributions of any form whatsoever must retain the following
 | 
			
		||||
 *    acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 | 
			
		||||
 * EXPRESSED 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 OpenSSL PROJECT OR
 | 
			
		||||
 * ITS 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.
 | 
			
		||||
 * ====================================================================
 | 
			
		||||
 *
 | 
			
		||||
 * This product includes cryptographic software written by Eric Young
 | 
			
		||||
 * (eay@cryptsoft.com).  This product includes software written by Tim
 | 
			
		||||
 * Hudson (tjh@cryptsoft.com).
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include <openssl/opensslconf.h>
 | 
			
		||||
#ifndef OPENSSL_NO_EC
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include "apps.h"
 | 
			
		||||
#include <openssl/bio.h>
 | 
			
		||||
#include <openssl/err.h>
 | 
			
		||||
#include <openssl/evp.h>
 | 
			
		||||
#include <openssl/pem.h>
 | 
			
		||||
 | 
			
		||||
#undef PROG
 | 
			
		||||
#define PROG	ec_main
 | 
			
		||||
 | 
			
		||||
/* -inform arg    - input format - default PEM (one of DER, NET or PEM)
 | 
			
		||||
 * -outform arg   - output format - default PEM
 | 
			
		||||
 * -in arg        - input file - default stdin
 | 
			
		||||
 * -out arg       - output file - default stdout
 | 
			
		||||
 * -des           - encrypt output if PEM format with DES in cbc mode
 | 
			
		||||
 * -text          - print a text version
 | 
			
		||||
 * -param_out     - print the elliptic curve parameters
 | 
			
		||||
 * -conv_form arg - specifies the point encoding form
 | 
			
		||||
 * -param_enc arg - specifies the parameter encoding
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
{
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	ENGINE 	*e = NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	int 	ret = 1;
 | 
			
		||||
	EC_KEY 	*eckey = NULL;
 | 
			
		||||
	const EC_GROUP *group;
 | 
			
		||||
	int 	i, badops = 0;
 | 
			
		||||
	const EVP_CIPHER *enc = NULL;
 | 
			
		||||
	BIO 	*in = NULL, *out = NULL;
 | 
			
		||||
	int 	informat, outformat, text=0, noout=0;
 | 
			
		||||
	int  	pubin = 0, pubout = 0, param_out = 0;
 | 
			
		||||
	char 	*infile, *outfile, *prog, *engine;
 | 
			
		||||
	char 	*passargin = NULL, *passargout = NULL;
 | 
			
		||||
	char 	*passin = NULL, *passout = NULL;
 | 
			
		||||
	point_conversion_form_t form = POINT_CONVERSION_UNCOMPRESSED;
 | 
			
		||||
	int	new_form = 0;
 | 
			
		||||
	int	asn1_flag = OPENSSL_EC_NAMED_CURVE;
 | 
			
		||||
	int 	new_asn1_flag = 0;
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
 | 
			
		||||
	if (bio_err == NULL)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
	engine = NULL;
 | 
			
		||||
	infile = NULL;
 | 
			
		||||
	outfile = NULL;
 | 
			
		||||
	informat = FORMAT_PEM;
 | 
			
		||||
	outformat = FORMAT_PEM;
 | 
			
		||||
 | 
			
		||||
	prog = argv[0];
 | 
			
		||||
	argc--;
 | 
			
		||||
	argv++;
 | 
			
		||||
	while (argc >= 1)
 | 
			
		||||
		{
 | 
			
		||||
		if (strcmp(*argv,"-inform") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			informat=str2fmt(*(++argv));
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-outform") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			outformat=str2fmt(*(++argv));
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-in") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			infile= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-out") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			outfile= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-passin") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			passargin= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-passout") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			passargout= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv, "-engine") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			engine= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv, "-noout") == 0)
 | 
			
		||||
			noout = 1;
 | 
			
		||||
		else if (strcmp(*argv, "-text") == 0)
 | 
			
		||||
			text = 1;
 | 
			
		||||
		else if (strcmp(*argv, "-conv_form") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1)
 | 
			
		||||
				goto bad;
 | 
			
		||||
			++argv;
 | 
			
		||||
			new_form = 1;
 | 
			
		||||
			if (strcmp(*argv, "compressed") == 0)
 | 
			
		||||
				form = POINT_CONVERSION_COMPRESSED;
 | 
			
		||||
			else if (strcmp(*argv, "uncompressed") == 0)
 | 
			
		||||
				form = POINT_CONVERSION_UNCOMPRESSED;
 | 
			
		||||
			else if (strcmp(*argv, "hybrid") == 0)
 | 
			
		||||
				form = POINT_CONVERSION_HYBRID;
 | 
			
		||||
			else
 | 
			
		||||
				goto bad;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv, "-param_enc") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1)
 | 
			
		||||
				goto bad;
 | 
			
		||||
			++argv;
 | 
			
		||||
			new_asn1_flag = 1;
 | 
			
		||||
			if (strcmp(*argv, "named_curve") == 0)
 | 
			
		||||
				asn1_flag = OPENSSL_EC_NAMED_CURVE;
 | 
			
		||||
			else if (strcmp(*argv, "explicit") == 0)
 | 
			
		||||
				asn1_flag = 0;
 | 
			
		||||
			else
 | 
			
		||||
				goto bad;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv, "-param_out") == 0)
 | 
			
		||||
			param_out = 1;
 | 
			
		||||
		else if (strcmp(*argv, "-pubin") == 0)
 | 
			
		||||
			pubin=1;
 | 
			
		||||
		else if (strcmp(*argv, "-pubout") == 0)
 | 
			
		||||
			pubout=1;
 | 
			
		||||
		else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err, "unknown option %s\n", *argv);
 | 
			
		||||
			badops=1;
 | 
			
		||||
			break;
 | 
			
		||||
			}
 | 
			
		||||
		argc--;
 | 
			
		||||
		argv++;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (badops)
 | 
			
		||||
		{
 | 
			
		||||
bad:
 | 
			
		||||
		BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
 | 
			
		||||
		BIO_printf(bio_err, "where options are\n");
 | 
			
		||||
		BIO_printf(bio_err, " -inform arg     input format - "
 | 
			
		||||
				"DER or PEM\n");
 | 
			
		||||
		BIO_printf(bio_err, " -outform arg    output format - "
 | 
			
		||||
				"DER or PEM\n");
 | 
			
		||||
		BIO_printf(bio_err, " -in arg         input file\n");
 | 
			
		||||
		BIO_printf(bio_err, " -passin arg     input file pass "
 | 
			
		||||
				"phrase source\n");
 | 
			
		||||
		BIO_printf(bio_err, " -out arg        output file\n");
 | 
			
		||||
		BIO_printf(bio_err, " -passout arg    output file pass "
 | 
			
		||||
				"phrase source\n");
 | 
			
		||||
		BIO_printf(bio_err, " -engine e       use engine e, "
 | 
			
		||||
				"possibly a hardware device.\n");
 | 
			
		||||
		BIO_printf(bio_err, " -des            encrypt PEM output, "
 | 
			
		||||
				"instead of 'des' every other \n"
 | 
			
		||||
				"                 cipher "
 | 
			
		||||
				"supported by OpenSSL can be used\n");
 | 
			
		||||
		BIO_printf(bio_err, " -text           print the key\n");
 | 
			
		||||
		BIO_printf(bio_err, " -noout          don't print key out\n");
 | 
			
		||||
		BIO_printf(bio_err, " -param_out      print the elliptic "
 | 
			
		||||
				"curve parameters\n");
 | 
			
		||||
		BIO_printf(bio_err, " -conv_form arg  specifies the "
 | 
			
		||||
				"point conversion form \n");
 | 
			
		||||
		BIO_printf(bio_err, "                 possible values:"
 | 
			
		||||
				" compressed\n");
 | 
			
		||||
		BIO_printf(bio_err, "                                 "
 | 
			
		||||
				" uncompressed (default)\n");
 | 
			
		||||
		BIO_printf(bio_err, "                                  "
 | 
			
		||||
				" hybrid\n");
 | 
			
		||||
		BIO_printf(bio_err, " -param_enc arg  specifies the way"
 | 
			
		||||
				" the ec parameters are encoded\n");
 | 
			
		||||
		BIO_printf(bio_err, "                 in the asn1 der "
 | 
			
		||||
				"encoding\n");
 | 
			
		||||
		BIO_printf(bio_err, "                 possilbe values:"
 | 
			
		||||
				" named_curve (default)\n");
 | 
			
		||||
		BIO_printf(bio_err,"                                  "
 | 
			
		||||
				"explicit\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	ERR_load_crypto_strings();
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
        e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) 
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err, "Error getting passwords\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	in = BIO_new(BIO_s_file());
 | 
			
		||||
	out = BIO_new(BIO_s_file());
 | 
			
		||||
	if ((in == NULL) || (out == NULL))
 | 
			
		||||
		{
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (infile == NULL)
 | 
			
		||||
		BIO_set_fp(in, stdin, BIO_NOCLOSE);
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_read_filename(in, infile) <= 0)
 | 
			
		||||
			{
 | 
			
		||||
			perror(infile);
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	BIO_printf(bio_err, "read EC key\n");
 | 
			
		||||
	if (informat == FORMAT_ASN1) 
 | 
			
		||||
		{
 | 
			
		||||
		if (pubin) 
 | 
			
		||||
			eckey = d2i_EC_PUBKEY_bio(in, NULL);
 | 
			
		||||
		else 
 | 
			
		||||
			eckey = d2i_ECPrivateKey_bio(in, NULL);
 | 
			
		||||
		} 
 | 
			
		||||
	else if (informat == FORMAT_PEM) 
 | 
			
		||||
		{
 | 
			
		||||
		if (pubin) 
 | 
			
		||||
			eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, 
 | 
			
		||||
				NULL);
 | 
			
		||||
		else 
 | 
			
		||||
			eckey = PEM_read_bio_ECPrivateKey(in, NULL, NULL,
 | 
			
		||||
				passin);
 | 
			
		||||
		} 
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err, "bad input format specified for key\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
	if (eckey == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err,"unable to load Key\n");
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (outfile == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_fp(out, stdout, BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
			{
 | 
			
		||||
			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
			out = BIO_push(tmpbio, out);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_write_filename(out, outfile) <= 0)
 | 
			
		||||
			{
 | 
			
		||||
			perror(outfile);
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	group = EC_KEY_get0_group(eckey);
 | 
			
		||||
 | 
			
		||||
	if (new_form)
 | 
			
		||||
		EC_KEY_set_conv_form(eckey, form);
 | 
			
		||||
 | 
			
		||||
	if (new_asn1_flag)
 | 
			
		||||
		EC_KEY_set_asn1_flag(eckey, asn1_flag);
 | 
			
		||||
 | 
			
		||||
	if (text) 
 | 
			
		||||
		if (!EC_KEY_print(out, eckey, 0))
 | 
			
		||||
			{
 | 
			
		||||
			perror(outfile);
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
	if (noout) 
 | 
			
		||||
		{
 | 
			
		||||
		ret = 0;
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	BIO_printf(bio_err, "writing EC key\n");
 | 
			
		||||
	if (outformat == FORMAT_ASN1) 
 | 
			
		||||
		{
 | 
			
		||||
		if (param_out)
 | 
			
		||||
			i = i2d_ECPKParameters_bio(out, group);
 | 
			
		||||
		else if (pubin || pubout) 
 | 
			
		||||
			i = i2d_EC_PUBKEY_bio(out, eckey);
 | 
			
		||||
		else 
 | 
			
		||||
			i = i2d_ECPrivateKey_bio(out, eckey);
 | 
			
		||||
		} 
 | 
			
		||||
	else if (outformat == FORMAT_PEM) 
 | 
			
		||||
		{
 | 
			
		||||
		if (param_out)
 | 
			
		||||
			i = PEM_write_bio_ECPKParameters(out, group);
 | 
			
		||||
		else if (pubin || pubout)
 | 
			
		||||
			i = PEM_write_bio_EC_PUBKEY(out, eckey);
 | 
			
		||||
		else 
 | 
			
		||||
			i = PEM_write_bio_ECPrivateKey(out, eckey, enc,
 | 
			
		||||
						NULL, 0, NULL, passout);
 | 
			
		||||
		} 
 | 
			
		||||
	else 
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err, "bad output format specified for "
 | 
			
		||||
			"outfile\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (!i)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err, "unable to write private key\n");
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		ret=0;
 | 
			
		||||
end:
 | 
			
		||||
	if (in)
 | 
			
		||||
		BIO_free(in);
 | 
			
		||||
	if (out)
 | 
			
		||||
		BIO_free_all(out);
 | 
			
		||||
	if (eckey)
 | 
			
		||||
		EC_KEY_free(eckey);
 | 
			
		||||
	if (passin)
 | 
			
		||||
		OPENSSL_free(passin);
 | 
			
		||||
	if (passout)
 | 
			
		||||
		OPENSSL_free(passout);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
							
								
								
									
										728
									
								
								apps/ecparam.c
									
									
									
									
									
								
							
							
						
						
									
										728
									
								
								apps/ecparam.c
									
									
									
									
									
								
							@@ -1,728 +0,0 @@
 | 
			
		||||
/* apps/ecparam.c */
 | 
			
		||||
/*
 | 
			
		||||
 * Written by Nils Larsch for the OpenSSL project.
 | 
			
		||||
 */
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * 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 above 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 acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 | 
			
		||||
 *    endorse or promote products derived from this software without
 | 
			
		||||
 *    prior written permission. For written permission, please contact
 | 
			
		||||
 *    openssl-core@openssl.org.
 | 
			
		||||
 *
 | 
			
		||||
 * 5. Products derived from this software may not be called "OpenSSL"
 | 
			
		||||
 *    nor may "OpenSSL" appear in their names without prior written
 | 
			
		||||
 *    permission of the OpenSSL Project.
 | 
			
		||||
 *
 | 
			
		||||
 * 6. Redistributions of any form whatsoever must retain the following
 | 
			
		||||
 *    acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 | 
			
		||||
 * EXPRESSED 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 OpenSSL PROJECT OR
 | 
			
		||||
 * ITS 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.
 | 
			
		||||
 * ====================================================================
 | 
			
		||||
 *
 | 
			
		||||
 * This product includes cryptographic software written by Eric Young
 | 
			
		||||
 * (eay@cryptsoft.com).  This product includes software written by Tim
 | 
			
		||||
 * Hudson (tjh@cryptsoft.com).
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
 | 
			
		||||
 *
 | 
			
		||||
 * Portions of the attached software ("Contribution") are developed by 
 | 
			
		||||
 * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
 | 
			
		||||
 *
 | 
			
		||||
 * The Contribution is licensed pursuant to the OpenSSL open source
 | 
			
		||||
 * license provided above.
 | 
			
		||||
 *
 | 
			
		||||
 * The elliptic curve binary polynomial software is originally written by 
 | 
			
		||||
 * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include <openssl/opensslconf.h>
 | 
			
		||||
#ifndef OPENSSL_NO_EC
 | 
			
		||||
#include <assert.h>
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <time.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include "apps.h"
 | 
			
		||||
#include <openssl/bio.h>
 | 
			
		||||
#include <openssl/err.h>
 | 
			
		||||
#include <openssl/bn.h>
 | 
			
		||||
#include <openssl/ec.h>
 | 
			
		||||
#include <openssl/x509.h>
 | 
			
		||||
#include <openssl/pem.h>
 | 
			
		||||
 | 
			
		||||
#undef PROG
 | 
			
		||||
#define PROG	ecparam_main
 | 
			
		||||
 | 
			
		||||
/* -inform arg      - input format - default PEM (DER or PEM)
 | 
			
		||||
 * -outform arg     - output format - default PEM
 | 
			
		||||
 * -in  arg         - input file  - default stdin
 | 
			
		||||
 * -out arg         - output file - default stdout
 | 
			
		||||
 * -noout           - do not print the ec parameter
 | 
			
		||||
 * -text            - print the ec parameters in text form
 | 
			
		||||
 * -check           - validate the ec parameters
 | 
			
		||||
 * -C               - print a 'C' function creating the parameters
 | 
			
		||||
 * -name arg        - use the ec parameters with 'short name' name
 | 
			
		||||
 * -list_curves     - prints a list of all currently available curve 'short names'
 | 
			
		||||
 * -conv_form arg   - specifies the point conversion form 
 | 
			
		||||
 *                  - possible values: compressed
 | 
			
		||||
 *                                     uncompressed (default)
 | 
			
		||||
 *                                     hybrid
 | 
			
		||||
 * -param_enc arg   - specifies the way the ec parameters are encoded
 | 
			
		||||
 *                    in the asn1 der encoding
 | 
			
		||||
 *                    possible values: named_curve (default)
 | 
			
		||||
 *                                     explicit
 | 
			
		||||
 * -no_seed         - if 'explicit' parameters are choosen do not use the seed
 | 
			
		||||
 * -genkey          - generate ec key
 | 
			
		||||
 * -rand file       - files to use for random number input
 | 
			
		||||
 * -engine e        - use engine e, possibly a hardware device
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
static int ecparam_print_var(BIO *,BIGNUM *,const char *,int,unsigned char *);
 | 
			
		||||
 | 
			
		||||
int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
	EC_GROUP *group = NULL;
 | 
			
		||||
	point_conversion_form_t form = POINT_CONVERSION_UNCOMPRESSED; 
 | 
			
		||||
	int 	new_form = 0;
 | 
			
		||||
	int 	asn1_flag = OPENSSL_EC_NAMED_CURVE;
 | 
			
		||||
	int 	new_asn1_flag = 0;
 | 
			
		||||
	char 	*curve_name = NULL, *inrand = NULL;
 | 
			
		||||
	int	list_curves = 0, no_seed = 0, check = 0,
 | 
			
		||||
		badops = 0, text = 0, i, need_rand = 0, genkey = 0;
 | 
			
		||||
	char	*infile = NULL, *outfile = NULL, *prog;
 | 
			
		||||
	BIO 	*in = NULL, *out = NULL;
 | 
			
		||||
	int 	informat, outformat, noout = 0, C = 0, ret = 1;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	ENGINE	*e = NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	char	*engine = NULL;
 | 
			
		||||
 | 
			
		||||
	BIGNUM	*ec_p = NULL, *ec_a = NULL, *ec_b = NULL,
 | 
			
		||||
		*ec_gen = NULL, *ec_order = NULL, *ec_cofactor = NULL;
 | 
			
		||||
	unsigned char *buffer = NULL;
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
 | 
			
		||||
	if (bio_err == NULL)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
	informat=FORMAT_PEM;
 | 
			
		||||
	outformat=FORMAT_PEM;
 | 
			
		||||
 | 
			
		||||
	prog=argv[0];
 | 
			
		||||
	argc--;
 | 
			
		||||
	argv++;
 | 
			
		||||
	while (argc >= 1)
 | 
			
		||||
		{
 | 
			
		||||
		if 	(strcmp(*argv,"-inform") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			informat=str2fmt(*(++argv));
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-outform") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			outformat=str2fmt(*(++argv));
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-in") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			infile= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-out") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			outfile= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-text") == 0)
 | 
			
		||||
			text = 1;
 | 
			
		||||
		else if (strcmp(*argv,"-C") == 0)
 | 
			
		||||
			C = 1;
 | 
			
		||||
		else if (strcmp(*argv,"-check") == 0)
 | 
			
		||||
			check = 1;
 | 
			
		||||
		else if (strcmp (*argv, "-name") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1)
 | 
			
		||||
				goto bad;
 | 
			
		||||
			curve_name = *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv, "-list_curves") == 0)
 | 
			
		||||
			list_curves = 1;
 | 
			
		||||
		else if (strcmp(*argv, "-conv_form") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1)
 | 
			
		||||
				goto bad;
 | 
			
		||||
			++argv;
 | 
			
		||||
			new_form = 1;
 | 
			
		||||
			if (strcmp(*argv, "compressed") == 0)
 | 
			
		||||
				form = POINT_CONVERSION_COMPRESSED;
 | 
			
		||||
			else if (strcmp(*argv, "uncompressed") == 0)
 | 
			
		||||
				form = POINT_CONVERSION_UNCOMPRESSED;
 | 
			
		||||
			else if (strcmp(*argv, "hybrid") == 0)
 | 
			
		||||
				form = POINT_CONVERSION_HYBRID;
 | 
			
		||||
			else
 | 
			
		||||
				goto bad;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv, "-param_enc") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1)
 | 
			
		||||
				goto bad;
 | 
			
		||||
			++argv;
 | 
			
		||||
			new_asn1_flag = 1;
 | 
			
		||||
			if (strcmp(*argv, "named_curve") == 0)
 | 
			
		||||
				asn1_flag = OPENSSL_EC_NAMED_CURVE;
 | 
			
		||||
			else if (strcmp(*argv, "explicit") == 0)
 | 
			
		||||
				asn1_flag = 0;
 | 
			
		||||
			else
 | 
			
		||||
				goto bad;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv, "-no_seed") == 0)
 | 
			
		||||
			no_seed = 1;
 | 
			
		||||
		else if (strcmp(*argv, "-noout") == 0)
 | 
			
		||||
			noout=1;
 | 
			
		||||
		else if (strcmp(*argv,"-genkey") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			genkey=1;
 | 
			
		||||
			need_rand=1;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv, "-rand") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			inrand= *(++argv);
 | 
			
		||||
			need_rand=1;
 | 
			
		||||
			}
 | 
			
		||||
		else if(strcmp(*argv, "-engine") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			engine = *(++argv);
 | 
			
		||||
			}	
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err,"unknown option %s\n",*argv);
 | 
			
		||||
			badops=1;
 | 
			
		||||
			break;
 | 
			
		||||
			}
 | 
			
		||||
		argc--;
 | 
			
		||||
		argv++;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (badops)
 | 
			
		||||
		{
 | 
			
		||||
bad:
 | 
			
		||||
		BIO_printf(bio_err, "%s [options] <infile >outfile\n",prog);
 | 
			
		||||
		BIO_printf(bio_err, "where options are\n");
 | 
			
		||||
		BIO_printf(bio_err, " -inform arg       input format - "
 | 
			
		||||
				"default PEM (DER or PEM)\n");
 | 
			
		||||
		BIO_printf(bio_err, " -outform arg      output format - "
 | 
			
		||||
				"default PEM\n");
 | 
			
		||||
		BIO_printf(bio_err, " -in  arg          input file  - "
 | 
			
		||||
				"default stdin\n");
 | 
			
		||||
		BIO_printf(bio_err, " -out arg          output file - "
 | 
			
		||||
				"default stdout\n");
 | 
			
		||||
		BIO_printf(bio_err, " -noout            do not print the "
 | 
			
		||||
				"ec parameter\n");
 | 
			
		||||
		BIO_printf(bio_err, " -text             print the ec "
 | 
			
		||||
				"parameters in text form\n");
 | 
			
		||||
		BIO_printf(bio_err, " -check            validate the ec "
 | 
			
		||||
				"parameters\n");
 | 
			
		||||
		BIO_printf(bio_err, " -C                print a 'C' "
 | 
			
		||||
				"function creating the parameters\n");
 | 
			
		||||
		BIO_printf(bio_err, " -name arg         use the "
 | 
			
		||||
				"ec parameters with 'short name' name\n");
 | 
			
		||||
		BIO_printf(bio_err, " -list_curves      prints a list of "
 | 
			
		||||
				"all currently available curve 'short names'\n");
 | 
			
		||||
		BIO_printf(bio_err, " -conv_form arg    specifies the "
 | 
			
		||||
				"point conversion form \n");
 | 
			
		||||
		BIO_printf(bio_err, "                   possible values:"
 | 
			
		||||
				" compressed\n");
 | 
			
		||||
		BIO_printf(bio_err, "                                   "
 | 
			
		||||
				" uncompressed (default)\n");
 | 
			
		||||
		BIO_printf(bio_err, "                                   "
 | 
			
		||||
				" hybrid\n");
 | 
			
		||||
		BIO_printf(bio_err, " -param_enc arg    specifies the way"
 | 
			
		||||
				" the ec parameters are encoded\n");
 | 
			
		||||
		BIO_printf(bio_err, "                   in the asn1 der "
 | 
			
		||||
				"encoding\n");
 | 
			
		||||
		BIO_printf(bio_err, "                   possible values:"
 | 
			
		||||
				" named_curve (default)\n");
 | 
			
		||||
		BIO_printf(bio_err, "                                   "
 | 
			
		||||
				" explicit\n");
 | 
			
		||||
		BIO_printf(bio_err, " -no_seed          if 'explicit'"
 | 
			
		||||
				" parameters are choosen do not"
 | 
			
		||||
				" use the seed\n");
 | 
			
		||||
		BIO_printf(bio_err, " -genkey           generate ec"
 | 
			
		||||
				" key\n");
 | 
			
		||||
		BIO_printf(bio_err, " -rand file        files to use for"
 | 
			
		||||
				" random number input\n");
 | 
			
		||||
		BIO_printf(bio_err, " -engine e         use engine e, "
 | 
			
		||||
				"possibly a hardware device\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	ERR_load_crypto_strings();
 | 
			
		||||
 | 
			
		||||
	in=BIO_new(BIO_s_file());
 | 
			
		||||
	out=BIO_new(BIO_s_file());
 | 
			
		||||
	if ((in == NULL) || (out == NULL))
 | 
			
		||||
		{
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (infile == NULL)
 | 
			
		||||
		BIO_set_fp(in,stdin,BIO_NOCLOSE);
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_read_filename(in,infile) <= 0)
 | 
			
		||||
			{
 | 
			
		||||
			perror(infile);
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	if (outfile == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_write_filename(out,outfile) <= 0)
 | 
			
		||||
			{
 | 
			
		||||
			perror(outfile);
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	if (list_curves)
 | 
			
		||||
		{
 | 
			
		||||
		EC_builtin_curve *curves = NULL;
 | 
			
		||||
		size_t crv_len = 0;
 | 
			
		||||
		size_t n = 0;
 | 
			
		||||
 | 
			
		||||
		crv_len = EC_get_builtin_curves(NULL, 0);
 | 
			
		||||
 | 
			
		||||
		curves = OPENSSL_malloc((int)(sizeof(EC_builtin_curve) * crv_len));
 | 
			
		||||
 | 
			
		||||
		if (curves == NULL)
 | 
			
		||||
			goto end;
 | 
			
		||||
 | 
			
		||||
		if (!EC_get_builtin_curves(curves, crv_len))
 | 
			
		||||
			{
 | 
			
		||||
			OPENSSL_free(curves);
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		
 | 
			
		||||
		for (n = 0; n < crv_len; n++)
 | 
			
		||||
			{
 | 
			
		||||
			const char *comment;
 | 
			
		||||
			const char *sname;
 | 
			
		||||
			comment = curves[n].comment;
 | 
			
		||||
			sname   = OBJ_nid2sn(curves[n].nid);
 | 
			
		||||
			if (comment == NULL)
 | 
			
		||||
				comment = "CURVE DESCRIPTION NOT AVAILABLE";
 | 
			
		||||
			if (sname == NULL)
 | 
			
		||||
				sname = "";
 | 
			
		||||
 | 
			
		||||
			BIO_printf(out, "  %-10s: ", sname);
 | 
			
		||||
			BIO_printf(out, "%s\n", comment);
 | 
			
		||||
			} 
 | 
			
		||||
 | 
			
		||||
		OPENSSL_free(curves);
 | 
			
		||||
		ret = 0;
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (curve_name != NULL)
 | 
			
		||||
		{
 | 
			
		||||
		int nid;
 | 
			
		||||
 | 
			
		||||
		/* workaround for the SECG curve names secp192r1
 | 
			
		||||
		 * and secp256r1 (which are the same as the curves
 | 
			
		||||
		 * prime192v1 and prime256v1 defined in X9.62)
 | 
			
		||||
		 */
 | 
			
		||||
		if (!strcmp(curve_name, "secp192r1"))
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err, "using curve name prime192v1 "
 | 
			
		||||
				"instead of secp192r1\n");
 | 
			
		||||
			nid = NID_X9_62_prime192v1;
 | 
			
		||||
			}
 | 
			
		||||
		else if (!strcmp(curve_name, "secp256r1"))
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err, "using curve name prime256v1 "
 | 
			
		||||
				"instead of secp256r1\n");
 | 
			
		||||
			nid = NID_X9_62_prime256v1;
 | 
			
		||||
			}
 | 
			
		||||
		else
 | 
			
		||||
			nid = OBJ_sn2nid(curve_name);
 | 
			
		||||
	
 | 
			
		||||
		if (nid == 0)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err, "unknown curve name (%s)\n", 
 | 
			
		||||
				curve_name);
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		group = EC_GROUP_new_by_curve_name(nid);
 | 
			
		||||
		if (group == NULL)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err, "unable to create curve (%s)\n", 
 | 
			
		||||
				curve_name);
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		EC_GROUP_set_asn1_flag(group, asn1_flag);
 | 
			
		||||
		EC_GROUP_set_point_conversion_form(group, form);
 | 
			
		||||
		}
 | 
			
		||||
	else if (informat == FORMAT_ASN1)
 | 
			
		||||
		{
 | 
			
		||||
		group = d2i_ECPKParameters_bio(in, NULL);
 | 
			
		||||
		}
 | 
			
		||||
	else if (informat == FORMAT_PEM)
 | 
			
		||||
		{
 | 
			
		||||
		group = PEM_read_bio_ECPKParameters(in,NULL,NULL,NULL);
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err, "bad input format specified\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (group == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err, 
 | 
			
		||||
			"unable to load elliptic curve parameters\n");
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (new_form)
 | 
			
		||||
		EC_GROUP_set_point_conversion_form(group, form);
 | 
			
		||||
 | 
			
		||||
	if (new_asn1_flag)
 | 
			
		||||
		EC_GROUP_set_asn1_flag(group, asn1_flag);
 | 
			
		||||
 | 
			
		||||
	if (no_seed)
 | 
			
		||||
		{
 | 
			
		||||
		EC_GROUP_set_seed(group, NULL, 0);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (text)
 | 
			
		||||
		{
 | 
			
		||||
		if (!ECPKParameters_print(out, group, 0))
 | 
			
		||||
			goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (check)
 | 
			
		||||
		{
 | 
			
		||||
		if (group == NULL)
 | 
			
		||||
			BIO_printf(bio_err, "no elliptic curve parameters\n");
 | 
			
		||||
		BIO_printf(bio_err, "checking elliptic curve parameters: ");
 | 
			
		||||
		if (!EC_GROUP_check(group, NULL))
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err, "failed\n");
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
			}
 | 
			
		||||
		else
 | 
			
		||||
			BIO_printf(bio_err, "ok\n");
 | 
			
		||||
			
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (C)
 | 
			
		||||
		{
 | 
			
		||||
		size_t	buf_len = 0, tmp_len = 0;
 | 
			
		||||
		const EC_POINT *point;
 | 
			
		||||
		int	is_prime, len = 0;
 | 
			
		||||
		const EC_METHOD *meth = EC_GROUP_method_of(group);
 | 
			
		||||
 | 
			
		||||
		if ((ec_p = BN_new()) == NULL || (ec_a = BN_new()) == NULL ||
 | 
			
		||||
		    (ec_b = BN_new()) == NULL || (ec_gen = BN_new()) == NULL ||
 | 
			
		||||
		    (ec_order = BN_new()) == NULL || 
 | 
			
		||||
		    (ec_cofactor = BN_new()) == NULL )
 | 
			
		||||
			{
 | 
			
		||||
			perror("OPENSSL_malloc");
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		is_prime = (EC_METHOD_get_field_type(meth) == 
 | 
			
		||||
			NID_X9_62_prime_field);
 | 
			
		||||
 | 
			
		||||
		if (is_prime)
 | 
			
		||||
			{
 | 
			
		||||
			if (!EC_GROUP_get_curve_GFp(group, ec_p, ec_a,
 | 
			
		||||
				ec_b, NULL))
 | 
			
		||||
				goto end;
 | 
			
		||||
			}
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
			/* TODO */
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		if ((point = EC_GROUP_get0_generator(group)) == NULL)
 | 
			
		||||
			goto end;
 | 
			
		||||
		if (!EC_POINT_point2bn(group, point, 
 | 
			
		||||
			EC_GROUP_get_point_conversion_form(group), ec_gen, 
 | 
			
		||||
			NULL))
 | 
			
		||||
			goto end;
 | 
			
		||||
		if (!EC_GROUP_get_order(group, ec_order, NULL))
 | 
			
		||||
			goto end;
 | 
			
		||||
		if (!EC_GROUP_get_cofactor(group, ec_cofactor, NULL))
 | 
			
		||||
			goto end;
 | 
			
		||||
 | 
			
		||||
		if (!ec_p || !ec_a || !ec_b || !ec_gen || 
 | 
			
		||||
			!ec_order || !ec_cofactor)
 | 
			
		||||
			goto end;
 | 
			
		||||
 | 
			
		||||
		len = BN_num_bits(ec_order);
 | 
			
		||||
 | 
			
		||||
		if ((tmp_len = (size_t)BN_num_bytes(ec_p)) > buf_len)
 | 
			
		||||
			buf_len = tmp_len;
 | 
			
		||||
		if ((tmp_len = (size_t)BN_num_bytes(ec_a)) > buf_len)
 | 
			
		||||
			buf_len = tmp_len;
 | 
			
		||||
		if ((tmp_len = (size_t)BN_num_bytes(ec_b)) > buf_len)
 | 
			
		||||
			buf_len = tmp_len;
 | 
			
		||||
		if ((tmp_len = (size_t)BN_num_bytes(ec_gen)) > buf_len)
 | 
			
		||||
			buf_len = tmp_len;
 | 
			
		||||
		if ((tmp_len = (size_t)BN_num_bytes(ec_order)) > buf_len)
 | 
			
		||||
			buf_len = tmp_len;
 | 
			
		||||
		if ((tmp_len = (size_t)BN_num_bytes(ec_cofactor)) > buf_len)
 | 
			
		||||
			buf_len = tmp_len;
 | 
			
		||||
 | 
			
		||||
		buffer = (unsigned char *)OPENSSL_malloc(buf_len);
 | 
			
		||||
 | 
			
		||||
		if (buffer == NULL)
 | 
			
		||||
			{
 | 
			
		||||
			perror("OPENSSL_malloc");
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		ecparam_print_var(out, ec_p, "ec_p", len, buffer);
 | 
			
		||||
		ecparam_print_var(out, ec_a, "ec_a", len, buffer);
 | 
			
		||||
		ecparam_print_var(out, ec_b, "ec_b", len, buffer);
 | 
			
		||||
		ecparam_print_var(out, ec_gen, "ec_gen", len, buffer);
 | 
			
		||||
		ecparam_print_var(out, ec_order, "ec_order", len, buffer);
 | 
			
		||||
		ecparam_print_var(out, ec_cofactor, "ec_cofactor", len, 
 | 
			
		||||
			buffer);
 | 
			
		||||
 | 
			
		||||
		BIO_printf(out, "\n\n");
 | 
			
		||||
 | 
			
		||||
		BIO_printf(out, "EC_GROUP *get_ec_group_%d(void)\n\t{\n", len);
 | 
			
		||||
		BIO_printf(out, "\tint ok=0;\n");
 | 
			
		||||
		BIO_printf(out, "\tEC_GROUP *group = NULL;\n");
 | 
			
		||||
		BIO_printf(out, "\tEC_POINT *point = NULL;\n");
 | 
			
		||||
		BIO_printf(out, "\tBIGNUM   *tmp_1 = NULL, *tmp_2 = NULL, "
 | 
			
		||||
				"*tmp_3 = NULL;\n\n");
 | 
			
		||||
		BIO_printf(out, "\tif ((tmp_1 = BN_bin2bn(ec_p_%d, "
 | 
			
		||||
				"sizeof(ec_p_%d), NULL)) == NULL)\n\t\t"
 | 
			
		||||
				"goto err;\n", len, len);
 | 
			
		||||
		BIO_printf(out, "\tif ((tmp_2 = BN_bin2bn(ec_a_%d, "
 | 
			
		||||
				"sizeof(ec_a_%d), NULL)) == NULL)\n\t\t"
 | 
			
		||||
				"goto err;\n", len, len);
 | 
			
		||||
		BIO_printf(out, "\tif ((tmp_3 = BN_bin2bn(ec_b_%d, "
 | 
			
		||||
				"sizeof(ec_b_%d), NULL)) == NULL)\n\t\t"
 | 
			
		||||
				"goto err;\n", len, len);
 | 
			
		||||
		if (is_prime)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(out, "\tif ((group = EC_GROUP_new_curve_"
 | 
			
		||||
				"GFp(tmp_1, tmp_2, tmp_3, NULL)) == NULL)"
 | 
			
		||||
				"\n\t\tgoto err;\n\n");
 | 
			
		||||
			}
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
			/* TODO */
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		BIO_printf(out, "\t/* build generator */\n");
 | 
			
		||||
		BIO_printf(out, "\tif ((tmp_1 = BN_bin2bn(ec_gen_%d, "
 | 
			
		||||
				"sizeof(ec_gen_%d), tmp_1)) == NULL)"
 | 
			
		||||
				"\n\t\tgoto err;\n", len, len);
 | 
			
		||||
		BIO_printf(out, "\tpoint = EC_POINT_bn2point(group, tmp_1, "
 | 
			
		||||
				"NULL, NULL);\n");
 | 
			
		||||
		BIO_printf(out, "\tif (point == NULL)\n\t\tgoto err;\n");
 | 
			
		||||
		BIO_printf(out, "\tif ((tmp_2 = BN_bin2bn(ec_order_%d, "
 | 
			
		||||
				"sizeof(ec_order_%d), tmp_2)) == NULL)"
 | 
			
		||||
				"\n\t\tgoto err;\n", len, len);
 | 
			
		||||
		BIO_printf(out, "\tif ((tmp_3 = BN_bin2bn(ec_cofactor_%d, "
 | 
			
		||||
				"sizeof(ec_cofactor_%d), tmp_3)) == NULL)"
 | 
			
		||||
				"\n\t\tgoto err;\n", len, len);
 | 
			
		||||
		BIO_printf(out, "\tif (!EC_GROUP_set_generator(group, point,"
 | 
			
		||||
				" tmp_2, tmp_3))\n\t\tgoto err;\n");
 | 
			
		||||
		BIO_printf(out, "\n\tok=1;\n");
 | 
			
		||||
		BIO_printf(out, "err:\n");
 | 
			
		||||
		BIO_printf(out, "\tif (tmp_1)\n\t\tBN_free(tmp_1);\n");
 | 
			
		||||
		BIO_printf(out, "\tif (tmp_2)\n\t\tBN_free(tmp_2);\n");
 | 
			
		||||
		BIO_printf(out, "\tif (tmp_3)\n\t\tBN_free(tmp_3);\n");
 | 
			
		||||
		BIO_printf(out, "\tif (point)\n\t\tEC_POINT_free(point);\n");
 | 
			
		||||
		BIO_printf(out, "\tif (!ok)\n");
 | 
			
		||||
		BIO_printf(out, "\t\t{\n");
 | 
			
		||||
		BIO_printf(out, "\t\tEC_GROUP_free(group);\n");
 | 
			
		||||
		BIO_printf(out, "\t\tgroup = NULL;\n");
 | 
			
		||||
		BIO_printf(out, "\t\t}\n");
 | 
			
		||||
		BIO_printf(out, "\treturn(group);\n\t}\n");
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (!noout)
 | 
			
		||||
		{
 | 
			
		||||
		if (outformat == FORMAT_ASN1)
 | 
			
		||||
			i = i2d_ECPKParameters_bio(out, group);
 | 
			
		||||
		else if (outformat == FORMAT_PEM)
 | 
			
		||||
			i = PEM_write_bio_ECPKParameters(out, group);
 | 
			
		||||
		else	
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err,"bad output format specified for"
 | 
			
		||||
				" outfile\n");
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		if (!i)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err, "unable to write elliptic "
 | 
			
		||||
				"curve parameters\n");
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	
 | 
			
		||||
	if (need_rand)
 | 
			
		||||
		{
 | 
			
		||||
		app_RAND_load_file(NULL, bio_err, (inrand != NULL));
 | 
			
		||||
		if (inrand != NULL)
 | 
			
		||||
			BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 | 
			
		||||
				app_RAND_load_files(inrand));
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (genkey)
 | 
			
		||||
		{
 | 
			
		||||
		EC_KEY *eckey = EC_KEY_new();
 | 
			
		||||
 | 
			
		||||
		if (eckey == NULL)
 | 
			
		||||
			goto end;
 | 
			
		||||
 | 
			
		||||
		assert(need_rand);
 | 
			
		||||
 | 
			
		||||
		if (EC_KEY_set_group(eckey, group) == 0)
 | 
			
		||||
			goto end;
 | 
			
		||||
		
 | 
			
		||||
		if (!EC_KEY_generate_key(eckey))
 | 
			
		||||
			{
 | 
			
		||||
			EC_KEY_free(eckey);
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		if (outformat == FORMAT_ASN1)
 | 
			
		||||
			i = i2d_ECPrivateKey_bio(out, eckey);
 | 
			
		||||
		else if (outformat == FORMAT_PEM)
 | 
			
		||||
			i = PEM_write_bio_ECPrivateKey(out, eckey, NULL,
 | 
			
		||||
				NULL, 0, NULL, NULL);
 | 
			
		||||
		else	
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err, "bad output format specified "
 | 
			
		||||
				"for outfile\n");
 | 
			
		||||
			EC_KEY_free(eckey);
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		EC_KEY_free(eckey);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (need_rand)
 | 
			
		||||
		app_RAND_write_file(NULL, bio_err);
 | 
			
		||||
 | 
			
		||||
	ret=0;
 | 
			
		||||
end:
 | 
			
		||||
	if (ec_p)
 | 
			
		||||
		BN_free(ec_p);
 | 
			
		||||
	if (ec_a)
 | 
			
		||||
		BN_free(ec_a);
 | 
			
		||||
	if (ec_b)
 | 
			
		||||
		BN_free(ec_b);
 | 
			
		||||
	if (ec_gen)
 | 
			
		||||
		BN_free(ec_gen);
 | 
			
		||||
	if (ec_order)
 | 
			
		||||
		BN_free(ec_order);
 | 
			
		||||
	if (ec_cofactor)
 | 
			
		||||
		BN_free(ec_cofactor);
 | 
			
		||||
	if (buffer)
 | 
			
		||||
		OPENSSL_free(buffer);
 | 
			
		||||
	if (in != NULL)
 | 
			
		||||
		BIO_free(in);
 | 
			
		||||
	if (out != NULL)
 | 
			
		||||
		BIO_free_all(out);
 | 
			
		||||
	if (group != NULL)
 | 
			
		||||
		EC_GROUP_free(group);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int ecparam_print_var(BIO *out, BIGNUM *in, const char *var,
 | 
			
		||||
	int len, unsigned char *buffer)
 | 
			
		||||
	{
 | 
			
		||||
	BIO_printf(out, "static unsigned char %s_%d[] = {", var, len);
 | 
			
		||||
	if (BN_is_zero(in))
 | 
			
		||||
		BIO_printf(out, "\n\t0x00");
 | 
			
		||||
	else 
 | 
			
		||||
		{
 | 
			
		||||
		int i, l;
 | 
			
		||||
 | 
			
		||||
		l = BN_bn2bin(in, buffer);
 | 
			
		||||
		for (i=0; i<l-1; i++)
 | 
			
		||||
			{
 | 
			
		||||
			if ((i%12) == 0) 
 | 
			
		||||
				BIO_printf(out, "\n\t");
 | 
			
		||||
			BIO_printf(out, "0x%02X,", buffer[i]);
 | 
			
		||||
			}
 | 
			
		||||
		if ((i%12) == 0) 
 | 
			
		||||
			BIO_printf(out, "\n\t");
 | 
			
		||||
		BIO_printf(out, "0x%02X", buffer[i]);
 | 
			
		||||
		}
 | 
			
		||||
	BIO_printf(out, "\n\t};\n\n");
 | 
			
		||||
	return 1;
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
							
								
								
									
										268
									
								
								apps/enc.c
									
									
									
									
									
								
							
							
						
						
									
										268
									
								
								apps/enc.c
									
									
									
									
									
								
							@@ -66,8 +66,10 @@
 | 
			
		||||
#include <openssl/objects.h>
 | 
			
		||||
#include <openssl/x509.h>
 | 
			
		||||
#include <openssl/rand.h>
 | 
			
		||||
#ifndef NO_MD5
 | 
			
		||||
#include <openssl/md5.h>
 | 
			
		||||
#endif
 | 
			
		||||
#include <openssl/pem.h>
 | 
			
		||||
#include <ctype.h>
 | 
			
		||||
 | 
			
		||||
int set_hex(char *in,unsigned char *out,int size);
 | 
			
		||||
#undef SIZE
 | 
			
		||||
@@ -78,56 +80,27 @@ int set_hex(char *in,unsigned char *out,int size);
 | 
			
		||||
#define BSIZE	(8*1024)
 | 
			
		||||
#define	PROG	enc_main
 | 
			
		||||
 | 
			
		||||
static void show_ciphers(const OBJ_NAME *name,void *bio_)
 | 
			
		||||
	{
 | 
			
		||||
	BIO *bio=bio_;
 | 
			
		||||
	static int n;
 | 
			
		||||
 | 
			
		||||
	if(!islower((unsigned char)*name->name))
 | 
			
		||||
		return;
 | 
			
		||||
 | 
			
		||||
	BIO_printf(bio,"-%-25s",name->name);
 | 
			
		||||
	if(++n == 3)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio,"\n");
 | 
			
		||||
		n=0;
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		BIO_printf(bio," ");
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	ENGINE *e = NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	static const char magic[]="Salted__";
 | 
			
		||||
	char mbuf[sizeof magic-1];
 | 
			
		||||
	char mbuf[8];	/* should be 1 smaller than magic */
 | 
			
		||||
	char *strbuf=NULL;
 | 
			
		||||
	unsigned char *buff=NULL,*bufsize=NULL;
 | 
			
		||||
	int bsize=BSIZE,verbose=0;
 | 
			
		||||
	int ret=1,inl;
 | 
			
		||||
	int nopad = 0;
 | 
			
		||||
	unsigned char key[EVP_MAX_KEY_LENGTH],iv[EVP_MAX_IV_LENGTH];
 | 
			
		||||
	unsigned char key[24],iv[MD5_DIGEST_LENGTH];
 | 
			
		||||
	unsigned char salt[PKCS5_SALT_LEN];
 | 
			
		||||
	char *str=NULL, *passarg = NULL, *pass = NULL;
 | 
			
		||||
	char *hkey=NULL,*hiv=NULL,*hsalt = NULL;
 | 
			
		||||
	char *md=NULL;
 | 
			
		||||
	int enc=1,printkey=0,i,base64=0;
 | 
			
		||||
	int debug=0,olb64=0,nosalt=0;
 | 
			
		||||
	const EVP_CIPHER *cipher=NULL,*c;
 | 
			
		||||
	EVP_CIPHER_CTX *ctx = NULL;
 | 
			
		||||
	char *inf=NULL,*outf=NULL;
 | 
			
		||||
	BIO *in=NULL,*out=NULL,*b64=NULL,*benc=NULL,*rbio=NULL,*wbio=NULL;
 | 
			
		||||
#define PROG_NAME_SIZE  39
 | 
			
		||||
	char pname[PROG_NAME_SIZE+1];
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	char *engine = NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	const EVP_MD *dgst=NULL;
 | 
			
		||||
	int non_fips_allow = 0;
 | 
			
		||||
#define PROG_NAME_SIZE  16
 | 
			
		||||
	char pname[PROG_NAME_SIZE];
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
 | 
			
		||||
@@ -135,11 +108,8 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
	/* first check the program name */
 | 
			
		||||
	program_name(argv[0],pname,sizeof pname);
 | 
			
		||||
	program_name(argv[0],pname,PROG_NAME_SIZE);
 | 
			
		||||
	if (strcmp(pname,"base64") == 0)
 | 
			
		||||
		base64=1;
 | 
			
		||||
 | 
			
		||||
@@ -171,21 +141,12 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			passarg= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		else if (strcmp(*argv,"-engine") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			engine= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
		else if	(strcmp(*argv,"-d") == 0)
 | 
			
		||||
			enc=0;
 | 
			
		||||
		else if	(strcmp(*argv,"-p") == 0)
 | 
			
		||||
			printkey=1;
 | 
			
		||||
		else if	(strcmp(*argv,"-v") == 0)
 | 
			
		||||
			verbose=1;
 | 
			
		||||
		else if	(strcmp(*argv,"-nopad") == 0)
 | 
			
		||||
			nopad=1;
 | 
			
		||||
		else if	(strcmp(*argv,"-salt") == 0)
 | 
			
		||||
			nosalt=0;
 | 
			
		||||
		else if	(strcmp(*argv,"-nosalt") == 0)
 | 
			
		||||
@@ -226,7 +187,7 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
				goto bad;
 | 
			
		||||
				}
 | 
			
		||||
			buf[0]='\0';
 | 
			
		||||
			fgets(buf,sizeof buf,infile);
 | 
			
		||||
			fgets(buf,128,infile);
 | 
			
		||||
			fclose(infile);
 | 
			
		||||
			i=strlen(buf);
 | 
			
		||||
			if ((i > 0) &&
 | 
			
		||||
@@ -257,13 +218,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			hiv= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-md") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			md= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-non-fips-allow") == 0)
 | 
			
		||||
			non_fips_allow = 1;
 | 
			
		||||
		else if	((argv[0][0] == '-') &&
 | 
			
		||||
			((c=EVP_get_cipherbyname(&(argv[0][1]))) != NULL))
 | 
			
		||||
			{
 | 
			
		||||
@@ -282,47 +236,84 @@ bad:
 | 
			
		||||
			BIO_printf(bio_err,"%-14s encrypt\n","-e");
 | 
			
		||||
			BIO_printf(bio_err,"%-14s decrypt\n","-d");
 | 
			
		||||
			BIO_printf(bio_err,"%-14s base64 encode/decode, depending on encryption flag\n","-a/-base64");
 | 
			
		||||
			BIO_printf(bio_err,"%-14s passphrase is the next argument\n","-k");
 | 
			
		||||
			BIO_printf(bio_err,"%-14s passphrase is the first line of the file argument\n","-kfile");
 | 
			
		||||
			BIO_printf(bio_err,"%-14s the next argument is the md to use to create a key\n","-md");
 | 
			
		||||
			BIO_printf(bio_err,"%-14s   from a passphrase.  One of md2, md5, sha or sha1\n","");
 | 
			
		||||
			BIO_printf(bio_err,"%-14s key is the next argument\n","-k");
 | 
			
		||||
			BIO_printf(bio_err,"%-14s key is the first line of the file argument\n","-kfile");
 | 
			
		||||
			BIO_printf(bio_err,"%-14s key/iv in hex is the next argument\n","-K/-iv");
 | 
			
		||||
			BIO_printf(bio_err,"%-14s print the iv/key (then exit if -P)\n","-[pP]");
 | 
			
		||||
			BIO_printf(bio_err,"%-14s buffer size\n","-bufsize <n>");
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
			BIO_printf(bio_err,"%-14s use engine e, possibly a hardware device.\n","-engine e");
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
			BIO_printf(bio_err,"Cipher Types\n");
 | 
			
		||||
			OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
 | 
			
		||||
					       show_ciphers,
 | 
			
		||||
					       bio_err);
 | 
			
		||||
			BIO_printf(bio_err,"\n");
 | 
			
		||||
			BIO_printf(bio_err,"des     : 56 bit key DES encryption\n");
 | 
			
		||||
			BIO_printf(bio_err,"des_ede :112 bit key ede DES encryption\n");
 | 
			
		||||
			BIO_printf(bio_err,"des_ede3:168 bit key ede DES encryption\n");
 | 
			
		||||
#ifndef NO_IDEA
 | 
			
		||||
			BIO_printf(bio_err,"idea    :128 bit key IDEA encryption\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef NO_RC4
 | 
			
		||||
			BIO_printf(bio_err,"rc2     :128 bit key RC2 encryption\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef NO_BF
 | 
			
		||||
			BIO_printf(bio_err,"bf      :128 bit key Blowfish encryption\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef NO_RC4
 | 
			
		||||
			BIO_printf(bio_err," -%-5s :128 bit key RC4 encryption\n",
 | 
			
		||||
				LN_rc4);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
 | 
			
		||||
				LN_des_ecb,LN_des_cbc,
 | 
			
		||||
				LN_des_cfb64,LN_des_ofb64);
 | 
			
		||||
			BIO_printf(bio_err," -%-4s (%s)\n",
 | 
			
		||||
				"des", LN_des_cbc);
 | 
			
		||||
 | 
			
		||||
			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
 | 
			
		||||
				LN_des_ede,LN_des_ede_cbc,
 | 
			
		||||
				LN_des_ede_cfb64,LN_des_ede_ofb64);
 | 
			
		||||
			BIO_printf(bio_err," -desx -none\n");
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
 | 
			
		||||
				LN_des_ede3,LN_des_ede3_cbc,
 | 
			
		||||
				LN_des_ede3_cfb64,LN_des_ede3_ofb64);
 | 
			
		||||
			BIO_printf(bio_err," -%-4s (%s)\n",
 | 
			
		||||
				"des3", LN_des_ede3_cbc);
 | 
			
		||||
 | 
			
		||||
#ifndef NO_IDEA
 | 
			
		||||
			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
 | 
			
		||||
				LN_idea_ecb, LN_idea_cbc,
 | 
			
		||||
				LN_idea_cfb64, LN_idea_ofb64);
 | 
			
		||||
			BIO_printf(bio_err," -%-4s (%s)\n","idea",LN_idea_cbc);
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef NO_RC2
 | 
			
		||||
			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
 | 
			
		||||
				LN_rc2_ecb, LN_rc2_cbc,
 | 
			
		||||
				LN_rc2_cfb64, LN_rc2_ofb64);
 | 
			
		||||
			BIO_printf(bio_err," -%-4s (%s)\n","rc2", LN_rc2_cbc);
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef NO_BF
 | 
			
		||||
			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
 | 
			
		||||
				LN_bf_ecb, LN_bf_cbc,
 | 
			
		||||
				LN_bf_cfb64, LN_bf_ofb64);
 | 
			
		||||
			BIO_printf(bio_err," -%-4s (%s)\n","bf", LN_bf_cbc);
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef NO_CAST
 | 
			
		||||
			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
 | 
			
		||||
				LN_cast5_ecb, LN_cast5_cbc,
 | 
			
		||||
				LN_cast5_cfb64, LN_cast5_ofb64);
 | 
			
		||||
			BIO_printf(bio_err," -%-4s (%s)\n","cast", LN_cast5_cbc);
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef NO_RC5
 | 
			
		||||
			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
 | 
			
		||||
				LN_rc5_ecb, LN_rc5_cbc,
 | 
			
		||||
				LN_rc5_cfb64, LN_rc5_ofb64);
 | 
			
		||||
			BIO_printf(bio_err," -%-4s (%s)\n","rc5", LN_rc5_cbc);
 | 
			
		||||
#endif
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		argc--;
 | 
			
		||||
		argv++;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
        e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	if (md && (dgst=EVP_get_digestbyname(md)) == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err,"%s is an unsupported message digest type\n",md);
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (dgst == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		if (in_FIPS_mode)
 | 
			
		||||
			dgst = EVP_sha1();
 | 
			
		||||
		else
 | 
			
		||||
			dgst = EVP_md5();
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (bufsize != NULL)
 | 
			
		||||
		{
 | 
			
		||||
		unsigned long n;
 | 
			
		||||
@@ -346,17 +337,17 @@ bad:
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		/* It must be large enough for a base64 encoded line */
 | 
			
		||||
		if (base64 && n < 80) n=80;
 | 
			
		||||
		if (n < 80) n=80;
 | 
			
		||||
 | 
			
		||||
		bsize=(int)n;
 | 
			
		||||
		if (verbose) BIO_printf(bio_err,"bufsize=%d\n",bsize);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	strbuf=OPENSSL_malloc(SIZE);
 | 
			
		||||
	buff=(unsigned char *)OPENSSL_malloc(EVP_ENCODE_LENGTH(bsize));
 | 
			
		||||
	strbuf=Malloc(SIZE);
 | 
			
		||||
	buff=(unsigned char *)Malloc(EVP_ENCODE_LENGTH(bsize));
 | 
			
		||||
	if ((buff == NULL) || (strbuf == NULL))
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err,"OPENSSL_malloc failure %ld\n",(long)EVP_ENCODE_LENGTH(bsize));
 | 
			
		||||
		BIO_printf(bio_err,"Malloc failure %ld\n",(long)EVP_ENCODE_LENGTH(bsize));
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
@@ -371,16 +362,12 @@ bad:
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_callback(in,BIO_debug_callback);
 | 
			
		||||
		BIO_set_callback(out,BIO_debug_callback);
 | 
			
		||||
		BIO_set_callback_arg(in,(char *)bio_err);
 | 
			
		||||
		BIO_set_callback_arg(out,(char *)bio_err);
 | 
			
		||||
		BIO_set_callback_arg(in,bio_err);
 | 
			
		||||
		BIO_set_callback_arg(out,bio_err);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (inf == NULL)
 | 
			
		||||
	        {
 | 
			
		||||
		if (bufsize != NULL)
 | 
			
		||||
			setvbuf(stdin, (char *)NULL, _IONBF, 0);
 | 
			
		||||
		BIO_set_fp(in,stdin,BIO_NOCLOSE);
 | 
			
		||||
	        }
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_read_filename(in,inf) <= 0)
 | 
			
		||||
@@ -404,9 +391,9 @@ bad:
 | 
			
		||||
			{
 | 
			
		||||
			char buf[200];
 | 
			
		||||
 | 
			
		||||
			BIO_snprintf(buf,sizeof buf,"enter %s %s password:",
 | 
			
		||||
				     OBJ_nid2ln(EVP_CIPHER_nid(cipher)),
 | 
			
		||||
				     (enc)?"encryption":"decryption");
 | 
			
		||||
			sprintf(buf,"enter %s %s password:",
 | 
			
		||||
				OBJ_nid2ln(EVP_CIPHER_nid(cipher)),
 | 
			
		||||
				(enc)?"encryption":"decryption");
 | 
			
		||||
			strbuf[0]='\0';
 | 
			
		||||
			i=EVP_read_pw_string((char *)strbuf,SIZE,buf,enc);
 | 
			
		||||
			if (i == 0)
 | 
			
		||||
@@ -429,17 +416,7 @@ bad:
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
	if (outf == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 | 
			
		||||
		if (bufsize != NULL)
 | 
			
		||||
			setvbuf(stdout, (char *)NULL, _IONBF, 0);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_write_filename(out,outf) <= 0)
 | 
			
		||||
@@ -459,7 +436,7 @@ bad:
 | 
			
		||||
		if (debug)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_set_callback(b64,BIO_debug_callback);
 | 
			
		||||
			BIO_set_callback_arg(b64,(char *)bio_err);
 | 
			
		||||
			BIO_set_callback_arg(b64,bio_err);
 | 
			
		||||
			}
 | 
			
		||||
		if (olb64)
 | 
			
		||||
			BIO_set_flags(b64,BIO_FLAGS_BASE64_NO_NL);
 | 
			
		||||
@@ -471,9 +448,6 @@ bad:
 | 
			
		||||
 | 
			
		||||
	if (cipher != NULL)
 | 
			
		||||
		{
 | 
			
		||||
		/* Note that str is NULL if a key was passed on the command
 | 
			
		||||
		 * line, so we get no salt in that case. Is this a bug?
 | 
			
		||||
		 */
 | 
			
		||||
		if (str != NULL)
 | 
			
		||||
			{
 | 
			
		||||
			/* Salt handling: if encrypting generate a salt and
 | 
			
		||||
@@ -485,12 +459,12 @@ bad:
 | 
			
		||||
			else {
 | 
			
		||||
				if(enc) {
 | 
			
		||||
					if(hsalt) {
 | 
			
		||||
						if(!set_hex(hsalt,salt,sizeof salt)) {
 | 
			
		||||
						if(!set_hex(hsalt,salt,PKCS5_SALT_LEN)) {
 | 
			
		||||
							BIO_printf(bio_err,
 | 
			
		||||
								"invalid hex salt value\n");
 | 
			
		||||
							goto end;
 | 
			
		||||
						}
 | 
			
		||||
					} else if (RAND_pseudo_bytes(salt, sizeof salt) < 0)
 | 
			
		||||
					} else if (RAND_pseudo_bytes(salt, PKCS5_SALT_LEN) < 0)
 | 
			
		||||
						goto end;
 | 
			
		||||
					/* If -P option then don't bother writing */
 | 
			
		||||
					if((printkey != 2)
 | 
			
		||||
@@ -498,14 +472,14 @@ bad:
 | 
			
		||||
							 sizeof magic-1) != sizeof magic-1
 | 
			
		||||
					       || BIO_write(wbio,
 | 
			
		||||
							    (char *)salt,
 | 
			
		||||
							    sizeof salt) != sizeof salt)) {
 | 
			
		||||
							    PKCS5_SALT_LEN) != PKCS5_SALT_LEN)) {
 | 
			
		||||
						BIO_printf(bio_err,"error writing output file\n");
 | 
			
		||||
						goto end;
 | 
			
		||||
					}
 | 
			
		||||
				} else if(BIO_read(rbio,mbuf,sizeof mbuf) != sizeof mbuf
 | 
			
		||||
					  || BIO_read(rbio,
 | 
			
		||||
						      (unsigned char *)salt,
 | 
			
		||||
				    sizeof salt) != sizeof salt) {
 | 
			
		||||
				    PKCS5_SALT_LEN) != PKCS5_SALT_LEN) {
 | 
			
		||||
					BIO_printf(bio_err,"error reading input file\n");
 | 
			
		||||
					goto end;
 | 
			
		||||
				} else if(memcmp(mbuf,magic,sizeof magic-1)) {
 | 
			
		||||
@@ -516,7 +490,7 @@ bad:
 | 
			
		||||
				sptr = salt;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			EVP_BytesToKey(cipher,dgst,sptr,
 | 
			
		||||
			EVP_BytesToKey(cipher,EVP_md5(),sptr,
 | 
			
		||||
				(unsigned char *)str,
 | 
			
		||||
				strlen(str),1,key,iv);
 | 
			
		||||
			/* zero the complete buffer or the string
 | 
			
		||||
@@ -524,24 +498,16 @@ bad:
 | 
			
		||||
			 * bug picked up by
 | 
			
		||||
			 * Larry J. Hughes Jr. <hughes@indiana.edu> */
 | 
			
		||||
			if (str == strbuf)
 | 
			
		||||
				OPENSSL_cleanse(str,SIZE);
 | 
			
		||||
				memset(str,0,SIZE);
 | 
			
		||||
			else
 | 
			
		||||
				OPENSSL_cleanse(str,strlen(str));
 | 
			
		||||
				memset(str,0,strlen(str));
 | 
			
		||||
			}
 | 
			
		||||
		if ((hiv != NULL) && !set_hex(hiv,iv,sizeof iv))
 | 
			
		||||
		if ((hiv != NULL) && !set_hex(hiv,iv,8))
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err,"invalid hex iv value\n");
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		if ((hiv == NULL) && (str == NULL))
 | 
			
		||||
			{
 | 
			
		||||
			/* No IV was explicitly set and no IV was generated
 | 
			
		||||
			 * during EVP_BytesToKey. Hence the IV is undefined,
 | 
			
		||||
			 * making correct decryption impossible. */
 | 
			
		||||
			BIO_printf(bio_err, "iv undefined\n");
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		if ((hkey != NULL) && !set_hex(hkey,key,sizeof key))
 | 
			
		||||
		if ((hkey != NULL) && !set_hex(hkey,key,24))
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err,"invalid hex key value\n");
 | 
			
		||||
			goto end;
 | 
			
		||||
@@ -549,40 +515,11 @@ bad:
 | 
			
		||||
 | 
			
		||||
		if ((benc=BIO_new(BIO_f_cipher())) == NULL)
 | 
			
		||||
			goto end;
 | 
			
		||||
 | 
			
		||||
		/* Since we may be changing parameters work on the encryption
 | 
			
		||||
		 * context rather than calling BIO_set_cipher().
 | 
			
		||||
		 */
 | 
			
		||||
 | 
			
		||||
		BIO_get_cipher_ctx(benc, &ctx);
 | 
			
		||||
 | 
			
		||||
		if (non_fips_allow)
 | 
			
		||||
			EVP_CIPHER_CTX_set_flags(ctx,
 | 
			
		||||
				EVP_CIPH_FLAG_NON_FIPS_ALLOW);
 | 
			
		||||
 | 
			
		||||
		if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc))
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err, "Error setting cipher %s\n",
 | 
			
		||||
				EVP_CIPHER_name(cipher));
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		if (nopad)
 | 
			
		||||
			EVP_CIPHER_CTX_set_padding(ctx, 0);
 | 
			
		||||
 | 
			
		||||
		if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, enc))
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err, "Error setting cipher %s\n",
 | 
			
		||||
				EVP_CIPHER_name(cipher));
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		BIO_set_cipher(benc,cipher,key,iv,enc);
 | 
			
		||||
		if (debug)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_set_callback(benc,BIO_debug_callback);
 | 
			
		||||
			BIO_set_callback_arg(benc,(char *)bio_err);
 | 
			
		||||
			BIO_set_callback_arg(benc,bio_err);
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		if (printkey)
 | 
			
		||||
@@ -590,7 +527,7 @@ bad:
 | 
			
		||||
			if (!nosalt)
 | 
			
		||||
				{
 | 
			
		||||
				printf("salt=");
 | 
			
		||||
				for (i=0; i<(int)sizeof(salt); i++)
 | 
			
		||||
				for (i=0; i<PKCS5_SALT_LEN; i++)
 | 
			
		||||
					printf("%02X",salt[i]);
 | 
			
		||||
				printf("\n");
 | 
			
		||||
				}
 | 
			
		||||
@@ -644,15 +581,14 @@ bad:
 | 
			
		||||
		}
 | 
			
		||||
end:
 | 
			
		||||
	ERR_print_errors(bio_err);
 | 
			
		||||
	if (strbuf != NULL) OPENSSL_free(strbuf);
 | 
			
		||||
	if (buff != NULL) OPENSSL_free(buff);
 | 
			
		||||
	if (strbuf != NULL) Free(strbuf);
 | 
			
		||||
	if (buff != NULL) Free(buff);
 | 
			
		||||
	if (in != NULL) BIO_free(in);
 | 
			
		||||
	if (out != NULL) BIO_free_all(out);
 | 
			
		||||
	if (out != NULL) BIO_free(out);
 | 
			
		||||
	if (benc != NULL) BIO_free(benc);
 | 
			
		||||
	if (b64 != NULL) BIO_free(b64);
 | 
			
		||||
	if(pass) OPENSSL_free(pass);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	if(pass) Free(pass);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
int set_hex(char *in, unsigned char *out, int size)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										542
									
								
								apps/engine.c
									
									
									
									
									
								
							
							
						
						
									
										542
									
								
								apps/engine.c
									
									
									
									
									
								
							@@ -1,542 +0,0 @@
 | 
			
		||||
/* apps/engine.c -*- mode: C; c-file-style: "eay" -*- */
 | 
			
		||||
/* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
 | 
			
		||||
 * project 2000.
 | 
			
		||||
 */
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * 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 above 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 acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 | 
			
		||||
 *    endorse or promote products derived from this software without
 | 
			
		||||
 *    prior written permission. For written permission, please contact
 | 
			
		||||
 *    licensing@OpenSSL.org.
 | 
			
		||||
 *
 | 
			
		||||
 * 5. Products derived from this software may not be called "OpenSSL"
 | 
			
		||||
 *    nor may "OpenSSL" appear in their names without prior written
 | 
			
		||||
 *    permission of the OpenSSL Project.
 | 
			
		||||
 *
 | 
			
		||||
 * 6. Redistributions of any form whatsoever must retain the following
 | 
			
		||||
 *    acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 | 
			
		||||
 * EXPRESSED 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 OpenSSL PROJECT OR
 | 
			
		||||
 * ITS 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.
 | 
			
		||||
 * ====================================================================
 | 
			
		||||
 *
 | 
			
		||||
 * This product includes cryptographic software written by Eric Young
 | 
			
		||||
 * (eay@cryptsoft.com).  This product includes software written by Tim
 | 
			
		||||
 * Hudson (tjh@cryptsoft.com).
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#ifdef OPENSSL_NO_STDIO
 | 
			
		||||
#define APPS_WIN16
 | 
			
		||||
#endif
 | 
			
		||||
#include "apps.h"
 | 
			
		||||
#include <openssl/err.h>
 | 
			
		||||
#include <openssl/engine.h>
 | 
			
		||||
#include <openssl/ssl.h>
 | 
			
		||||
 | 
			
		||||
#undef PROG
 | 
			
		||||
#define PROG	engine_main
 | 
			
		||||
 | 
			
		||||
static const char *engine_usage[]={
 | 
			
		||||
"usage: engine opts [engine ...]\n",
 | 
			
		||||
" -v[v[v[v]]] - verbose mode, for each engine, list its 'control commands'\n",
 | 
			
		||||
"               -vv will additionally display each command's description\n",
 | 
			
		||||
"               -vvv will also add the input flags for each command\n",
 | 
			
		||||
"               -vvvv will also show internal input flags\n",
 | 
			
		||||
" -c          - for each engine, also list the capabilities\n",
 | 
			
		||||
" -t[t]       - for each engine, check that they are really available\n",
 | 
			
		||||
"               -tt will display error trace for unavailable engines\n",
 | 
			
		||||
" -pre <cmd>  - runs command 'cmd' against the ENGINE before any attempts\n",
 | 
			
		||||
"               to load it (if -t is used)\n",
 | 
			
		||||
" -post <cmd> - runs command 'cmd' against the ENGINE after loading it\n",
 | 
			
		||||
"               (only used if -t is also provided)\n",
 | 
			
		||||
" NB: -pre and -post will be applied to all ENGINEs supplied on the command\n",
 | 
			
		||||
" line, or all supported ENGINEs if none are specified.\n",
 | 
			
		||||
" Eg. '-pre \"SO_PATH:/lib/libdriver.so\"' calls command \"SO_PATH\" with\n",
 | 
			
		||||
" argument \"/lib/libdriver.so\".\n",
 | 
			
		||||
NULL
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
static void identity(void *ptr)
 | 
			
		||||
	{
 | 
			
		||||
	return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
static int append_buf(char **buf, const char *s, int *size, int step)
 | 
			
		||||
	{
 | 
			
		||||
	int l = strlen(s);
 | 
			
		||||
 | 
			
		||||
	if (*buf == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		*size = step;
 | 
			
		||||
		*buf = OPENSSL_malloc(*size);
 | 
			
		||||
		if (*buf == NULL)
 | 
			
		||||
			return 0;
 | 
			
		||||
		**buf = '\0';
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (**buf != '\0')
 | 
			
		||||
		l += 2;		/* ", " */
 | 
			
		||||
 | 
			
		||||
	if (strlen(*buf) + strlen(s) >= (unsigned int)*size)
 | 
			
		||||
		{
 | 
			
		||||
		*size += step;
 | 
			
		||||
		*buf = OPENSSL_realloc(*buf, *size);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (*buf == NULL)
 | 
			
		||||
		return 0;
 | 
			
		||||
 | 
			
		||||
	if (**buf != '\0')
 | 
			
		||||
		BUF_strlcat(*buf, ", ", *size);
 | 
			
		||||
	BUF_strlcat(*buf, s, *size);
 | 
			
		||||
 | 
			
		||||
	return 1;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
static int util_flags(BIO *bio_out, unsigned int flags, const char *indent)
 | 
			
		||||
	{
 | 
			
		||||
	int started = 0, err = 0;
 | 
			
		||||
	/* Indent before displaying input flags */
 | 
			
		||||
	BIO_printf(bio_out, "%s%s(input flags): ", indent, indent);
 | 
			
		||||
	if(flags == 0)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_out, "<no flags>\n");
 | 
			
		||||
		return 1;
 | 
			
		||||
		}
 | 
			
		||||
        /* If the object is internal, mark it in a way that shows instead of
 | 
			
		||||
         * having it part of all the other flags, even if it really is. */
 | 
			
		||||
	if(flags & ENGINE_CMD_FLAG_INTERNAL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_out, "[Internal] ");
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if(flags & ENGINE_CMD_FLAG_NUMERIC)
 | 
			
		||||
		{
 | 
			
		||||
		if(started)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_out, "|");
 | 
			
		||||
			err = 1;
 | 
			
		||||
			}
 | 
			
		||||
		BIO_printf(bio_out, "NUMERIC");
 | 
			
		||||
		started = 1;
 | 
			
		||||
		}
 | 
			
		||||
	/* Now we check that no combinations of the mutually exclusive NUMERIC,
 | 
			
		||||
	 * STRING, and NO_INPUT flags have been used. Future flags that can be
 | 
			
		||||
	 * OR'd together with these would need to added after these to preserve
 | 
			
		||||
	 * the testing logic. */
 | 
			
		||||
	if(flags & ENGINE_CMD_FLAG_STRING)
 | 
			
		||||
		{
 | 
			
		||||
		if(started)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_out, "|");
 | 
			
		||||
			err = 1;
 | 
			
		||||
			}
 | 
			
		||||
		BIO_printf(bio_out, "STRING");
 | 
			
		||||
		started = 1;
 | 
			
		||||
		}
 | 
			
		||||
	if(flags & ENGINE_CMD_FLAG_NO_INPUT)
 | 
			
		||||
		{
 | 
			
		||||
		if(started)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_out, "|");
 | 
			
		||||
			err = 1;
 | 
			
		||||
			}
 | 
			
		||||
		BIO_printf(bio_out, "NO_INPUT");
 | 
			
		||||
		started = 1;
 | 
			
		||||
		}
 | 
			
		||||
	/* Check for unknown flags */
 | 
			
		||||
	flags = flags & ~ENGINE_CMD_FLAG_NUMERIC &
 | 
			
		||||
			~ENGINE_CMD_FLAG_STRING &
 | 
			
		||||
			~ENGINE_CMD_FLAG_NO_INPUT &
 | 
			
		||||
			~ENGINE_CMD_FLAG_INTERNAL;
 | 
			
		||||
	if(flags)
 | 
			
		||||
		{
 | 
			
		||||
		if(started) BIO_printf(bio_out, "|");
 | 
			
		||||
		BIO_printf(bio_out, "<0x%04X>", flags);
 | 
			
		||||
		}
 | 
			
		||||
	if(err)
 | 
			
		||||
		BIO_printf(bio_out, "  <illegal flags!>");
 | 
			
		||||
	BIO_printf(bio_out, "\n");
 | 
			
		||||
	return 1;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent)
 | 
			
		||||
	{
 | 
			
		||||
	static const int line_wrap = 78;
 | 
			
		||||
	int num;
 | 
			
		||||
	int ret = 0;
 | 
			
		||||
	char *name = NULL;
 | 
			
		||||
	char *desc = NULL;
 | 
			
		||||
	int flags;
 | 
			
		||||
	int xpos = 0;
 | 
			
		||||
	STACK *cmds = NULL;
 | 
			
		||||
	if(!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
 | 
			
		||||
			((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,
 | 
			
		||||
					0, NULL, NULL)) <= 0))
 | 
			
		||||
		{
 | 
			
		||||
#if 0
 | 
			
		||||
		BIO_printf(bio_out, "%s<no control commands>\n", indent);
 | 
			
		||||
#endif
 | 
			
		||||
		return 1;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	cmds = sk_new_null();
 | 
			
		||||
 | 
			
		||||
	if(!cmds)
 | 
			
		||||
		goto err;
 | 
			
		||||
	do {
 | 
			
		||||
		int len;
 | 
			
		||||
		/* Get the command input flags */
 | 
			
		||||
		if((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, num,
 | 
			
		||||
					NULL, NULL)) < 0)
 | 
			
		||||
			goto err;
 | 
			
		||||
                if (!(flags & ENGINE_CMD_FLAG_INTERNAL) || verbose >= 4)
 | 
			
		||||
                        {
 | 
			
		||||
                        /* Get the command name */
 | 
			
		||||
                        if((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_LEN_FROM_CMD, num,
 | 
			
		||||
                                NULL, NULL)) <= 0)
 | 
			
		||||
                                goto err;
 | 
			
		||||
                        if((name = OPENSSL_malloc(len + 1)) == NULL)
 | 
			
		||||
                                goto err;
 | 
			
		||||
                        if(ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_FROM_CMD, num, name,
 | 
			
		||||
                                NULL) <= 0)
 | 
			
		||||
                                goto err;
 | 
			
		||||
                        /* Get the command description */
 | 
			
		||||
                        if((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_LEN_FROM_CMD, num,
 | 
			
		||||
                                NULL, NULL)) < 0)
 | 
			
		||||
                                goto err;
 | 
			
		||||
                        if(len > 0)
 | 
			
		||||
                                {
 | 
			
		||||
                                if((desc = OPENSSL_malloc(len + 1)) == NULL)
 | 
			
		||||
                                        goto err;
 | 
			
		||||
                                if(ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_FROM_CMD, num, desc,
 | 
			
		||||
                                        NULL) <= 0)
 | 
			
		||||
                                        goto err;
 | 
			
		||||
                                }
 | 
			
		||||
                        /* Now decide on the output */
 | 
			
		||||
                        if(xpos == 0)
 | 
			
		||||
                                /* Do an indent */
 | 
			
		||||
                                xpos = BIO_printf(bio_out, indent);
 | 
			
		||||
                        else
 | 
			
		||||
                                /* Otherwise prepend a ", " */
 | 
			
		||||
                                xpos += BIO_printf(bio_out, ", ");
 | 
			
		||||
                        if(verbose == 1)
 | 
			
		||||
                                {
 | 
			
		||||
                                /* We're just listing names, comma-delimited */
 | 
			
		||||
                                if((xpos > (int)strlen(indent)) &&
 | 
			
		||||
					(xpos + (int)strlen(name) > line_wrap))
 | 
			
		||||
                                        {
 | 
			
		||||
                                        BIO_printf(bio_out, "\n");
 | 
			
		||||
                                        xpos = BIO_printf(bio_out, indent);
 | 
			
		||||
                                        }
 | 
			
		||||
                                xpos += BIO_printf(bio_out, "%s", name);
 | 
			
		||||
                                }
 | 
			
		||||
                        else
 | 
			
		||||
                                {
 | 
			
		||||
                                /* We're listing names plus descriptions */
 | 
			
		||||
                                BIO_printf(bio_out, "%s: %s\n", name,
 | 
			
		||||
                                        (desc == NULL) ? "<no description>" : desc);
 | 
			
		||||
                                /* ... and sometimes input flags */
 | 
			
		||||
                                if((verbose >= 3) && !util_flags(bio_out, flags,
 | 
			
		||||
                                        indent))
 | 
			
		||||
                                        goto err;
 | 
			
		||||
                                xpos = 0;
 | 
			
		||||
                                }
 | 
			
		||||
                        }
 | 
			
		||||
		OPENSSL_free(name); name = NULL;
 | 
			
		||||
		if(desc) { OPENSSL_free(desc); desc = NULL; }
 | 
			
		||||
		/* Move to the next command */
 | 
			
		||||
		num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE,
 | 
			
		||||
					num, NULL, NULL);
 | 
			
		||||
		} while(num > 0);
 | 
			
		||||
	if(xpos > 0)
 | 
			
		||||
		BIO_printf(bio_out, "\n");
 | 
			
		||||
	ret = 1;
 | 
			
		||||
err:
 | 
			
		||||
	if(cmds) sk_pop_free(cmds, identity);
 | 
			
		||||
	if(name) OPENSSL_free(name);
 | 
			
		||||
	if(desc) OPENSSL_free(desc);
 | 
			
		||||
	return ret;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
static void util_do_cmds(ENGINE *e, STACK *cmds, BIO *bio_out, const char *indent)
 | 
			
		||||
	{
 | 
			
		||||
	int loop, res, num = sk_num(cmds);
 | 
			
		||||
	if(num < 0)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_out, "[Error]: internal stack error\n");
 | 
			
		||||
		return;
 | 
			
		||||
		}
 | 
			
		||||
	for(loop = 0; loop < num; loop++)
 | 
			
		||||
		{
 | 
			
		||||
		char buf[256];
 | 
			
		||||
		const char *cmd, *arg;
 | 
			
		||||
		cmd = sk_value(cmds, loop);
 | 
			
		||||
		res = 1; /* assume success */
 | 
			
		||||
		/* Check if this command has no ":arg" */
 | 
			
		||||
		if((arg = strstr(cmd, ":")) == NULL)
 | 
			
		||||
			{
 | 
			
		||||
			if(!ENGINE_ctrl_cmd_string(e, cmd, NULL, 0))
 | 
			
		||||
				res = 0;
 | 
			
		||||
			}
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
			if((int)(arg - cmd) > 254)
 | 
			
		||||
				{
 | 
			
		||||
				BIO_printf(bio_out,"[Error]: command name too long\n");
 | 
			
		||||
				return;
 | 
			
		||||
				}
 | 
			
		||||
			memcpy(buf, cmd, (int)(arg - cmd));
 | 
			
		||||
			buf[arg-cmd] = '\0';
 | 
			
		||||
			arg++; /* Move past the ":" */
 | 
			
		||||
			/* Call the command with the argument */
 | 
			
		||||
			if(!ENGINE_ctrl_cmd_string(e, buf, arg, 0))
 | 
			
		||||
				res = 0;
 | 
			
		||||
			}
 | 
			
		||||
		if(res)
 | 
			
		||||
			BIO_printf(bio_out, "[Success]: %s\n", cmd);
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_out, "[Failure]: %s\n", cmd);
 | 
			
		||||
			ERR_print_errors(bio_out);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
	int ret=1,i;
 | 
			
		||||
	const char **pp;
 | 
			
		||||
	int verbose=0, list_cap=0, test_avail=0, test_avail_noise = 0;
 | 
			
		||||
	ENGINE *e;
 | 
			
		||||
	STACK *engines = sk_new_null();
 | 
			
		||||
	STACK *pre_cmds = sk_new_null();
 | 
			
		||||
	STACK *post_cmds = sk_new_null();
 | 
			
		||||
	int badops=1;
 | 
			
		||||
	BIO *bio_out=NULL;
 | 
			
		||||
	const char *indent = "     ";
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
	SSL_load_error_strings();
 | 
			
		||||
 | 
			
		||||
	if (bio_err == NULL)
 | 
			
		||||
		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
	bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
	{
 | 
			
		||||
	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
	bio_out = BIO_push(tmpbio, bio_out);
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	argc--;
 | 
			
		||||
	argv++;
 | 
			
		||||
	while (argc >= 1)
 | 
			
		||||
		{
 | 
			
		||||
		if (strncmp(*argv,"-v",2) == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if(strspn(*argv + 1, "v") < strlen(*argv + 1))
 | 
			
		||||
				goto skip_arg_loop;
 | 
			
		||||
			if((verbose=strlen(*argv + 1)) > 4)
 | 
			
		||||
				goto skip_arg_loop;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-c") == 0)
 | 
			
		||||
			list_cap=1;
 | 
			
		||||
		else if (strncmp(*argv,"-t",2) == 0)
 | 
			
		||||
			{
 | 
			
		||||
			test_avail=1;
 | 
			
		||||
			if(strspn(*argv + 1, "t") < strlen(*argv + 1))
 | 
			
		||||
				goto skip_arg_loop;
 | 
			
		||||
			if((test_avail_noise = strlen(*argv + 1) - 1) > 1)
 | 
			
		||||
				goto skip_arg_loop;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-pre") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			argc--; argv++;
 | 
			
		||||
			if (argc == 0)
 | 
			
		||||
				goto skip_arg_loop;
 | 
			
		||||
			sk_push(pre_cmds,*argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-post") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			argc--; argv++;
 | 
			
		||||
			if (argc == 0)
 | 
			
		||||
				goto skip_arg_loop;
 | 
			
		||||
			sk_push(post_cmds,*argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if ((strncmp(*argv,"-h",2) == 0) ||
 | 
			
		||||
				(strcmp(*argv,"-?") == 0))
 | 
			
		||||
			goto skip_arg_loop;
 | 
			
		||||
		else
 | 
			
		||||
			sk_push(engines,*argv);
 | 
			
		||||
		argc--;
 | 
			
		||||
		argv++;
 | 
			
		||||
		}
 | 
			
		||||
	/* Looks like everything went OK */
 | 
			
		||||
	badops = 0;
 | 
			
		||||
skip_arg_loop:
 | 
			
		||||
 | 
			
		||||
	if (badops)
 | 
			
		||||
		{
 | 
			
		||||
		for (pp=engine_usage; (*pp != NULL); pp++)
 | 
			
		||||
			BIO_printf(bio_err,"%s",*pp);
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (sk_num(engines) == 0)
 | 
			
		||||
		{
 | 
			
		||||
		for(e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e))
 | 
			
		||||
			{
 | 
			
		||||
			sk_push(engines,(char *)ENGINE_get_id(e));
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	for (i=0; i<sk_num(engines); i++)
 | 
			
		||||
		{
 | 
			
		||||
		const char *id = sk_value(engines,i);
 | 
			
		||||
		if ((e = ENGINE_by_id(id)) != NULL)
 | 
			
		||||
			{
 | 
			
		||||
			const char *name = ENGINE_get_name(e);
 | 
			
		||||
			/* Do "id" first, then "name". Easier to auto-parse. */
 | 
			
		||||
			BIO_printf(bio_out, "(%s) %s\n", id, name);
 | 
			
		||||
			util_do_cmds(e, pre_cmds, bio_out, indent);
 | 
			
		||||
			if (strcmp(ENGINE_get_id(e), id) != 0)
 | 
			
		||||
				{
 | 
			
		||||
				BIO_printf(bio_out, "Loaded: (%s) %s\n",
 | 
			
		||||
					ENGINE_get_id(e), ENGINE_get_name(e));
 | 
			
		||||
				}
 | 
			
		||||
			if (list_cap)
 | 
			
		||||
				{
 | 
			
		||||
				int cap_size = 256;
 | 
			
		||||
				char *cap_buf = NULL;
 | 
			
		||||
				int k,n;
 | 
			
		||||
				const int *nids;
 | 
			
		||||
				ENGINE_CIPHERS_PTR fn_c;
 | 
			
		||||
				ENGINE_DIGESTS_PTR fn_d;
 | 
			
		||||
 | 
			
		||||
				if (ENGINE_get_RSA(e) != NULL
 | 
			
		||||
					&& !append_buf(&cap_buf, "RSA",
 | 
			
		||||
						&cap_size, 256))
 | 
			
		||||
					goto end;
 | 
			
		||||
				if (ENGINE_get_DSA(e) != NULL
 | 
			
		||||
					&& !append_buf(&cap_buf, "DSA",
 | 
			
		||||
						&cap_size, 256))
 | 
			
		||||
					goto end;
 | 
			
		||||
				if (ENGINE_get_DH(e) != NULL
 | 
			
		||||
					&& !append_buf(&cap_buf, "DH",
 | 
			
		||||
						&cap_size, 256))
 | 
			
		||||
					goto end;
 | 
			
		||||
				if (ENGINE_get_RAND(e) != NULL
 | 
			
		||||
					&& !append_buf(&cap_buf, "RAND",
 | 
			
		||||
						&cap_size, 256))
 | 
			
		||||
					goto end;
 | 
			
		||||
 | 
			
		||||
				fn_c = ENGINE_get_ciphers(e);
 | 
			
		||||
				if(!fn_c) goto skip_ciphers;
 | 
			
		||||
				n = fn_c(e, NULL, &nids, 0);
 | 
			
		||||
				for(k=0 ; k < n ; ++k)
 | 
			
		||||
					if(!append_buf(&cap_buf,
 | 
			
		||||
						       OBJ_nid2sn(nids[k]),
 | 
			
		||||
						       &cap_size, 256))
 | 
			
		||||
						goto end;
 | 
			
		||||
 | 
			
		||||
skip_ciphers:
 | 
			
		||||
				fn_d = ENGINE_get_digests(e);
 | 
			
		||||
				if(!fn_d) goto skip_digests;
 | 
			
		||||
				n = fn_d(e, NULL, &nids, 0);
 | 
			
		||||
				for(k=0 ; k < n ; ++k)
 | 
			
		||||
					if(!append_buf(&cap_buf,
 | 
			
		||||
						       OBJ_nid2sn(nids[k]),
 | 
			
		||||
						       &cap_size, 256))
 | 
			
		||||
						goto end;
 | 
			
		||||
 | 
			
		||||
skip_digests:
 | 
			
		||||
				if (cap_buf && (*cap_buf != '\0'))
 | 
			
		||||
					BIO_printf(bio_out, " [%s]\n", cap_buf);
 | 
			
		||||
 | 
			
		||||
				OPENSSL_free(cap_buf);
 | 
			
		||||
				}
 | 
			
		||||
			if(test_avail)
 | 
			
		||||
				{
 | 
			
		||||
				BIO_printf(bio_out, "%s", indent);
 | 
			
		||||
				if (ENGINE_init(e))
 | 
			
		||||
					{
 | 
			
		||||
					BIO_printf(bio_out, "[ available ]\n");
 | 
			
		||||
					util_do_cmds(e, post_cmds, bio_out, indent);
 | 
			
		||||
					ENGINE_finish(e);
 | 
			
		||||
					}
 | 
			
		||||
				else
 | 
			
		||||
					{
 | 
			
		||||
					BIO_printf(bio_out, "[ unavailable ]\n");
 | 
			
		||||
					if(test_avail_noise)
 | 
			
		||||
						ERR_print_errors_fp(stdout);
 | 
			
		||||
					ERR_clear_error();
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			if((verbose > 0) && !util_verbose(e, verbose, bio_out, indent))
 | 
			
		||||
				goto end;
 | 
			
		||||
			ENGINE_free(e);
 | 
			
		||||
			}
 | 
			
		||||
		else
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	ret=0;
 | 
			
		||||
end:
 | 
			
		||||
 | 
			
		||||
	ERR_print_errors(bio_err);
 | 
			
		||||
	sk_pop_free(engines, identity);
 | 
			
		||||
	sk_pop_free(pre_cmds, identity);
 | 
			
		||||
	sk_pop_free(post_cmds, identity);
 | 
			
		||||
	if (bio_out != NULL) BIO_free_all(bio_out);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
#else
 | 
			
		||||
 | 
			
		||||
# if PEDANTIC
 | 
			
		||||
static void *dummy=&dummy;
 | 
			
		||||
# endif
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
@@ -91,18 +91,12 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		out=BIO_new(BIO_s_file());
 | 
			
		||||
		if ((out != NULL) && BIO_set_fp(out,stdout,BIO_NOCLOSE))
 | 
			
		||||
			{
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
			{
 | 
			
		||||
			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
			out = BIO_push(tmpbio, out);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
			lh_node_stats_bio((LHASH *)ERR_get_string_table(),out);
 | 
			
		||||
			lh_stats_bio((LHASH *)ERR_get_string_table(),out);
 | 
			
		||||
			lh_node_usage_stats_bio((LHASH *)
 | 
			
		||||
				ERR_get_string_table(),out);
 | 
			
		||||
			}
 | 
			
		||||
		if (out != NULL) BIO_free_all(out);
 | 
			
		||||
		if (out != NULL) BIO_free(out);
 | 
			
		||||
		argc--;
 | 
			
		||||
		argv++;
 | 
			
		||||
		}
 | 
			
		||||
@@ -110,10 +104,7 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	for (i=1; i<argc; i++)
 | 
			
		||||
		{
 | 
			
		||||
		if (sscanf(argv[i],"%lx",&l))
 | 
			
		||||
			{
 | 
			
		||||
			ERR_error_string_n(l, buf, sizeof buf);
 | 
			
		||||
			printf("%s\n",buf);
 | 
			
		||||
			}
 | 
			
		||||
			printf("%s\n",ERR_error_string(l,buf));
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
			printf("%s: bad error code\n",argv[i]);
 | 
			
		||||
@@ -121,6 +112,5 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			ret++;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										71
									
								
								apps/gendh.c
									
									
									
									
									
								
							
							
						
						
									
										71
									
								
								apps/gendh.c
									
									
									
									
									
								
							@@ -1,5 +1,4 @@
 | 
			
		||||
/* apps/gendh.c */
 | 
			
		||||
/* obsoleted by dhparam.c */
 | 
			
		||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 | 
			
		||||
 * All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
@@ -57,14 +56,7 @@
 | 
			
		||||
 * [including the GNU Public Licence.]
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include <openssl/opensslconf.h>
 | 
			
		||||
/* Until the key-gen callbacks are modified to use newer prototypes, we allow
 | 
			
		||||
 * deprecated functions for openssl-internal code */
 | 
			
		||||
#ifdef OPENSSL_NO_DEPRECATED
 | 
			
		||||
#undef OPENSSL_NO_DEPRECATED
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_DH
 | 
			
		||||
#ifndef NO_DH
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include <sys/types.h>
 | 
			
		||||
@@ -82,36 +74,25 @@
 | 
			
		||||
#undef PROG
 | 
			
		||||
#define PROG gendh_main
 | 
			
		||||
 | 
			
		||||
static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
 | 
			
		||||
static void MS_CALLBACK dh_cb(int p, int n, void *arg);
 | 
			
		||||
 | 
			
		||||
int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
	BN_GENCB cb;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	ENGINE *e = NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	DH *dh=NULL;
 | 
			
		||||
	int ret=1,num=DEFBITS;
 | 
			
		||||
	int g=2;
 | 
			
		||||
	char *outfile=NULL;
 | 
			
		||||
	char *inrand=NULL;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	char *engine=NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	BIO *out=NULL;
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
 | 
			
		||||
	BN_GENCB_set(&cb, dh_cb, bio_err);
 | 
			
		||||
	if (bio_err == NULL)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
	argv++;
 | 
			
		||||
	argc--;
 | 
			
		||||
	for (;;)
 | 
			
		||||
@@ -128,13 +109,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			g=3; */
 | 
			
		||||
		else if (strcmp(*argv,"-5") == 0)
 | 
			
		||||
			g=5;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		else if (strcmp(*argv,"-engine") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			engine= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
		else if (strcmp(*argv,"-rand") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
@@ -150,22 +124,15 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
bad:
 | 
			
		||||
		BIO_printf(bio_err,"usage: gendh [args] [numbits]\n");
 | 
			
		||||
		BIO_printf(bio_err," -out file - output the key to 'file\n");
 | 
			
		||||
		BIO_printf(bio_err," -2        - use 2 as the generator value\n");
 | 
			
		||||
	/*	BIO_printf(bio_err," -3        - use 3 as the generator value\n"); */
 | 
			
		||||
		BIO_printf(bio_err," -5        - use 5 as the generator value\n");
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
 | 
			
		||||
#endif
 | 
			
		||||
		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 | 
			
		||||
		BIO_printf(bio_err," -2    use 2 as the generator value\n");
 | 
			
		||||
	/*	BIO_printf(bio_err," -3    use 3 as the generator value\n"); */
 | 
			
		||||
		BIO_printf(bio_err," -5    use 5 as the generator value\n");
 | 
			
		||||
		BIO_printf(bio_err," -rand file:file:...\n");
 | 
			
		||||
		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
 | 
			
		||||
		BIO_printf(bio_err,"             the random number generator\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
        e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	out=BIO_new(BIO_s_file());
 | 
			
		||||
	if (out == NULL)
 | 
			
		||||
		{
 | 
			
		||||
@@ -174,15 +141,7 @@ bad:
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (outfile == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_write_filename(out,outfile) <= 0)
 | 
			
		||||
@@ -200,11 +159,11 @@ bad:
 | 
			
		||||
		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 | 
			
		||||
			app_RAND_load_files(inrand));
 | 
			
		||||
 | 
			
		||||
	BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
 | 
			
		||||
	BIO_printf(bio_err,"Generating DH parameters, %d bit long strong prime, generator of %d\n",num,g);
 | 
			
		||||
	BIO_printf(bio_err,"This is going to take a long time\n");
 | 
			
		||||
	dh=DH_generate_parameters(num,g,dh_cb,bio_err);
 | 
			
		||||
		
 | 
			
		||||
	if(((dh = DH_new()) == NULL) || !DH_generate_parameters_ex(dh, num, g, &cb))
 | 
			
		||||
		goto end;
 | 
			
		||||
	if (dh == NULL) goto end;
 | 
			
		||||
 | 
			
		||||
	app_RAND_write_file(NULL, bio_err);
 | 
			
		||||
 | 
			
		||||
@@ -214,13 +173,12 @@ bad:
 | 
			
		||||
end:
 | 
			
		||||
	if (ret != 0)
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
	if (out != NULL) BIO_free_all(out);
 | 
			
		||||
	if (out != NULL) BIO_free(out);
 | 
			
		||||
	if (dh != NULL) DH_free(dh);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
 | 
			
		||||
static void MS_CALLBACK dh_cb(int p, int n, void *arg)
 | 
			
		||||
	{
 | 
			
		||||
	char c='*';
 | 
			
		||||
 | 
			
		||||
@@ -228,11 +186,10 @@ static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
 | 
			
		||||
	if (p == 1) c='+';
 | 
			
		||||
	if (p == 2) c='*';
 | 
			
		||||
	if (p == 3) c='\n';
 | 
			
		||||
	BIO_write(cb->arg,&c,1);
 | 
			
		||||
	(void)BIO_flush(cb->arg);
 | 
			
		||||
	BIO_write((BIO *)arg,&c,1);
 | 
			
		||||
	(void)BIO_flush((BIO *)arg);
 | 
			
		||||
#ifdef LINT
 | 
			
		||||
	p=n;
 | 
			
		||||
#endif
 | 
			
		||||
	return 1;
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
@@ -56,8 +56,7 @@
 | 
			
		||||
 * [including the GNU Public Licence.]
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include <openssl/opensslconf.h>	/* for OPENSSL_NO_DSA */
 | 
			
		||||
#ifndef OPENSSL_NO_DSA
 | 
			
		||||
#ifndef NO_DSA
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include <sys/types.h>
 | 
			
		||||
@@ -78,19 +77,13 @@ int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	ENGINE *e = NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	DSA *dsa=NULL;
 | 
			
		||||
	int ret=1;
 | 
			
		||||
	char *outfile=NULL;
 | 
			
		||||
	char *inrand=NULL,*dsaparams=NULL;
 | 
			
		||||
	char *passargout = NULL, *passout = NULL;
 | 
			
		||||
	BIO *out=NULL,*in=NULL;
 | 
			
		||||
	const EVP_CIPHER *enc=NULL;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	char *engine=NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	EVP_CIPHER *enc=NULL;
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
 | 
			
		||||
@@ -98,9 +91,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
	argv++;
 | 
			
		||||
	argc--;
 | 
			
		||||
	for (;;)
 | 
			
		||||
@@ -116,13 +106,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			passargout= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		else if (strcmp(*argv,"-engine") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			engine= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
		else if (strcmp(*argv,"-rand") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
@@ -130,35 +113,15 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-") == 0)
 | 
			
		||||
			goto bad;
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
		else if (strcmp(*argv,"-des") == 0)
 | 
			
		||||
			enc=EVP_des_cbc();
 | 
			
		||||
		else if (strcmp(*argv,"-des3") == 0)
 | 
			
		||||
			enc=EVP_des_ede3_cbc();
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_IDEA
 | 
			
		||||
#ifndef NO_IDEA
 | 
			
		||||
		else if (strcmp(*argv,"-idea") == 0)
 | 
			
		||||
			enc=EVP_idea_cbc();
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SEED
 | 
			
		||||
		else if (strcmp(*argv,"-seed") == 0)
 | 
			
		||||
			enc=EVP_seed_cbc();
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_AES
 | 
			
		||||
		else if (strcmp(*argv,"-aes128") == 0)
 | 
			
		||||
			enc=EVP_aes_128_cbc();
 | 
			
		||||
		else if (strcmp(*argv,"-aes192") == 0)
 | 
			
		||||
			enc=EVP_aes_192_cbc();
 | 
			
		||||
		else if (strcmp(*argv,"-aes256") == 0)
 | 
			
		||||
			enc=EVP_aes_256_cbc();
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAMELLIA
 | 
			
		||||
		else if (strcmp(*argv,"-camellia128") == 0)
 | 
			
		||||
			enc=EVP_camellia_128_cbc();
 | 
			
		||||
		else if (strcmp(*argv,"-camellia192") == 0)
 | 
			
		||||
			enc=EVP_camellia_192_cbc();
 | 
			
		||||
		else if (strcmp(*argv,"-camellia256") == 0)
 | 
			
		||||
			enc=EVP_camellia_256_cbc();
 | 
			
		||||
#endif
 | 
			
		||||
		else if (**argv != '-' && dsaparams == NULL)
 | 
			
		||||
			{
 | 
			
		||||
@@ -175,29 +138,14 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
bad:
 | 
			
		||||
		BIO_printf(bio_err,"usage: gendsa [args] dsaparam-file\n");
 | 
			
		||||
		BIO_printf(bio_err," -out file - output the key to 'file'\n");
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
		BIO_printf(bio_err," -des      - encrypt the generated key with DES in cbc mode\n");
 | 
			
		||||
		BIO_printf(bio_err," -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_IDEA
 | 
			
		||||
#ifndef NO_IDEA
 | 
			
		||||
		BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SEED
 | 
			
		||||
		BIO_printf(bio_err," -seed\n");
 | 
			
		||||
		BIO_printf(bio_err,"                 encrypt PEM output with cbc seed\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_AES
 | 
			
		||||
		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
 | 
			
		||||
		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAMELLIA
 | 
			
		||||
		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
 | 
			
		||||
		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
 | 
			
		||||
#endif
 | 
			
		||||
		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 | 
			
		||||
		BIO_printf(bio_err," -rand file:file:...\n");
 | 
			
		||||
		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
 | 
			
		||||
		BIO_printf(bio_err,"             the random number generator\n");
 | 
			
		||||
		BIO_printf(bio_err," dsaparam-file\n");
 | 
			
		||||
@@ -205,10 +153,6 @@ bad:
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
        e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
 | 
			
		||||
		BIO_printf(bio_err, "Error getting password\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
@@ -234,15 +178,7 @@ bad:
 | 
			
		||||
	if (out == NULL) goto end;
 | 
			
		||||
 | 
			
		||||
	if (outfile == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_write_filename(out,outfile) <= 0)
 | 
			
		||||
@@ -273,10 +209,9 @@ end:
 | 
			
		||||
	if (ret != 0)
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
	if (in != NULL) BIO_free(in);
 | 
			
		||||
	if (out != NULL) BIO_free_all(out);
 | 
			
		||||
	if (out != NULL) BIO_free(out);
 | 
			
		||||
	if (dsa != NULL) DSA_free(dsa);
 | 
			
		||||
	if(passout) OPENSSL_free(passout);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	if(passout) Free(passout);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										143
									
								
								apps/genrsa.c
									
									
									
									
									
								
							
							
						
						
									
										143
									
								
								apps/genrsa.c
									
									
									
									
									
								
							@@ -56,14 +56,7 @@
 | 
			
		||||
 * [including the GNU Public Licence.]
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include <openssl/opensslconf.h>
 | 
			
		||||
/* Until the key-gen callbacks are modified to use newer prototypes, we allow
 | 
			
		||||
 * deprecated functions for openssl-internal code */
 | 
			
		||||
#ifdef OPENSSL_NO_DEPRECATED
 | 
			
		||||
#undef OPENSSL_NO_DEPRECATED
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_RSA
 | 
			
		||||
#ifndef NO_RSA
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include <sys/types.h>
 | 
			
		||||
@@ -76,49 +69,33 @@
 | 
			
		||||
#include <openssl/evp.h>
 | 
			
		||||
#include <openssl/x509.h>
 | 
			
		||||
#include <openssl/pem.h>
 | 
			
		||||
#include <openssl/rand.h>
 | 
			
		||||
 | 
			
		||||
#define DEFBITS	512
 | 
			
		||||
#undef PROG
 | 
			
		||||
#define PROG genrsa_main
 | 
			
		||||
 | 
			
		||||
static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb);
 | 
			
		||||
static void MS_CALLBACK genrsa_cb(int p, int n, void *arg);
 | 
			
		||||
 | 
			
		||||
int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
	BN_GENCB cb;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	ENGINE *e = NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	int ret=1;
 | 
			
		||||
	RSA *rsa=NULL;
 | 
			
		||||
	int i,num=DEFBITS;
 | 
			
		||||
	long l;
 | 
			
		||||
	int use_x931 = 0;
 | 
			
		||||
	const EVP_CIPHER *enc=NULL;
 | 
			
		||||
	EVP_CIPHER *enc=NULL;
 | 
			
		||||
	unsigned long f4=RSA_F4;
 | 
			
		||||
	char *outfile=NULL;
 | 
			
		||||
	char *passargout = NULL, *passout = NULL;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	char *engine=NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	char *inrand=NULL;
 | 
			
		||||
	BIO *out=NULL;
 | 
			
		||||
	BIGNUM *bn = BN_new();
 | 
			
		||||
	RSA *rsa = RSA_new();
 | 
			
		||||
 | 
			
		||||
	if(!bn || !rsa) goto err;
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
	BN_GENCB_set(&cb, genrsa_cb, bio_err);
 | 
			
		||||
 | 
			
		||||
	if (bio_err == NULL)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto err;
 | 
			
		||||
	if ((out=BIO_new(BIO_s_file())) == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err,"unable to create BIO for output\n");
 | 
			
		||||
@@ -137,51 +114,22 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-3") == 0)
 | 
			
		||||
			f4=3;
 | 
			
		||||
		else if (strcmp(*argv,"-F4") == 0 || strcmp(*argv,"-f4") == 0)
 | 
			
		||||
		else if (strcmp(*argv,"-F4") == 0)
 | 
			
		||||
			f4=RSA_F4;
 | 
			
		||||
		else if (strcmp(*argv,"-x931") == 0)
 | 
			
		||||
			use_x931 = 1;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		else if (strcmp(*argv,"-engine") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			engine= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
		else if (strcmp(*argv,"-rand") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			inrand= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
		else if (strcmp(*argv,"-des") == 0)
 | 
			
		||||
			enc=EVP_des_cbc();
 | 
			
		||||
		else if (strcmp(*argv,"-des3") == 0)
 | 
			
		||||
			enc=EVP_des_ede3_cbc();
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_IDEA
 | 
			
		||||
#ifndef NO_IDEA
 | 
			
		||||
		else if (strcmp(*argv,"-idea") == 0)
 | 
			
		||||
			enc=EVP_idea_cbc();
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SEED
 | 
			
		||||
		else if (strcmp(*argv,"-seed") == 0)
 | 
			
		||||
			enc=EVP_seed_cbc();
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_AES
 | 
			
		||||
		else if (strcmp(*argv,"-aes128") == 0)
 | 
			
		||||
			enc=EVP_aes_128_cbc();
 | 
			
		||||
		else if (strcmp(*argv,"-aes192") == 0)
 | 
			
		||||
			enc=EVP_aes_192_cbc();
 | 
			
		||||
		else if (strcmp(*argv,"-aes256") == 0)
 | 
			
		||||
			enc=EVP_aes_256_cbc();
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAMELLIA
 | 
			
		||||
		else if (strcmp(*argv,"-camellia128") == 0)
 | 
			
		||||
			enc=EVP_camellia_128_cbc();
 | 
			
		||||
		else if (strcmp(*argv,"-camellia192") == 0)
 | 
			
		||||
			enc=EVP_camellia_192_cbc();
 | 
			
		||||
		else if (strcmp(*argv,"-camellia256") == 0)
 | 
			
		||||
			enc=EVP_camellia_256_cbc();
 | 
			
		||||
#endif
 | 
			
		||||
		else if (strcmp(*argv,"-passout") == 0)
 | 
			
		||||
			{
 | 
			
		||||
@@ -199,29 +147,14 @@ bad:
 | 
			
		||||
		BIO_printf(bio_err,"usage: genrsa [args] [numbits]\n");
 | 
			
		||||
		BIO_printf(bio_err," -des            encrypt the generated key with DES in cbc mode\n");
 | 
			
		||||
		BIO_printf(bio_err," -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
 | 
			
		||||
#ifndef OPENSSL_NO_IDEA
 | 
			
		||||
#ifndef NO_IDEA
 | 
			
		||||
		BIO_printf(bio_err," -idea           encrypt the generated key with IDEA in cbc mode\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SEED
 | 
			
		||||
		BIO_printf(bio_err," -seed\n");
 | 
			
		||||
		BIO_printf(bio_err,"                 encrypt PEM output with cbc seed\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_AES
 | 
			
		||||
		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
 | 
			
		||||
		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAMELLIA
 | 
			
		||||
		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
 | 
			
		||||
		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
 | 
			
		||||
#endif
 | 
			
		||||
		BIO_printf(bio_err," -out file       output the key to 'file\n");
 | 
			
		||||
		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
 | 
			
		||||
		BIO_printf(bio_err," -f4             use F4 (0x10001) for the E value\n");
 | 
			
		||||
		BIO_printf(bio_err," -3              use 3 for the E value\n");
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
 | 
			
		||||
#endif
 | 
			
		||||
		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 | 
			
		||||
		BIO_printf(bio_err," -rand file:file:...\n");
 | 
			
		||||
		BIO_printf(bio_err,"                 load the file (or the files in the directory) into\n");
 | 
			
		||||
		BIO_printf(bio_err,"                 the random number generator\n");
 | 
			
		||||
		goto err;
 | 
			
		||||
@@ -234,20 +167,8 @@ bad:
 | 
			
		||||
		goto err;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
        e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	if (outfile == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_write_filename(out,outfile) <= 0)
 | 
			
		||||
@@ -257,8 +178,7 @@ bad:
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL
 | 
			
		||||
		&& !RAND_status())
 | 
			
		||||
	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
 | 
			
		||||
		}
 | 
			
		||||
@@ -268,22 +188,12 @@ bad:
 | 
			
		||||
 | 
			
		||||
	BIO_printf(bio_err,"Generating RSA private key, %d bit long modulus\n",
 | 
			
		||||
		num);
 | 
			
		||||
 | 
			
		||||
	if (use_x931)
 | 
			
		||||
		{
 | 
			
		||||
		BIGNUM *pubexp;
 | 
			
		||||
		pubexp = BN_new();
 | 
			
		||||
		if (!BN_set_word(pubexp, f4))
 | 
			
		||||
			goto err;
 | 
			
		||||
		if (!RSA_X931_generate_key_ex(rsa, num, pubexp, &cb))
 | 
			
		||||
			goto err;
 | 
			
		||||
		BN_free(pubexp);
 | 
			
		||||
		}
 | 
			
		||||
	else if(!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, &cb))
 | 
			
		||||
		goto err;
 | 
			
		||||
	rsa=RSA_generate_key(num,f4,genrsa_cb,bio_err);
 | 
			
		||||
		
 | 
			
		||||
	app_RAND_write_file(NULL, bio_err);
 | 
			
		||||
 | 
			
		||||
	if (rsa == NULL) goto err;
 | 
			
		||||
	
 | 
			
		||||
	/* We need to do the following for when the base number size is <
 | 
			
		||||
	 * long, esp windows 3.1 :-(. */
 | 
			
		||||
	l=0L;
 | 
			
		||||
@@ -296,28 +206,20 @@ bad:
 | 
			
		||||
		l+=rsa->e->d[i];
 | 
			
		||||
		}
 | 
			
		||||
	BIO_printf(bio_err,"e is %ld (0x%lX)\n",l,l);
 | 
			
		||||
	{
 | 
			
		||||
	PW_CB_DATA cb_data;
 | 
			
		||||
	cb_data.password = passout;
 | 
			
		||||
	cb_data.prompt_info = outfile;
 | 
			
		||||
	if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,
 | 
			
		||||
		(pem_password_cb *)password_callback,&cb_data))
 | 
			
		||||
	if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,NULL, passout))
 | 
			
		||||
		goto err;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	ret=0;
 | 
			
		||||
err:
 | 
			
		||||
	if (bn) BN_free(bn);
 | 
			
		||||
	if (rsa) RSA_free(rsa);
 | 
			
		||||
	if (out) BIO_free_all(out);
 | 
			
		||||
	if(passout) OPENSSL_free(passout);
 | 
			
		||||
	if (rsa != NULL) RSA_free(rsa);
 | 
			
		||||
	if (out != NULL) BIO_free(out);
 | 
			
		||||
	if(passout) Free(passout);
 | 
			
		||||
	if (ret != 0)
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb)
 | 
			
		||||
static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)
 | 
			
		||||
	{
 | 
			
		||||
	char c='*';
 | 
			
		||||
 | 
			
		||||
@@ -325,14 +227,13 @@ static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb)
 | 
			
		||||
	if (p == 1) c='+';
 | 
			
		||||
	if (p == 2) c='*';
 | 
			
		||||
	if (p == 3) c='\n';
 | 
			
		||||
	BIO_write(cb->arg,&c,1);
 | 
			
		||||
	(void)BIO_flush(cb->arg);
 | 
			
		||||
	BIO_write((BIO *)arg,&c,1);
 | 
			
		||||
	(void)BIO_flush((BIO *)arg);
 | 
			
		||||
#ifdef LINT
 | 
			
		||||
	p=n;
 | 
			
		||||
#endif
 | 
			
		||||
	return 1;
 | 
			
		||||
	}
 | 
			
		||||
#else /* !OPENSSL_NO_RSA */
 | 
			
		||||
#else /* !NO_RSA */
 | 
			
		||||
 | 
			
		||||
# if PEDANTIC
 | 
			
		||||
static void *dummy=&dummy;
 | 
			
		||||
 
 | 
			
		||||
@@ -15,10 +15,22 @@ $!
 | 
			
		||||
$!  It was written so it would try to determine what "C" compiler to
 | 
			
		||||
$!  use or you can specify which "C" compiler to use.
 | 
			
		||||
$!
 | 
			
		||||
$!  Specify DEBUG or NODEBUG as P1 to compile with or without debugger
 | 
			
		||||
$!  Specify RSAREF as P1 to compile with the RSAREF library instead of
 | 
			
		||||
$!  the regular one.  If you specify NORSAREF it will compile with the
 | 
			
		||||
$!  regular RSAREF routines.  (Note: If you are in the United States
 | 
			
		||||
$!  you MUST compile with RSAREF unless you have a license from RSA).
 | 
			
		||||
$!
 | 
			
		||||
$!  Note: The RSAREF libraries are NOT INCLUDED and you have to
 | 
			
		||||
$!        download it from "ftp://ftp.rsa.com/rsaref".  You have to
 | 
			
		||||
$!        get the ".tar-Z" file as the ".zip" file dosen't have the
 | 
			
		||||
$!        directory structure stored.  You have to extract the file
 | 
			
		||||
$!        into the [.RSAREF] directory under the root directory as that
 | 
			
		||||
$!        is where the scripts will look for the files.
 | 
			
		||||
$!
 | 
			
		||||
$!  Specify DEBUG or NODEBUG as P2 to compile with or without debugger
 | 
			
		||||
$!  information.
 | 
			
		||||
$!
 | 
			
		||||
$!  Specify which compiler at P2 to try to compile under.
 | 
			
		||||
$!  Specify which compiler at P3 to try to compile under.
 | 
			
		||||
$!
 | 
			
		||||
$!	   VAXC	 For VAX C.
 | 
			
		||||
$!	   DECC	 For DEC C.
 | 
			
		||||
@@ -27,16 +39,15 @@ $!
 | 
			
		||||
$!  If you don't speficy a compiler, it will try to determine which
 | 
			
		||||
$!  "C" compiler to use.
 | 
			
		||||
$!
 | 
			
		||||
$!  P3, if defined, sets a TCP/IP library to use, through one of the following
 | 
			
		||||
$!  P4, if defined, sets a TCP/IP library to use, through one of the following
 | 
			
		||||
$!  keywords:
 | 
			
		||||
$!
 | 
			
		||||
$!	UCX		for UCX
 | 
			
		||||
$!	SOCKETSHR	for SOCKETSHR+NETLIB
 | 
			
		||||
$!	TCPIP		for TCPIP (post UCX)
 | 
			
		||||
$!
 | 
			
		||||
$!  P4, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
 | 
			
		||||
$!  P5, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
 | 
			
		||||
$!
 | 
			
		||||
$!  P5, if defined, sets a choice of programs to compile.
 | 
			
		||||
$!  P6, if defined, sets a choice of programs to compile.
 | 
			
		||||
$!
 | 
			
		||||
$!
 | 
			
		||||
$! Define A TCP/IP Library That We Will Need To Link To.
 | 
			
		||||
@@ -89,6 +100,10 @@ $! Define The CRYPTO Library.
 | 
			
		||||
$!
 | 
			
		||||
$ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO.OLB
 | 
			
		||||
$!
 | 
			
		||||
$! Define The RSAREF Library.
 | 
			
		||||
$!
 | 
			
		||||
$ RSAREF_LIB := SYS$DISK:[-.'ARCH'.EXE.RSAREF]LIBRSAGLUE.OLB
 | 
			
		||||
$!
 | 
			
		||||
$! Define The SSL Library.
 | 
			
		||||
$!
 | 
			
		||||
$ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL.OLB
 | 
			
		||||
@@ -139,17 +154,34 @@ $! Define The Application Files.
 | 
			
		||||
$!
 | 
			
		||||
$ LIB_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;DHPARAM;ENC;PASSWD;GENDH;ERRSTR;"+-
 | 
			
		||||
	      "CA;PKCS7;CRL2P7;CRL;"+-
 | 
			
		||||
	      "RSA;RSAUTL;DSA;DSAPARAM;EC;ECPARAM;"+-
 | 
			
		||||
	      "RSA;DSA;DSAPARAM;"+-
 | 
			
		||||
	      "X509;GENRSA;GENDSA;S_SERVER;S_CLIENT;SPEED;"+-
 | 
			
		||||
	      "S_TIME;APPS;S_CB;S_SOCKET;APP_RAND;VERSION;SESS_ID;"+-
 | 
			
		||||
	      "CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME;RAND;ENGINE;OCSP;PRIME"
 | 
			
		||||
	      "CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME"
 | 
			
		||||
$ APP_FILES := OPENSSL,'OBJ_DIR'VERIFY.OBJ,ASN1PARS.OBJ,REQ.OBJ,DGST.OBJ,DH.OBJ,DHPARAM.OBJ,ENC.OBJ,PASSWD.OBJ,GENDH.OBJ,ERRSTR.OBJ,-
 | 
			
		||||
	       CA.OBJ,PKCS7.OBJ,CRL2P7.OBJ,CRL.OBJ,-
 | 
			
		||||
	       RSA.OBJ,DSA.OBJ,DSAPARAM.OBJ,-
 | 
			
		||||
	       X509.OBJ,GENRSA.OBJ,GENDSA.OBJ,S_SERVER.OBJ,S_CLIENT.OBJ,SPEED.OBJ,-
 | 
			
		||||
	       S_TIME.OBJ,APPS.OBJ,S_CB.OBJ,S_SOCKET.OBJ,APP_RAND.OBJ,VERSION.OBJ,SESS_ID.OBJ,-
 | 
			
		||||
	       CIPHERS.OBJ,NSEQ.OBJ,PKCS12.OBJ,PKCS8.OBJ,SPKAC.OBJ,SMIME.OBJ
 | 
			
		||||
$ TCPIP_PROGRAMS = ",,"
 | 
			
		||||
$ IF COMPILER .EQS. "VAXC" THEN -
 | 
			
		||||
     TCPIP_PROGRAMS = ",OPENSSL,"
 | 
			
		||||
$!$ APP_FILES := VERIFY;ASN1PARS;REQ;DGST;DH;ENC;GENDH;ERRSTR;CA;-
 | 
			
		||||
$!	       PKCS7;CRL2P7;CRL;-
 | 
			
		||||
$!	       RSA;DSA;DSAPARAM;-
 | 
			
		||||
$!	       X509;GENRSA;GENDSA;-
 | 
			
		||||
$!	       S_SERVER,'OBJ_DIR'S_SOCKET.OBJ,'OBJ_DIR'S_CB.OBJ;-
 | 
			
		||||
$!	       S_CLIENT,'OBJ_DIR'S_SOCKET.OBJ,'OBJ_DIR'S_CB.OBJ;-
 | 
			
		||||
$!	       SPEED;-
 | 
			
		||||
$!	       S_TIME,'OBJ_DIR'S_CB.OBJ;VERSION;SESS_ID;CIPHERS;NSEQ
 | 
			
		||||
$!$ TCPIP_PROGRAMS = ",,"
 | 
			
		||||
$!$ IF COMPILER .EQS. "VAXC" THEN -
 | 
			
		||||
$!     TCPIP_PROGRAMS = ",S_SERVER,S_CLIENT,SESS_ID,CIPHERS,S_TIME,"
 | 
			
		||||
$!
 | 
			
		||||
$! Setup exceptional compilations
 | 
			
		||||
$!
 | 
			
		||||
$ COMPILEWITH_CC2 = ",S_SERVER,S_CLIENT,"
 | 
			
		||||
$ COMPILEWITH_CC2 = ",S_SOCKET,S_SERVER,S_CLIENT,"
 | 
			
		||||
$!
 | 
			
		||||
$ PHASE := LIB
 | 
			
		||||
$!
 | 
			
		||||
@@ -260,31 +292,73 @@ $   WRITE SYS$OUTPUT FILE_NAME," needs a TCP/IP library.  Can't link.  Skipping.
 | 
			
		||||
$   GOTO NEXT_FILE
 | 
			
		||||
$ ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$! Link The Program.
 | 
			
		||||
$! Check To See If We Are To Link With A Specific TCP/IP Library.
 | 
			
		||||
$! Link The Program, Check To See If We Need To Link With RSAREF Or Not.
 | 
			
		||||
$!
 | 
			
		||||
$ IF (TCPIP_LIB.NES."")
 | 
			
		||||
$ IF (RSAREF.EQS."TRUE")
 | 
			
		||||
$ THEN
 | 
			
		||||
$!
 | 
			
		||||
$! Don't Link With The RSAREF Routines And TCP/IP Library.
 | 
			
		||||
$!  Check To See If We Are To Link With A Specific TCP/IP Library.
 | 
			
		||||
$!
 | 
			
		||||
$   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
 | 
			
		||||
	'OBJECT_FILE''EXTRA_OBJ', -
 | 
			
		||||
        'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
 | 
			
		||||
        'TCPIP_LIB','OPT_FILE'/OPTION
 | 
			
		||||
$   IF (TCPIP_LIB.NES."")
 | 
			
		||||
$   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    Link With The RSAREF Library And A Specific TCP/IP Library.
 | 
			
		||||
$!
 | 
			
		||||
$     LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
 | 
			
		||||
	  'OBJECT_FILE''EXTRA_OBJ', -
 | 
			
		||||
          'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY,'RSAREF_LIB'/LIBRARY, -
 | 
			
		||||
          'TCPIP_LIB','OPT_FILE'/OPTION
 | 
			
		||||
$!
 | 
			
		||||
$!  Else...
 | 
			
		||||
$!
 | 
			
		||||
$   ELSE
 | 
			
		||||
$!
 | 
			
		||||
$!    Link With The RSAREF Library And NO TCP/IP Library.
 | 
			
		||||
$!
 | 
			
		||||
$     LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
 | 
			
		||||
	  'OBJECT_FILE''EXTRA_OBJ', -
 | 
			
		||||
          'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY,'RSAREF_LIB'/LIBRARY, -
 | 
			
		||||
          'OPT_FILE'/OPTION
 | 
			
		||||
$!
 | 
			
		||||
$!  End The TCP/IP Library Check.
 | 
			
		||||
$!
 | 
			
		||||
$   ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$! Else...
 | 
			
		||||
$!
 | 
			
		||||
$ ELSE
 | 
			
		||||
$!
 | 
			
		||||
$! Don't Link With The RSAREF Routines And Link With A TCP/IP Library.
 | 
			
		||||
$!  Don't Link With The RSAREF Routines.
 | 
			
		||||
$!
 | 
			
		||||
$   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
 | 
			
		||||
	'OBJECT_FILE''EXTRA_OBJ', -
 | 
			
		||||
        'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
 | 
			
		||||
        'OPT_FILE'/OPTION
 | 
			
		||||
$!
 | 
			
		||||
$! End The TCP/IP Library Check.
 | 
			
		||||
$!  Check To See If We Are To Link With A Specific TCP/IP Library.
 | 
			
		||||
$!
 | 
			
		||||
$   IF (TCPIP_LIB.NES."")
 | 
			
		||||
$   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    Don't Link With The RSAREF Routines And TCP/IP Library.
 | 
			
		||||
$!
 | 
			
		||||
$       LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
 | 
			
		||||
	    'OBJECT_FILE''EXTRA_OBJ', -
 | 
			
		||||
            'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
 | 
			
		||||
            'TCPIP_LIB','OPT_FILE'/OPTION
 | 
			
		||||
$!
 | 
			
		||||
$!  Else...
 | 
			
		||||
$!
 | 
			
		||||
$   ELSE
 | 
			
		||||
$!
 | 
			
		||||
$!    Don't Link With The RSAREF Routines And Link With A TCP/IP Library.
 | 
			
		||||
$!
 | 
			
		||||
$       LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
 | 
			
		||||
	    'OBJECT_FILE''EXTRA_OBJ', -
 | 
			
		||||
            'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
 | 
			
		||||
            'OPT_FILE'/OPTION
 | 
			
		||||
$!
 | 
			
		||||
$!  End The TCP/IP Library Check.
 | 
			
		||||
$!
 | 
			
		||||
$   ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$! End The RSAREF Link Check.
 | 
			
		||||
$!
 | 
			
		||||
$ ENDIF
 | 
			
		||||
$!
 | 
			
		||||
@@ -451,6 +525,32 @@ $! End The Crypto Library Check.
 | 
			
		||||
$!
 | 
			
		||||
$ ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$! See If We Need The RSAREF Library.
 | 
			
		||||
$!
 | 
			
		||||
$ IF (RSAREF.EQS."TRUE")
 | 
			
		||||
$ THEN
 | 
			
		||||
$!
 | 
			
		||||
$!  Look For The Library LIBRSAGLUE.OLB.
 | 
			
		||||
$!
 | 
			
		||||
$   IF (F$SEARCH(RSAREF_LIB).EQS."")
 | 
			
		||||
$   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    Tell The User We Can't Find The LIBRSAGLUE.OLB Library.
 | 
			
		||||
$!
 | 
			
		||||
$     WRITE SYS$OUTPUT ""
 | 
			
		||||
$     WRITE SYS$OUTPUT "Can't Find The Library ",RSAREF_LIB,"."
 | 
			
		||||
$     WRITE SYS$OUTPUT "We Can't Link Without It."
 | 
			
		||||
$     WRITE SYS$OUTPUT ""
 | 
			
		||||
$!
 | 
			
		||||
$!    Since We Can't Link Without It, Exit.
 | 
			
		||||
$!
 | 
			
		||||
$     EXIT
 | 
			
		||||
$   ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$! End The RSAREF Library Check.
 | 
			
		||||
$!
 | 
			
		||||
$ ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$! Look For The Library LIBSSL.OLB.
 | 
			
		||||
$!
 | 
			
		||||
$ IF (F$SEARCH(SSL_LIB).EQS."")
 | 
			
		||||
@@ -481,10 +581,86 @@ $ CHECK_OPTIONS:
 | 
			
		||||
$!
 | 
			
		||||
$! Check To See If P1 Is Blank.
 | 
			
		||||
$!
 | 
			
		||||
$ IF (P1.EQS."NODEBUG")
 | 
			
		||||
$ IF (P1.EQS."NORSAREF")
 | 
			
		||||
$ THEN
 | 
			
		||||
$!
 | 
			
		||||
$!   P1 Is NODEBUG, So Compile Without Debugger Information.
 | 
			
		||||
$!   P1 Is NORSAREF, So Compile With The Regular RSA Libraries.
 | 
			
		||||
$!
 | 
			
		||||
$    RSAREF = "FALSE"
 | 
			
		||||
$!
 | 
			
		||||
$! Else...
 | 
			
		||||
$!
 | 
			
		||||
$ ELSE
 | 
			
		||||
$!
 | 
			
		||||
$!  Check To See If We Are To Use The RSAREF Library.
 | 
			
		||||
$!
 | 
			
		||||
$   IF (P1.EQS."RSAREF")
 | 
			
		||||
$   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    Check To Make Sure We Have The RSAREF Source Code Directory.
 | 
			
		||||
$!
 | 
			
		||||
$     IF (F$SEARCH("SYS$DISK:[-.RSAREF]SOURCE.DIR").EQS."")
 | 
			
		||||
$     THEN
 | 
			
		||||
$!
 | 
			
		||||
$!      We Don't Have The RSAREF Souce Code Directory, So Tell The
 | 
			
		||||
$!      User This.
 | 
			
		||||
$!
 | 
			
		||||
$       WRITE SYS$OUTPUT ""
 | 
			
		||||
$       WRITE SYS$OUTPUT "It appears that you don't have the RSAREF Souce Code."
 | 
			
		||||
$       WRITE SYS$OUTPUT "You need to go to 'ftp://ftp.rsa.com/rsaref'.  You have to"
 | 
			
		||||
$       WRITE SYS$OUTPUT "get the '.tar-Z' file as the '.zip' file dosen't have the"
 | 
			
		||||
$       WRITE SYS$OUTPUT "directory structure stored.  You have to extract the file"
 | 
			
		||||
$       WRITE SYS$OUTPUT "into the [.RSAREF] directory under the root directory"
 | 
			
		||||
$       WRITE SYS$OUTPUT "as that is where the scripts will look for the files."
 | 
			
		||||
$       WRITE SYS$OUTPUT ""
 | 
			
		||||
$!
 | 
			
		||||
$!      Time To Exit.
 | 
			
		||||
$!
 | 
			
		||||
$       EXIT
 | 
			
		||||
$!
 | 
			
		||||
$!    Else...
 | 
			
		||||
$!
 | 
			
		||||
$     ELSE
 | 
			
		||||
$!
 | 
			
		||||
$!      Compile Using The RSAREF Library.
 | 
			
		||||
$!
 | 
			
		||||
$       RSAREF = "TRUE"
 | 
			
		||||
$!
 | 
			
		||||
$!    End The RSAREF Soure Directory Check.
 | 
			
		||||
$!
 | 
			
		||||
$     ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$!  Else...
 | 
			
		||||
$!
 | 
			
		||||
$   ELSE 
 | 
			
		||||
$!
 | 
			
		||||
$!    They Entered An Invalid Option..
 | 
			
		||||
$!
 | 
			
		||||
$     WRITE SYS$OUTPUT ""
 | 
			
		||||
$     WRITE SYS$OUTPUT "The Option ",P1," Is Invalid.  The Valid Options Are:"
 | 
			
		||||
$     WRITE SYS$OUTPUT ""
 | 
			
		||||
$     WRITE SYS$OUTPUT "     RSAREF   :  Compile With The RSAREF Library."
 | 
			
		||||
$     WRITE SYS$OUTPUT "     NORSAREF :  Compile With The Regular RSA Library."
 | 
			
		||||
$     WRITE SYS$OUTPUT ""
 | 
			
		||||
$!
 | 
			
		||||
$!    Time To EXIT.
 | 
			
		||||
$!
 | 
			
		||||
$     EXIT
 | 
			
		||||
$!
 | 
			
		||||
$!  End The Valid Arguement Check.
 | 
			
		||||
$!
 | 
			
		||||
$   ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$! End P1 Check.
 | 
			
		||||
$!
 | 
			
		||||
$ ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$! Check To See If P2 Is Blank.
 | 
			
		||||
$!
 | 
			
		||||
$ IF (P2.EQS."NODEBUG")
 | 
			
		||||
$ THEN
 | 
			
		||||
$!
 | 
			
		||||
$!   P2 Is NODEBUG, So Compile Without Debugger Information.
 | 
			
		||||
$!
 | 
			
		||||
$    DEBUGGER  = "NODEBUG"
 | 
			
		||||
$    TRACEBACK = "NOTRACEBACK" 
 | 
			
		||||
@@ -499,7 +675,7 @@ $ ELSE
 | 
			
		||||
$!
 | 
			
		||||
$!  Check To See If We Are To Compile With Debugger Information.
 | 
			
		||||
$!
 | 
			
		||||
$   IF (P1.EQS."DEBUG")
 | 
			
		||||
$   IF (P2.EQS."DEBUG")
 | 
			
		||||
$   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    Compile With Debugger Information.
 | 
			
		||||
@@ -515,7 +691,7 @@ $!
 | 
			
		||||
$!    Tell The User Entered An Invalid Option..
 | 
			
		||||
$!
 | 
			
		||||
$     WRITE SYS$OUTPUT ""
 | 
			
		||||
$     WRITE SYS$OUTPUT "The Option ",P1," Is Invalid.  The Valid Options Are:"
 | 
			
		||||
$     WRITE SYS$OUTPUT "The Option ",P2," Is Invalid.  The Valid Options Are:"
 | 
			
		||||
$     WRITE SYS$OUTPUT ""
 | 
			
		||||
$     WRITE SYS$OUTPUT "    DEBUG    :  Compile With The Debugger Information."
 | 
			
		||||
$     WRITE SYS$OUTPUT "    NODEBUG  :  Compile Without The Debugger Information."
 | 
			
		||||
@@ -529,13 +705,13 @@ $!  End The Valid Arguement Check.
 | 
			
		||||
$!
 | 
			
		||||
$   ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$! End The P1 Check.
 | 
			
		||||
$! End The P2 Check.
 | 
			
		||||
$!
 | 
			
		||||
$ ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$! Check To See If P2 Is Blank.
 | 
			
		||||
$! Check To See If P3 Is Blank.
 | 
			
		||||
$!
 | 
			
		||||
$ IF (P2.EQS."")
 | 
			
		||||
$ IF (P3.EQS."")
 | 
			
		||||
$ THEN
 | 
			
		||||
$!
 | 
			
		||||
$!  O.K., The User Didn't Specify A Compiler, Let's Try To
 | 
			
		||||
@@ -548,7 +724,7 @@ $   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    Looks Like GNUC, Set To Use GNUC.
 | 
			
		||||
$!
 | 
			
		||||
$     P2 = "GNUC"
 | 
			
		||||
$     P3 = "GNUC"
 | 
			
		||||
$!
 | 
			
		||||
$!  Else...
 | 
			
		||||
$!
 | 
			
		||||
@@ -561,7 +737,7 @@ $     THEN
 | 
			
		||||
$!
 | 
			
		||||
$!      Looks Like DECC, Set To Use DECC.
 | 
			
		||||
$!
 | 
			
		||||
$       P2 = "DECC"
 | 
			
		||||
$       P3 = "DECC"
 | 
			
		||||
$!
 | 
			
		||||
$!    Else...
 | 
			
		||||
$!
 | 
			
		||||
@@ -569,7 +745,7 @@ $     ELSE
 | 
			
		||||
$!
 | 
			
		||||
$!      Looks Like VAXC, Set To Use VAXC.
 | 
			
		||||
$!
 | 
			
		||||
$       P2 = "VAXC"
 | 
			
		||||
$       P3 = "VAXC"
 | 
			
		||||
$!
 | 
			
		||||
$!    End The VAXC Compiler Check.
 | 
			
		||||
$!
 | 
			
		||||
@@ -583,9 +759,9 @@ $!  End The Compiler Check.
 | 
			
		||||
$!
 | 
			
		||||
$ ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$! Check To See If We Have A Option For P3.
 | 
			
		||||
$! Check To See If We Have A Option For P4.
 | 
			
		||||
$!
 | 
			
		||||
$ IF (P3.EQS."")
 | 
			
		||||
$ IF (P4.EQS."")
 | 
			
		||||
$ THEN
 | 
			
		||||
$!
 | 
			
		||||
$!  Find out what socket library we have available
 | 
			
		||||
@@ -595,7 +771,7 @@ $   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    We have SOCKETSHR, and it is my opinion that it's the best to use.
 | 
			
		||||
$!
 | 
			
		||||
$     P3 = "SOCKETSHR"
 | 
			
		||||
$     P4 = "SOCKETSHR"
 | 
			
		||||
$!
 | 
			
		||||
$!    Tell the user
 | 
			
		||||
$!
 | 
			
		||||
@@ -615,7 +791,7 @@ $     THEN
 | 
			
		||||
$!
 | 
			
		||||
$!	Last resort: a UCX or UCX-compatible library
 | 
			
		||||
$!
 | 
			
		||||
$	P3 = "UCX"
 | 
			
		||||
$	P4 = "UCX"
 | 
			
		||||
$!
 | 
			
		||||
$!      Tell the user
 | 
			
		||||
$!
 | 
			
		||||
@@ -629,22 +805,46 @@ $ ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$! Set Up Initial CC Definitions, Possibly With User Ones
 | 
			
		||||
$!
 | 
			
		||||
$ CCDEFS = "MONOLITH"
 | 
			
		||||
$ CCDEFS = "VMS=1,MONOLITH"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_ASM") THEN CCDEFS = CCDEFS + ",NO_ASM"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_RSA") THEN CCDEFS = CCDEFS + ",NO_RSA"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_DSA") THEN CCDEFS = CCDEFS + ",NO_DSA"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_DH") THEN CCDEFS = CCDEFS + ",NO_DH"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_MD2") THEN CCDEFS = CCDEFS + ",NO_MD2"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_MD5") THEN CCDEFS = CCDEFS + ",NO_MD5"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_RIPEMD") THEN CCDEFS = CCDEFS + ",NO_RIPEMD"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_SHA") THEN CCDEFS = CCDEFS + ",NO_SHA"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_SHA0") THEN CCDEFS = CCDEFS + ",NO_SHA0"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_SHA1") THEN CCDEFS = CCDEFS + ",NO_SHA1"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_DES")
 | 
			
		||||
$ THEN
 | 
			
		||||
$   CCDEFS = CCDEFS + ",NO_DES,NO_MDC2"
 | 
			
		||||
$ ELSE
 | 
			
		||||
$   IF F$TRNLNM("OPENSSL_NO_MDC2") THEN CCDEFS = CCDEFS + ",NO_MDC2"
 | 
			
		||||
$ ENDIF
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_RC2") THEN CCDEFS = CCDEFS + ",NO_RC2"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_RC4") THEN CCDEFS = CCDEFS + ",NO_RC4"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_RC5") THEN CCDEFS = CCDEFS + ",NO_RC5"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_IDEA") THEN CCDEFS = CCDEFS + ",NO_IDEA"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_BF") THEN CCDEFS = CCDEFS + ",NO_BF"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_CAST") THEN CCDEFS = CCDEFS + ",NO_CAST"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_HMAC") THEN CCDEFS = CCDEFS + ",NO_HMAC"
 | 
			
		||||
$ IF F$TRNLNM("OPENSSL_NO_SSL2") THEN CCDEFS = CCDEFS + ",NO_SSL2"
 | 
			
		||||
$ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS
 | 
			
		||||
$ CCEXTRAFLAGS = ""
 | 
			
		||||
$ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS
 | 
			
		||||
$ CCDISABLEWARNINGS = "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"
 | 
			
		||||
$ CCDISABLEWARNINGS = "LONGLONGTYPE,LONGLONGSUFX"
 | 
			
		||||
$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -
 | 
			
		||||
	CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS
 | 
			
		||||
$!
 | 
			
		||||
$!  Check To See If The User Entered A Valid Paramter.
 | 
			
		||||
$!
 | 
			
		||||
$ IF (P2.EQS."VAXC").OR.(P2.EQS."DECC").OR.(P2.EQS."GNUC")
 | 
			
		||||
$ IF (P3.EQS."VAXC").OR.(P3.EQS."DECC").OR.(P3.EQS."GNUC")
 | 
			
		||||
$ THEN
 | 
			
		||||
$!
 | 
			
		||||
$!  Check To See If The User Wanted DECC.
 | 
			
		||||
$!
 | 
			
		||||
$   IF (P2.EQS."DECC")
 | 
			
		||||
$   IF (P3.EQS."DECC")
 | 
			
		||||
$   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    Looks Like DECC, Set To Use DECC.
 | 
			
		||||
@@ -661,8 +861,7 @@ $     CC = "CC"
 | 
			
		||||
$     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -
 | 
			
		||||
	 THEN CC = "CC/DECC"
 | 
			
		||||
$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -
 | 
			
		||||
           "/NOLIST/PREFIX=ALL" + -
 | 
			
		||||
	   "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
 | 
			
		||||
           "/NOLIST/PREFIX=ALL" + CCEXTRAFLAGS
 | 
			
		||||
$!
 | 
			
		||||
$!    Define The Linker Options File Name.
 | 
			
		||||
$!
 | 
			
		||||
@@ -674,7 +873,7 @@ $   ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$!  Check To See If We Are To Use VAXC.
 | 
			
		||||
$!
 | 
			
		||||
$   IF (P2.EQS."VAXC")
 | 
			
		||||
$   IF (P3.EQS."VAXC")
 | 
			
		||||
$   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    Looks Like VAXC, Set To Use VAXC.
 | 
			
		||||
@@ -693,8 +892,7 @@ $	WRITE SYS$OUTPUT "There is no VAX C on Alpha!"
 | 
			
		||||
$	EXIT
 | 
			
		||||
$     ENDIF
 | 
			
		||||
$     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"
 | 
			
		||||
$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
 | 
			
		||||
	   "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
 | 
			
		||||
$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + CCEXTRAFLAGS
 | 
			
		||||
$     CCDEFS = CCDEFS + ",""VAXC"""
 | 
			
		||||
$!
 | 
			
		||||
$!    Define <sys> As SYS$COMMON:[SYSLIB]
 | 
			
		||||
@@ -711,7 +909,7 @@ $   ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$!  Check To See If We Are To Use GNU C.
 | 
			
		||||
$!
 | 
			
		||||
$   IF (P2.EQS."GNUC")
 | 
			
		||||
$   IF (P3.EQS."GNUC")
 | 
			
		||||
$   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    Looks Like GNUC, Set To Use GNUC.
 | 
			
		||||
@@ -725,8 +923,7 @@ $!
 | 
			
		||||
$!    Use GNU C...
 | 
			
		||||
$!
 | 
			
		||||
$     IF F$TYPE(GCC) .EQS. "" THEN GCC := GCC
 | 
			
		||||
$     CC = GCC+"/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
 | 
			
		||||
	   "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
 | 
			
		||||
$     CC = GCC+"/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + CCEXTRAFLAGS
 | 
			
		||||
$!
 | 
			
		||||
$!    Define The Linker Options File Name.
 | 
			
		||||
$!
 | 
			
		||||
@@ -740,6 +937,31 @@ $!  Set up default defines
 | 
			
		||||
$!
 | 
			
		||||
$   CCDEFS = """FLAT_INC=1""," + CCDEFS
 | 
			
		||||
$!
 | 
			
		||||
$!  Check To See If We Are To Compile With RSAREF Routines.
 | 
			
		||||
$!
 | 
			
		||||
$   IF (RSAREF.EQS."TRUE")
 | 
			
		||||
$   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    Compile With RSAREF.
 | 
			
		||||
$!
 | 
			
		||||
$     CCDEFS = CCDEFS + ",""RSAref=1"""
 | 
			
		||||
$!
 | 
			
		||||
$!    Tell The User This.
 | 
			
		||||
$!
 | 
			
		||||
$     WRITE SYS$OUTPUT "Compiling With RSAREF Routines."
 | 
			
		||||
$!
 | 
			
		||||
$!    Else, We Don't Care.  Compile Without The RSAREF Library.
 | 
			
		||||
$!
 | 
			
		||||
$   ELSE
 | 
			
		||||
$!
 | 
			
		||||
$!    Tell The User We Are Compile Without The RSAREF Routines.
 | 
			
		||||
$!
 | 
			
		||||
$     WRITE SYS$OUTPUT "Compiling Without The RSAREF Routines.
 | 
			
		||||
$!
 | 
			
		||||
$!  End The RSAREF Check.
 | 
			
		||||
$!
 | 
			
		||||
$   ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$!  Else The User Entered An Invalid Arguement.
 | 
			
		||||
$!
 | 
			
		||||
$ ELSE
 | 
			
		||||
@@ -747,7 +969,7 @@ $!
 | 
			
		||||
$!  Tell The User We Don't Know What They Want.
 | 
			
		||||
$!
 | 
			
		||||
$   WRITE SYS$OUTPUT ""
 | 
			
		||||
$   WRITE SYS$OUTPUT "The Option ",P2," Is Invalid.  The Valid Options Are:"
 | 
			
		||||
$   WRITE SYS$OUTPUT "The Option ",P3," Is Invalid.  The Valid Options Are:"
 | 
			
		||||
$   WRITE SYS$OUTPUT ""
 | 
			
		||||
$   WRITE SYS$OUTPUT "    VAXC  :  To Compile With VAX C."
 | 
			
		||||
$   WRITE SYS$OUTPUT "    DECC  :  To Compile With DEC C."
 | 
			
		||||
@@ -761,18 +983,17 @@ $ ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$! Time to check the contents, and to make sure we get the correct library.
 | 
			
		||||
$!
 | 
			
		||||
$ IF P3.EQS."SOCKETSHR" .OR. P3.EQS."MULTINET" .OR. P3.EQS."UCX" -
 | 
			
		||||
     .OR. P3.EQS."TCPIP" .OR. P3.EQS."NONE"
 | 
			
		||||
$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX"
 | 
			
		||||
$ THEN
 | 
			
		||||
$!
 | 
			
		||||
$!  Check to see if SOCKETSHR was chosen
 | 
			
		||||
$!
 | 
			
		||||
$   IF P3.EQS."SOCKETSHR"
 | 
			
		||||
$   IF P4.EQS."SOCKETSHR"
 | 
			
		||||
$   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    Set the library to use SOCKETSHR
 | 
			
		||||
$!
 | 
			
		||||
$     TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
 | 
			
		||||
$     TCPIP_LIB = "[-.VMS]SOCKETSHR_SHR.OPT/OPT"
 | 
			
		||||
$!
 | 
			
		||||
$!    Done with SOCKETSHR
 | 
			
		||||
$!
 | 
			
		||||
@@ -780,12 +1001,12 @@ $   ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$!  Check to see if MULTINET was chosen
 | 
			
		||||
$!
 | 
			
		||||
$   IF P3.EQS."MULTINET"
 | 
			
		||||
$   IF P4.EQS."MULTINET"
 | 
			
		||||
$   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    Set the library to use UCX emulation.
 | 
			
		||||
$!
 | 
			
		||||
$     P3 = "UCX"
 | 
			
		||||
$     P4 = "UCX"
 | 
			
		||||
$!
 | 
			
		||||
$!    Done with MULTINET
 | 
			
		||||
$!
 | 
			
		||||
@@ -793,53 +1014,27 @@ $   ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$!  Check to see if UCX was chosen
 | 
			
		||||
$!
 | 
			
		||||
$   IF P3.EQS."UCX"
 | 
			
		||||
$   IF P4.EQS."UCX"
 | 
			
		||||
$   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    Set the library to use UCX.
 | 
			
		||||
$!
 | 
			
		||||
$     TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"
 | 
			
		||||
$     TCPIP_LIB = "[-.VMS]UCX_SHR_DECC.OPT/OPT"
 | 
			
		||||
$     IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
 | 
			
		||||
$     THEN
 | 
			
		||||
$       TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
 | 
			
		||||
$       TCPIP_LIB = "[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
 | 
			
		||||
$     ELSE
 | 
			
		||||
$       IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
 | 
			
		||||
	  TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
 | 
			
		||||
	  TCPIP_LIB = "[-.VMS]UCX_SHR_VAXC.OPT/OPT"
 | 
			
		||||
$     ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$!    Done with UCX
 | 
			
		||||
$!
 | 
			
		||||
$   ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$!  Check to see if TCPIP (post UCX) was chosen
 | 
			
		||||
$!
 | 
			
		||||
$   IF P3.EQS."TCPIP"
 | 
			
		||||
$   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    Set the library to use TCPIP.
 | 
			
		||||
$!
 | 
			
		||||
$     TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
 | 
			
		||||
$!
 | 
			
		||||
$!    Done with TCPIP
 | 
			
		||||
$!
 | 
			
		||||
$   ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$!  Check to see if NONE was chosen
 | 
			
		||||
$!
 | 
			
		||||
$   IF P3.EQS."NONE"
 | 
			
		||||
$   THEN
 | 
			
		||||
$!
 | 
			
		||||
$!    Do not use TCPIP.
 | 
			
		||||
$!
 | 
			
		||||
$     TCPIP_LIB = ""
 | 
			
		||||
$!
 | 
			
		||||
$!    Done with TCPIP
 | 
			
		||||
$!
 | 
			
		||||
$   ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$!  Add TCP/IP type to CC definitions.
 | 
			
		||||
$!
 | 
			
		||||
$   CCDEFS = CCDEFS + ",TCPIP_TYPE_''P3'"
 | 
			
		||||
$   CCDEFS = CCDEFS + ",TCPIP_TYPE_''P4'"
 | 
			
		||||
$!
 | 
			
		||||
$!  Print info
 | 
			
		||||
$!
 | 
			
		||||
@@ -852,11 +1047,10 @@ $!
 | 
			
		||||
$!  Tell The User We Don't Know What They Want.
 | 
			
		||||
$!
 | 
			
		||||
$   WRITE SYS$OUTPUT ""
 | 
			
		||||
$   WRITE SYS$OUTPUT "The Option ",P3," Is Invalid.  The Valid Options Are:"
 | 
			
		||||
$   WRITE SYS$OUTPUT "The Option ",P4," Is Invalid.  The Valid Options Are:"
 | 
			
		||||
$   WRITE SYS$OUTPUT ""
 | 
			
		||||
$   WRITE SYS$OUTPUT "    SOCKETSHR  :  To link with SOCKETSHR TCP/IP library."
 | 
			
		||||
$   WRITE SYS$OUTPUT "    UCX        :  To link with UCX TCP/IP library."
 | 
			
		||||
$   WRITE SYS$OUTPUT "    TCPIP      :  To link with TCPIP (post UCX) TCP/IP library."
 | 
			
		||||
$   WRITE SYS$OUTPUT ""
 | 
			
		||||
$!
 | 
			
		||||
$!  Time To EXIT.
 | 
			
		||||
@@ -883,7 +1077,7 @@ $ CC = CC + "/DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
 | 
			
		||||
$!
 | 
			
		||||
$! Show user the result
 | 
			
		||||
$!
 | 
			
		||||
$ WRITE/SYMBOL SYS$OUTPUT "Main Compiling Command: ",CC
 | 
			
		||||
$ WRITE SYS$OUTPUT "Main Compiling Command: ",CC
 | 
			
		||||
$!
 | 
			
		||||
$! Special Threads For OpenVMS v7.1 Or Later
 | 
			
		||||
$!
 | 
			
		||||
@@ -891,9 +1085,9 @@ $! Written By:  Richard Levitte
 | 
			
		||||
$!              richard@levitte.org
 | 
			
		||||
$!
 | 
			
		||||
$!
 | 
			
		||||
$! Check To See If We Have A Option For P4.
 | 
			
		||||
$! Check To See If We Have A Option For P5.
 | 
			
		||||
$!
 | 
			
		||||
$ IF (P4.EQS."")
 | 
			
		||||
$ IF (P5.EQS."")
 | 
			
		||||
$ THEN
 | 
			
		||||
$!
 | 
			
		||||
$!  Get The Version Of VMS We Are Using.
 | 
			
		||||
@@ -915,15 +1109,15 @@ $!  End The VMS Version Check.
 | 
			
		||||
$!
 | 
			
		||||
$   ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$! End The P4 Check.
 | 
			
		||||
$! End The P5 Check.
 | 
			
		||||
$!
 | 
			
		||||
$ ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$! Check if the user wanted to compile just a subset of all the programs.
 | 
			
		||||
$!
 | 
			
		||||
$ IF P5 .NES. ""
 | 
			
		||||
$ IF P6 .NES. ""
 | 
			
		||||
$ THEN
 | 
			
		||||
$   PROGRAMS = P5
 | 
			
		||||
$   PROGRAMS = P6
 | 
			
		||||
$ ENDIF
 | 
			
		||||
$!
 | 
			
		||||
$!  Time To RETURN...
 | 
			
		||||
@@ -939,7 +1133,6 @@ $!
 | 
			
		||||
$! Save directory information
 | 
			
		||||
$!
 | 
			
		||||
$ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"
 | 
			
		||||
$ __HERE = F$EDIT(__HERE,"UPCASE")
 | 
			
		||||
$ __TOP = __HERE - "APPS]"
 | 
			
		||||
$ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
 | 
			
		||||
$!
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										21
									
								
								apps/nseq.c
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								apps/nseq.c
									
									
									
									
									
								
							@@ -58,9 +58,9 @@
 | 
			
		||||
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include "apps.h"
 | 
			
		||||
#include <openssl/pem.h>
 | 
			
		||||
#include <openssl/err.h>
 | 
			
		||||
#include "apps.h"
 | 
			
		||||
 | 
			
		||||
#undef PROG
 | 
			
		||||
#define PROG nseq_main
 | 
			
		||||
@@ -102,7 +102,7 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		BIO_printf (bio_err, "-in file  input file\n");
 | 
			
		||||
		BIO_printf (bio_err, "-out file output file\n");
 | 
			
		||||
		BIO_printf (bio_err, "-toseq    output NS Sequence file\n");
 | 
			
		||||
		OPENSSL_EXIT(1);
 | 
			
		||||
		EXIT(1);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (infile) {
 | 
			
		||||
@@ -119,18 +119,11 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
				 "Can't open output file %s\n", outfile);
 | 
			
		||||
			goto end;
 | 
			
		||||
		}
 | 
			
		||||
	} else {
 | 
			
		||||
		out = BIO_new_fp(stdout, BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
	}
 | 
			
		||||
	} else out = BIO_new_fp(stdout, BIO_NOCLOSE);
 | 
			
		||||
 | 
			
		||||
	if (toseq) {
 | 
			
		||||
		seq = NETSCAPE_CERT_SEQUENCE_new();
 | 
			
		||||
		seq->certs = sk_X509_new_null();
 | 
			
		||||
		seq->certs = sk_X509_new(NULL);
 | 
			
		||||
		while((x509 = PEM_read_bio_X509(in, NULL, NULL, NULL))) 
 | 
			
		||||
		    sk_X509_push(seq->certs,x509);
 | 
			
		||||
 | 
			
		||||
@@ -159,9 +152,9 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	ret = 0;
 | 
			
		||||
end:
 | 
			
		||||
	BIO_free(in);
 | 
			
		||||
	BIO_free_all(out);
 | 
			
		||||
	BIO_free(out);
 | 
			
		||||
	NETSCAPE_CERT_SEQUENCE_free(seq);
 | 
			
		||||
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1234
									
								
								apps/ocsp.c
									
									
									
									
									
								
							
							
						
						
									
										1234
									
								
								apps/ocsp.c
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -3,13 +3,9 @@
 | 
			
		||||
# This is mostly being used for generation of certificate requests.
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
# This definition stops the following lines choking if HOME isn't
 | 
			
		||||
# defined.
 | 
			
		||||
HOME			= .
 | 
			
		||||
RANDFILE		= $ENV::HOME/.rnd
 | 
			
		||||
 | 
			
		||||
# Uncomment out to enable OpenSSL configuration see config(3)
 | 
			
		||||
# openssl_conf = openssl_init
 | 
			
		||||
oid_file		= $ENV::HOME/.oid
 | 
			
		||||
oid_section		= new_oids
 | 
			
		||||
 | 
			
		||||
# To use this configuration file with the "-extfile" option of the
 | 
			
		||||
# "openssl x509" utility, name here the section containing the
 | 
			
		||||
@@ -18,22 +14,13 @@ RANDFILE		= $ENV::HOME/.rnd
 | 
			
		||||
# (Alternatively, use a configuration file that has only
 | 
			
		||||
# X.509v3 extensions in its main [= default] section.)
 | 
			
		||||
 | 
			
		||||
[openssl_init]
 | 
			
		||||
# Extra OBJECT IDENTIFIER info:
 | 
			
		||||
oid_section = new_oids
 | 
			
		||||
alg_section = algs
 | 
			
		||||
 | 
			
		||||
[ new_oids ]
 | 
			
		||||
 | 
			
		||||
# We can add new OIDs in here for use by any config aware application
 | 
			
		||||
# We can add new OIDs in here for use by 'ca' and 'req'.
 | 
			
		||||
# Add a simple OID like this:
 | 
			
		||||
# shortname=Long Object Identifier Name, 1.2.3.4
 | 
			
		||||
# testoid1=1.2.3.4
 | 
			
		||||
# Or use config file substitution like this:
 | 
			
		||||
# testoid2=OID2 LONG NAME, ${testoid1}.5.6, OTHER OID
 | 
			
		||||
 | 
			
		||||
[ algs ]
 | 
			
		||||
# Algorithm configuration options. Currently just fips_mode
 | 
			
		||||
fips_mode = no
 | 
			
		||||
# testoid2=${testoid1}.5.6
 | 
			
		||||
 | 
			
		||||
####################################################################
 | 
			
		||||
[ ca ]
 | 
			
		||||
@@ -42,40 +29,27 @@ default_ca	= CA_default		# The default ca section
 | 
			
		||||
####################################################################
 | 
			
		||||
[ CA_default ]
 | 
			
		||||
 | 
			
		||||
dir		= sys\$disk:[.demoCA		# Where everything is kept
 | 
			
		||||
dir		= sys\$disk:[.demoCA	# Where everything is kept
 | 
			
		||||
certs		= $dir.certs]		# Where the issued certs are kept
 | 
			
		||||
crl_dir		= $dir.crl]		# Where the issued crl are kept
 | 
			
		||||
database	= $dir]index.txt	# database index file.
 | 
			
		||||
#unique_subject	= no			# Set to 'no' to allow creation of
 | 
			
		||||
					# several ctificates with same subject.
 | 
			
		||||
new_certs_dir	= $dir.newcerts]		# default place for new certs.
 | 
			
		||||
new_certs_dir	= $dir.newcerts]	# default place for new certs.
 | 
			
		||||
 | 
			
		||||
certificate	= $dir]cacert.pem 	# The CA certificate
 | 
			
		||||
serial		= $dir]serial. 		# The current serial number
 | 
			
		||||
crlnumber	= $dir]crlnumber.	# the current crl number
 | 
			
		||||
					# must be commented out to leave a V1 CRL
 | 
			
		||||
serial		= $dir]serial.		# The current serial number
 | 
			
		||||
crl		= $dir]crl.pem 		# The current CRL
 | 
			
		||||
private_key	= $dir.private]cakey.pem# The private key
 | 
			
		||||
RANDFILE	= $dir.private].rand	# private random number file
 | 
			
		||||
 | 
			
		||||
x509_extensions	= usr_cert		# The extentions to add to the cert
 | 
			
		||||
 | 
			
		||||
# Comment out the following two lines for the "traditional"
 | 
			
		||||
# (and highly broken) format.
 | 
			
		||||
name_opt 	= ca_default		# Subject Name options
 | 
			
		||||
cert_opt 	= ca_default		# Certificate field options
 | 
			
		||||
 | 
			
		||||
# Extension copying option: use with caution.
 | 
			
		||||
# copy_extensions = copy
 | 
			
		||||
 | 
			
		||||
# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
 | 
			
		||||
# so this is commented out by default to leave a V1 CRL.
 | 
			
		||||
# crlnumber must also be commented out to leave a V1 CRL.
 | 
			
		||||
# crl_extensions	= crl_ext
 | 
			
		||||
 | 
			
		||||
default_days	= 365			# how long to certify for
 | 
			
		||||
default_crl_days= 30			# how long before next CRL
 | 
			
		||||
default_md	= sha1			# which md to use.
 | 
			
		||||
default_md	= md5			# which md to use.
 | 
			
		||||
preserve	= no			# keep passed DN ordering
 | 
			
		||||
 | 
			
		||||
# A few difference way of specifying how similar the request should look
 | 
			
		||||
@@ -112,19 +86,16 @@ distinguished_name	= req_distinguished_name
 | 
			
		||||
attributes		= req_attributes
 | 
			
		||||
x509_extensions	= v3_ca	# The extentions to add to the self signed cert
 | 
			
		||||
 | 
			
		||||
# Passwords for private keys if not present they will be prompted for
 | 
			
		||||
# input_password = secret
 | 
			
		||||
# output_password = secret
 | 
			
		||||
 | 
			
		||||
# This sets a mask for permitted string types. There are several options. 
 | 
			
		||||
# This sets the permitted types in a DirectoryString. There are several
 | 
			
		||||
# options. 
 | 
			
		||||
# default: PrintableString, T61String, BMPString.
 | 
			
		||||
# pkix	 : PrintableString, BMPString.
 | 
			
		||||
# utf8only: only UTF8Strings.
 | 
			
		||||
# nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings).
 | 
			
		||||
# nobmp : PrintableString, T61String (no BMPStrings).
 | 
			
		||||
# MASK:XXXX a literal mask value.
 | 
			
		||||
# WARNING: current versions of Netscape crash on BMPStrings or UTF8Strings
 | 
			
		||||
# so use this option with caution!
 | 
			
		||||
string_mask = nombstr
 | 
			
		||||
dirstring_type = nobmp
 | 
			
		||||
 | 
			
		||||
# req_extensions = v3_req # The extensions to add to a certificate request
 | 
			
		||||
 | 
			
		||||
@@ -153,7 +124,7 @@ commonName			= Common Name (eg, YOUR name)
 | 
			
		||||
commonName_max			= 64
 | 
			
		||||
 | 
			
		||||
emailAddress			= Email Address
 | 
			
		||||
emailAddress_max		= 64
 | 
			
		||||
emailAddress_max		= 40
 | 
			
		||||
 | 
			
		||||
# SET-ex3			= SET extension number 3
 | 
			
		||||
 | 
			
		||||
@@ -196,14 +167,11 @@ nsComment			= "OpenSSL Generated Certificate"
 | 
			
		||||
 | 
			
		||||
# PKIX recommendations harmless if included in all certificates.
 | 
			
		||||
subjectKeyIdentifier=hash
 | 
			
		||||
authorityKeyIdentifier=keyid,issuer
 | 
			
		||||
authorityKeyIdentifier=keyid,issuer:always
 | 
			
		||||
 | 
			
		||||
# This stuff is for subjectAltName and issuerAltname.
 | 
			
		||||
# Import the email address.
 | 
			
		||||
# subjectAltName=email:copy
 | 
			
		||||
# An alternative to produce certificates that aren't
 | 
			
		||||
# deprecated according to PKIX.
 | 
			
		||||
# subjectAltName=email:move
 | 
			
		||||
 | 
			
		||||
# Copy subject details
 | 
			
		||||
# issuerAltName=issuer:copy
 | 
			
		||||
@@ -266,56 +234,3 @@ basicConstraints = CA:true
 | 
			
		||||
 | 
			
		||||
# issuerAltName=issuer:copy
 | 
			
		||||
authorityKeyIdentifier=keyid:always,issuer:always
 | 
			
		||||
 | 
			
		||||
[ proxy_cert_ext ]
 | 
			
		||||
# These extensions should be added when creating a proxy certificate
 | 
			
		||||
 | 
			
		||||
# This goes against PKIX guidelines but some CAs do it and some software
 | 
			
		||||
# requires this to avoid interpreting an end user certificate as a CA.
 | 
			
		||||
 | 
			
		||||
basicConstraints=CA:FALSE
 | 
			
		||||
 | 
			
		||||
# Here are some examples of the usage of nsCertType. If it is omitted
 | 
			
		||||
# the certificate can be used for anything *except* object signing.
 | 
			
		||||
 | 
			
		||||
# This is OK for an SSL server.
 | 
			
		||||
# nsCertType			= server
 | 
			
		||||
 | 
			
		||||
# For an object signing certificate this would be used.
 | 
			
		||||
# nsCertType = objsign
 | 
			
		||||
 | 
			
		||||
# For normal client use this is typical
 | 
			
		||||
# nsCertType = client, email
 | 
			
		||||
 | 
			
		||||
# and for everything including object signing:
 | 
			
		||||
# nsCertType = client, email, objsign
 | 
			
		||||
 | 
			
		||||
# This is typical in keyUsage for a client certificate.
 | 
			
		||||
# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
 | 
			
		||||
 | 
			
		||||
# This will be displayed in Netscape's comment listbox.
 | 
			
		||||
nsComment			= "OpenSSL Generated Certificate"
 | 
			
		||||
 | 
			
		||||
# PKIX recommendations harmless if included in all certificates.
 | 
			
		||||
subjectKeyIdentifier=hash
 | 
			
		||||
authorityKeyIdentifier=keyid,issuer:always
 | 
			
		||||
 | 
			
		||||
# This stuff is for subjectAltName and issuerAltname.
 | 
			
		||||
# Import the email address.
 | 
			
		||||
# subjectAltName=email:copy
 | 
			
		||||
# An alternative to produce certificates that aren't
 | 
			
		||||
# deprecated according to PKIX.
 | 
			
		||||
# subjectAltName=email:move
 | 
			
		||||
 | 
			
		||||
# Copy subject details
 | 
			
		||||
# issuerAltName=issuer:copy
 | 
			
		||||
 | 
			
		||||
#nsCaRevocationUrl		= http://www.domain.dom/ca-crl.pem
 | 
			
		||||
#nsBaseUrl
 | 
			
		||||
#nsRevocationUrl
 | 
			
		||||
#nsRenewalUrl
 | 
			
		||||
#nsCaPolicyUrl
 | 
			
		||||
#nsSslServerName
 | 
			
		||||
 | 
			
		||||
# This really needs to be in place for it to be a proxy certificate.
 | 
			
		||||
proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										300
									
								
								apps/openssl.c
									
									
									
									
									
								
							
							
						
						
									
										300
									
								
								apps/openssl.c
									
									
									
									
									
								
							@@ -55,66 +55,14 @@
 | 
			
		||||
 * copied and put under another distribution licence
 | 
			
		||||
 * [including the GNU Public Licence.]
 | 
			
		||||
 */
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * 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 above 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 acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 | 
			
		||||
 *    endorse or promote products derived from this software without
 | 
			
		||||
 *    prior written permission. For written permission, please contact
 | 
			
		||||
 *    openssl-core@openssl.org.
 | 
			
		||||
 *
 | 
			
		||||
 * 5. Products derived from this software may not be called "OpenSSL"
 | 
			
		||||
 *    nor may "OpenSSL" appear in their names without prior written
 | 
			
		||||
 *    permission of the OpenSSL Project.
 | 
			
		||||
 *
 | 
			
		||||
 * 6. Redistributions of any form whatsoever must retain the following
 | 
			
		||||
 *    acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 | 
			
		||||
 * EXPRESSED 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 OpenSSL PROJECT OR
 | 
			
		||||
 * ITS 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.
 | 
			
		||||
 * ====================================================================
 | 
			
		||||
 *
 | 
			
		||||
 * This product includes cryptographic software written by Eric Young
 | 
			
		||||
 * (eay@cryptsoft.com).  This product includes software written by Tim
 | 
			
		||||
 * Hudson (tjh@cryptsoft.com).
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#ifndef DEBUG
 | 
			
		||||
#undef DEBUG
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#define OPENSSL_C /* tells apps.h to use complete apps_startup() */
 | 
			
		||||
#include "apps.h"
 | 
			
		||||
#include <openssl/bio.h>
 | 
			
		||||
#include <openssl/crypto.h>
 | 
			
		||||
#include <openssl/lhash.h>
 | 
			
		||||
@@ -122,108 +70,47 @@
 | 
			
		||||
#include <openssl/x509.h>
 | 
			
		||||
#include <openssl/pem.h>
 | 
			
		||||
#include <openssl/ssl.h>
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
#include <openssl/engine.h>
 | 
			
		||||
#endif
 | 
			
		||||
#define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
 | 
			
		||||
#define OPENSSL_C /* tells apps.h to use complete apps_startup() */
 | 
			
		||||
#include "apps.h"
 | 
			
		||||
#include "progs.h"
 | 
			
		||||
#include "s_apps.h"
 | 
			
		||||
#include <openssl/err.h>
 | 
			
		||||
 | 
			
		||||
/* The LHASH callbacks ("hash" & "cmp") have been replaced by functions with the
 | 
			
		||||
 * base prototypes (we cast each variable inside the function to the required
 | 
			
		||||
 * type of "FUNCTION*"). This removes the necessity for macro-generated wrapper
 | 
			
		||||
 * functions. */
 | 
			
		||||
/*
 | 
			
		||||
#ifdef WINDOWS
 | 
			
		||||
#include "bss_file.c"
 | 
			
		||||
#endif
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
/* static unsigned long MS_CALLBACK hash(FUNCTION *a); */
 | 
			
		||||
static unsigned long MS_CALLBACK hash(const void *a_void);
 | 
			
		||||
/* static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b); */
 | 
			
		||||
static int MS_CALLBACK cmp(const void *a_void,const void *b_void);
 | 
			
		||||
static unsigned long MS_CALLBACK hash(FUNCTION *a);
 | 
			
		||||
static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b);
 | 
			
		||||
static LHASH *prog_init(void );
 | 
			
		||||
static int do_cmd(LHASH *prog,int argc,char *argv[]);
 | 
			
		||||
LHASH *config=NULL;
 | 
			
		||||
char *default_config_file=NULL;
 | 
			
		||||
 | 
			
		||||
#ifdef DEBUG
 | 
			
		||||
static void sig_stop(int i)
 | 
			
		||||
	{
 | 
			
		||||
	char *a=NULL;
 | 
			
		||||
 | 
			
		||||
	*a='\0';
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
/* Make sure there is only one when MONOLITH is defined */
 | 
			
		||||
#ifdef MONOLITH
 | 
			
		||||
CONF *config=NULL;
 | 
			
		||||
BIO *bio_err=NULL;
 | 
			
		||||
int in_FIPS_mode=0;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
static void lock_dbg_cb(int mode, int type, const char *file, int line)
 | 
			
		||||
	{
 | 
			
		||||
	static int modes[CRYPTO_NUM_LOCKS]; /* = {0, 0, ... } */
 | 
			
		||||
	const char *errstr = NULL;
 | 
			
		||||
	int rw;
 | 
			
		||||
	
 | 
			
		||||
	rw = mode & (CRYPTO_READ|CRYPTO_WRITE);
 | 
			
		||||
	if (!((rw == CRYPTO_READ) || (rw == CRYPTO_WRITE)))
 | 
			
		||||
		{
 | 
			
		||||
		errstr = "invalid mode";
 | 
			
		||||
		goto err;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (type < 0 || type >= CRYPTO_NUM_LOCKS)
 | 
			
		||||
		{
 | 
			
		||||
		errstr = "type out of bounds";
 | 
			
		||||
		goto err;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (mode & CRYPTO_LOCK)
 | 
			
		||||
		{
 | 
			
		||||
		if (modes[type])
 | 
			
		||||
			{
 | 
			
		||||
			errstr = "already locked";
 | 
			
		||||
			/* must not happen in a single-threaded program
 | 
			
		||||
			 * (would deadlock) */
 | 
			
		||||
			goto err;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		modes[type] = rw;
 | 
			
		||||
		}
 | 
			
		||||
	else if (mode & CRYPTO_UNLOCK)
 | 
			
		||||
		{
 | 
			
		||||
		if (!modes[type])
 | 
			
		||||
			{
 | 
			
		||||
			errstr = "not locked";
 | 
			
		||||
			goto err;
 | 
			
		||||
			}
 | 
			
		||||
		
 | 
			
		||||
		if (modes[type] != rw)
 | 
			
		||||
			{
 | 
			
		||||
			errstr = (rw == CRYPTO_READ) ?
 | 
			
		||||
				"CRYPTO_r_unlock on write lock" :
 | 
			
		||||
				"CRYPTO_w_unlock on read lock";
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		modes[type] = 0;
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		errstr = "invalid mode";
 | 
			
		||||
		goto err;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
 err:
 | 
			
		||||
	if (errstr)
 | 
			
		||||
		{
 | 
			
		||||
		/* we cannot use bio_err here */
 | 
			
		||||
		fprintf(stderr, "openssl (lock_dbg_cb): %s (mode=%d, type=%d) at %s:%d\n",
 | 
			
		||||
			errstr, mode, type, file, line);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
int main(int Argc, char *Argv[])
 | 
			
		||||
	{
 | 
			
		||||
	ARGS arg;
 | 
			
		||||
#define PROG_NAME_SIZE	39
 | 
			
		||||
	char pname[PROG_NAME_SIZE+1];
 | 
			
		||||
#define PROG_NAME_SIZE	16
 | 
			
		||||
	char pname[PROG_NAME_SIZE];
 | 
			
		||||
	FUNCTION f,*fp;
 | 
			
		||||
	MS_STATIC const char *prompt;
 | 
			
		||||
	MS_STATIC char buf[1024];
 | 
			
		||||
	char *to_free=NULL;
 | 
			
		||||
	MS_STATIC char *prompt,buf[1024],config_name[256];
 | 
			
		||||
	int n,i,ret=0;
 | 
			
		||||
	int argc;
 | 
			
		||||
	char **argv,*p;
 | 
			
		||||
@@ -233,69 +120,48 @@ int main(int Argc, char *Argv[])
 | 
			
		||||
	arg.data=NULL;
 | 
			
		||||
	arg.count=0;
 | 
			
		||||
 | 
			
		||||
	in_FIPS_mode = 0;
 | 
			
		||||
 | 
			
		||||
#ifdef OPENSSL_FIPS
 | 
			
		||||
	if(getenv("OPENSSL_FIPS")) {
 | 
			
		||||
		if (!FIPS_mode_set(1)) {
 | 
			
		||||
			ERR_load_crypto_strings();
 | 
			
		||||
			ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
 | 
			
		||||
			EXIT(1);
 | 
			
		||||
		}
 | 
			
		||||
		in_FIPS_mode = 1;
 | 
			
		||||
		}
 | 
			
		||||
#if defined(DEBUG) && !defined(WINDOWS) && !defined(MSDOS)
 | 
			
		||||
#ifdef SIGBUS
 | 
			
		||||
	signal(SIGBUS,sig_stop);
 | 
			
		||||
#endif
 | 
			
		||||
#ifdef SIGSEGV
 | 
			
		||||
	signal(SIGSEGV,sig_stop);
 | 
			
		||||
#endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
 | 
			
		||||
	if (bio_err == NULL)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (getenv("OPENSSL_DEBUG_MEMORY") != NULL) /* if not defined, use compiled-in library defaults */
 | 
			
		||||
		{
 | 
			
		||||
		if (!(0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off")))
 | 
			
		||||
			{
 | 
			
		||||
			CRYPTO_malloc_debug_init();
 | 
			
		||||
			CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
 | 
			
		||||
			}
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
			/* OPENSSL_DEBUG_MEMORY=off */
 | 
			
		||||
			CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 | 
			
		||||
 | 
			
		||||
#if 0
 | 
			
		||||
	if (getenv("OPENSSL_DEBUG_LOCKING") != NULL)
 | 
			
		||||
#endif
 | 
			
		||||
		{
 | 
			
		||||
		CRYPTO_set_locking_callback(lock_dbg_cb);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
	ERR_load_crypto_strings();
 | 
			
		||||
 | 
			
		||||
	/* Lets load up our environment a little */
 | 
			
		||||
	p=getenv("OPENSSL_CONF");
 | 
			
		||||
	if (p == NULL)
 | 
			
		||||
		p=getenv("SSLEAY_CONF");
 | 
			
		||||
	if (p == NULL)
 | 
			
		||||
		p=to_free=make_config_name();
 | 
			
		||||
		{
 | 
			
		||||
		strcpy(config_name,X509_get_default_cert_area());
 | 
			
		||||
#ifndef VMS
 | 
			
		||||
		strcat(config_name,"/");
 | 
			
		||||
#endif
 | 
			
		||||
		strcat(config_name,OPENSSL_CONF);
 | 
			
		||||
		p=config_name;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	default_config_file=p;
 | 
			
		||||
 | 
			
		||||
	config=NCONF_new(NULL);
 | 
			
		||||
	i=NCONF_load(config,p,&errline);
 | 
			
		||||
	if (i == 0)
 | 
			
		||||
		{
 | 
			
		||||
		NCONF_free(config);
 | 
			
		||||
		config = NULL;
 | 
			
		||||
		ERR_clear_error();
 | 
			
		||||
		}
 | 
			
		||||
	config=CONF_load(config,p,&errline);
 | 
			
		||||
	if (config == NULL) ERR_clear_error();
 | 
			
		||||
 | 
			
		||||
	prog=prog_init();
 | 
			
		||||
 | 
			
		||||
	/* first check the program name */
 | 
			
		||||
	program_name(Argv[0],pname,sizeof pname);
 | 
			
		||||
	program_name(Argv[0],pname,PROG_NAME_SIZE);
 | 
			
		||||
 | 
			
		||||
	f.name=pname;
 | 
			
		||||
	fp=(FUNCTION *)lh_retrieve(prog,&f);
 | 
			
		||||
@@ -323,7 +189,7 @@ int main(int Argc, char *Argv[])
 | 
			
		||||
		{
 | 
			
		||||
		ret=0;
 | 
			
		||||
		p=buf;
 | 
			
		||||
		n=sizeof buf;
 | 
			
		||||
		n=1024;
 | 
			
		||||
		i=0;
 | 
			
		||||
		for (;;)
 | 
			
		||||
			{
 | 
			
		||||
@@ -357,17 +223,23 @@ int main(int Argc, char *Argv[])
 | 
			
		||||
	BIO_printf(bio_err,"bad exit\n");
 | 
			
		||||
	ret=1;
 | 
			
		||||
end:
 | 
			
		||||
	if (to_free)
 | 
			
		||||
		OPENSSL_free(to_free);
 | 
			
		||||
	if (config != NULL)
 | 
			
		||||
		{
 | 
			
		||||
		NCONF_free(config);
 | 
			
		||||
		CONF_free(config);
 | 
			
		||||
		config=NULL;
 | 
			
		||||
		}
 | 
			
		||||
	if (prog != NULL) lh_free(prog);
 | 
			
		||||
	if (arg.data != NULL) OPENSSL_free(arg.data);
 | 
			
		||||
	if (arg.data != NULL) Free(arg.data);
 | 
			
		||||
	ERR_remove_state(0);
 | 
			
		||||
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	EVP_cleanup();
 | 
			
		||||
	ERR_free_strings();
 | 
			
		||||
 | 
			
		||||
#ifdef LEVITTE_DEBUG
 | 
			
		||||
	CRYPTO_push_info("Just to make sure I get a memory leak I can see :-)");
 | 
			
		||||
	(void)Malloc(1024);
 | 
			
		||||
	CRYPTO_pop_info();
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	CRYPTO_mem_leaks(bio_err);
 | 
			
		||||
	if (bio_err != NULL)
 | 
			
		||||
@@ -375,7 +247,7 @@ end:
 | 
			
		||||
		BIO_free(bio_err);
 | 
			
		||||
		bio_err=NULL;
 | 
			
		||||
		}
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
#define LIST_STANDARD_COMMANDS "list-standard-commands"
 | 
			
		||||
@@ -395,24 +267,6 @@ static int do_cmd(LHASH *prog, int argc, char *argv[])
 | 
			
		||||
		{
 | 
			
		||||
		ret=fp->func(argc,argv);
 | 
			
		||||
		}
 | 
			
		||||
	else if ((strncmp(argv[0],"no-",3)) == 0)
 | 
			
		||||
		{
 | 
			
		||||
		BIO *bio_stdout = BIO_new_fp(stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		bio_stdout = BIO_push(tmpbio, bio_stdout);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
		f.name=argv[0]+3;
 | 
			
		||||
		ret = (lh_retrieve(prog,&f) != NULL);
 | 
			
		||||
		if (!ret)
 | 
			
		||||
			BIO_printf(bio_stdout, "%s\n", argv[0]);
 | 
			
		||||
		else
 | 
			
		||||
			BIO_printf(bio_stdout, "%s\n", argv[0]+3);
 | 
			
		||||
		BIO_free_all(bio_stdout);
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
	else if ((strcmp(argv[0],"quit") == 0) ||
 | 
			
		||||
		(strcmp(argv[0],"q") == 0) ||
 | 
			
		||||
		(strcmp(argv[0],"exit") == 0) ||
 | 
			
		||||
@@ -435,17 +289,11 @@ static int do_cmd(LHASH *prog, int argc, char *argv[])
 | 
			
		||||
		else /* strcmp(argv[0],LIST_CIPHER_COMMANDS) == 0 */
 | 
			
		||||
			list_type = FUNC_TYPE_CIPHER;
 | 
			
		||||
		bio_stdout = BIO_new_fp(stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		bio_stdout = BIO_push(tmpbio, bio_stdout);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
		
 | 
			
		||||
		for (fp=functions; fp->name != NULL; fp++)
 | 
			
		||||
			if (fp->type == list_type)
 | 
			
		||||
				BIO_printf(bio_stdout, "%s\n", fp->name);
 | 
			
		||||
		BIO_free_all(bio_stdout);
 | 
			
		||||
		BIO_free(bio_stdout);
 | 
			
		||||
		ret=0;
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
@@ -459,11 +307,7 @@ static int do_cmd(LHASH *prog, int argc, char *argv[])
 | 
			
		||||
		for (fp=functions; fp->name != NULL; fp++)
 | 
			
		||||
			{
 | 
			
		||||
			nl=0;
 | 
			
		||||
#ifdef OPENSSL_NO_CAMELLIA
 | 
			
		||||
			if (((i++) % 5) == 0)
 | 
			
		||||
#else
 | 
			
		||||
			if (((i++) % 4) == 0)
 | 
			
		||||
#endif
 | 
			
		||||
				{
 | 
			
		||||
				BIO_printf(bio_err,"\n");
 | 
			
		||||
				nl=1;
 | 
			
		||||
@@ -484,11 +328,7 @@ static int do_cmd(LHASH *prog, int argc, char *argv[])
 | 
			
		||||
					BIO_printf(bio_err,"\nCipher commands (see the `enc' command for more details)\n");
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
#ifdef OPENSSL_NO_CAMELLIA
 | 
			
		||||
			BIO_printf(bio_err,"%-15s",fp->name);
 | 
			
		||||
#else
 | 
			
		||||
			BIO_printf(bio_err,"%-18s",fp->name);
 | 
			
		||||
#endif
 | 
			
		||||
			}
 | 
			
		||||
		BIO_printf(bio_err,"\n\n");
 | 
			
		||||
		ret=0;
 | 
			
		||||
@@ -511,30 +351,26 @@ static LHASH *prog_init(void)
 | 
			
		||||
	{
 | 
			
		||||
	LHASH *ret;
 | 
			
		||||
	FUNCTION *f;
 | 
			
		||||
	size_t i;
 | 
			
		||||
	int i;
 | 
			
		||||
 | 
			
		||||
	/* Purely so it looks nice when the user hits ? */
 | 
			
		||||
	for(i=0,f=functions ; f->name != NULL ; ++f,++i)
 | 
			
		||||
	    ;
 | 
			
		||||
	qsort(functions,i,sizeof *functions,SortFnByName);
 | 
			
		||||
 | 
			
		||||
	if ((ret=lh_new(hash, cmp)) == NULL)
 | 
			
		||||
		return(NULL);
 | 
			
		||||
	if ((ret=lh_new(hash,cmp)) == NULL) return(NULL);
 | 
			
		||||
 | 
			
		||||
	for (f=functions; f->name != NULL; f++)
 | 
			
		||||
		lh_insert(ret,f);
 | 
			
		||||
	return(ret);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
/* static int MS_CALLBACK cmp(FUNCTION *a, FUNCTION *b) */
 | 
			
		||||
static int MS_CALLBACK cmp(const void *a_void, const void *b_void)
 | 
			
		||||
static int MS_CALLBACK cmp(FUNCTION *a, FUNCTION *b)
 | 
			
		||||
	{
 | 
			
		||||
	return(strncmp(((const FUNCTION *)a_void)->name,
 | 
			
		||||
			((const FUNCTION *)b_void)->name,8));
 | 
			
		||||
	return(strncmp(a->name,b->name,8));
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
/* static unsigned long MS_CALLBACK hash(FUNCTION *a) */
 | 
			
		||||
static unsigned long MS_CALLBACK hash(const void *a_void)
 | 
			
		||||
static unsigned long MS_CALLBACK hash(FUNCTION *a)
 | 
			
		||||
	{
 | 
			
		||||
	return(lh_strhash(((const FUNCTION *)a_void)->name));
 | 
			
		||||
	return(lh_strhash(a->name));
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -8,8 +8,9 @@
 | 
			
		||||
HOME			= .
 | 
			
		||||
RANDFILE		= $ENV::HOME/.rnd
 | 
			
		||||
 | 
			
		||||
# Uncomment out to enable OpenSSL configuration see config(3)
 | 
			
		||||
# openssl_conf = openssl_init
 | 
			
		||||
# Extra OBJECT IDENTIFIER info:
 | 
			
		||||
#oid_file		= $ENV::HOME/.oid
 | 
			
		||||
oid_section		= new_oids
 | 
			
		||||
 | 
			
		||||
# To use this configuration file with the "-extfile" option of the
 | 
			
		||||
# "openssl x509" utility, name here the section containing the
 | 
			
		||||
@@ -18,22 +19,13 @@ RANDFILE		= $ENV::HOME/.rnd
 | 
			
		||||
# (Alternatively, use a configuration file that has only
 | 
			
		||||
# X.509v3 extensions in its main [= default] section.)
 | 
			
		||||
 | 
			
		||||
[openssl_init]
 | 
			
		||||
# Extra OBJECT IDENTIFIER info:
 | 
			
		||||
oid_section = new_oids
 | 
			
		||||
alg_section = algs
 | 
			
		||||
 | 
			
		||||
[ new_oids ]
 | 
			
		||||
 | 
			
		||||
# We can add new OIDs in here for use by any config aware application
 | 
			
		||||
# We can add new OIDs in here for use by 'ca' and 'req'.
 | 
			
		||||
# Add a simple OID like this:
 | 
			
		||||
# shortname=Long Object Identifier Name, 1.2.3.4
 | 
			
		||||
# testoid1=1.2.3.4
 | 
			
		||||
# Or use config file substitution like this:
 | 
			
		||||
# testoid2=OID2 LONG NAME, ${testoid1}.5.6, OTHER OID
 | 
			
		||||
 | 
			
		||||
[ algs ]
 | 
			
		||||
# Algorithm configuration options. Currently just fips_mode
 | 
			
		||||
fips_mode = no
 | 
			
		||||
# testoid2=${testoid1}.5.6
 | 
			
		||||
 | 
			
		||||
####################################################################
 | 
			
		||||
[ ca ]
 | 
			
		||||
@@ -46,36 +38,23 @@ dir		= ./demoCA		# Where everything is kept
 | 
			
		||||
certs		= $dir/certs		# Where the issued certs are kept
 | 
			
		||||
crl_dir		= $dir/crl		# Where the issued crl are kept
 | 
			
		||||
database	= $dir/index.txt	# database index file.
 | 
			
		||||
#unique_subject	= no			# Set to 'no' to allow creation of
 | 
			
		||||
					# several ctificates with same subject.
 | 
			
		||||
new_certs_dir	= $dir/newcerts		# default place for new certs.
 | 
			
		||||
 | 
			
		||||
certificate	= $dir/cacert.pem 	# The CA certificate
 | 
			
		||||
serial		= $dir/serial 		# The current serial number
 | 
			
		||||
crlnumber	= $dir/crlnumber	# the current crl number
 | 
			
		||||
					# must be commented out to leave a V1 CRL
 | 
			
		||||
crl		= $dir/crl.pem 		# The current CRL
 | 
			
		||||
private_key	= $dir/private/cakey.pem# The private key
 | 
			
		||||
RANDFILE	= $dir/private/.rand	# private random number file
 | 
			
		||||
 | 
			
		||||
x509_extensions	= usr_cert		# The extentions to add to the cert
 | 
			
		||||
 | 
			
		||||
# Comment out the following two lines for the "traditional"
 | 
			
		||||
# (and highly broken) format.
 | 
			
		||||
name_opt 	= ca_default		# Subject Name options
 | 
			
		||||
cert_opt 	= ca_default		# Certificate field options
 | 
			
		||||
 | 
			
		||||
# Extension copying option: use with caution.
 | 
			
		||||
# copy_extensions = copy
 | 
			
		||||
 | 
			
		||||
# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
 | 
			
		||||
# so this is commented out by default to leave a V1 CRL.
 | 
			
		||||
# crlnumber must also be commented out to leave a V1 CRL.
 | 
			
		||||
# crl_extensions	= crl_ext
 | 
			
		||||
 | 
			
		||||
default_days	= 365			# how long to certify for
 | 
			
		||||
default_crl_days= 30			# how long before next CRL
 | 
			
		||||
default_md	= sha1			# which md to use.
 | 
			
		||||
default_md	= md5			# which md to use.
 | 
			
		||||
preserve	= no			# keep passed DN ordering
 | 
			
		||||
 | 
			
		||||
# A few difference way of specifying how similar the request should look
 | 
			
		||||
@@ -153,7 +132,7 @@ commonName			= Common Name (eg, YOUR name)
 | 
			
		||||
commonName_max			= 64
 | 
			
		||||
 | 
			
		||||
emailAddress			= Email Address
 | 
			
		||||
emailAddress_max		= 64
 | 
			
		||||
emailAddress_max		= 40
 | 
			
		||||
 | 
			
		||||
# SET-ex3			= SET extension number 3
 | 
			
		||||
 | 
			
		||||
@@ -196,14 +175,11 @@ nsComment			= "OpenSSL Generated Certificate"
 | 
			
		||||
 | 
			
		||||
# PKIX recommendations harmless if included in all certificates.
 | 
			
		||||
subjectKeyIdentifier=hash
 | 
			
		||||
authorityKeyIdentifier=keyid,issuer
 | 
			
		||||
authorityKeyIdentifier=keyid,issuer:always
 | 
			
		||||
 | 
			
		||||
# This stuff is for subjectAltName and issuerAltname.
 | 
			
		||||
# Import the email address.
 | 
			
		||||
# subjectAltName=email:copy
 | 
			
		||||
# An alternative to produce certificates that aren't
 | 
			
		||||
# deprecated according to PKIX.
 | 
			
		||||
# subjectAltName=email:move
 | 
			
		||||
 | 
			
		||||
# Copy subject details
 | 
			
		||||
# issuerAltName=issuer:copy
 | 
			
		||||
@@ -266,56 +242,3 @@ basicConstraints = CA:true
 | 
			
		||||
 | 
			
		||||
# issuerAltName=issuer:copy
 | 
			
		||||
authorityKeyIdentifier=keyid:always,issuer:always
 | 
			
		||||
 | 
			
		||||
[ proxy_cert_ext ]
 | 
			
		||||
# These extensions should be added when creating a proxy certificate
 | 
			
		||||
 | 
			
		||||
# This goes against PKIX guidelines but some CAs do it and some software
 | 
			
		||||
# requires this to avoid interpreting an end user certificate as a CA.
 | 
			
		||||
 | 
			
		||||
basicConstraints=CA:FALSE
 | 
			
		||||
 | 
			
		||||
# Here are some examples of the usage of nsCertType. If it is omitted
 | 
			
		||||
# the certificate can be used for anything *except* object signing.
 | 
			
		||||
 | 
			
		||||
# This is OK for an SSL server.
 | 
			
		||||
# nsCertType			= server
 | 
			
		||||
 | 
			
		||||
# For an object signing certificate this would be used.
 | 
			
		||||
# nsCertType = objsign
 | 
			
		||||
 | 
			
		||||
# For normal client use this is typical
 | 
			
		||||
# nsCertType = client, email
 | 
			
		||||
 | 
			
		||||
# and for everything including object signing:
 | 
			
		||||
# nsCertType = client, email, objsign
 | 
			
		||||
 | 
			
		||||
# This is typical in keyUsage for a client certificate.
 | 
			
		||||
# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
 | 
			
		||||
 | 
			
		||||
# This will be displayed in Netscape's comment listbox.
 | 
			
		||||
nsComment			= "OpenSSL Generated Certificate"
 | 
			
		||||
 | 
			
		||||
# PKIX recommendations harmless if included in all certificates.
 | 
			
		||||
subjectKeyIdentifier=hash
 | 
			
		||||
authorityKeyIdentifier=keyid,issuer:always
 | 
			
		||||
 | 
			
		||||
# This stuff is for subjectAltName and issuerAltname.
 | 
			
		||||
# Import the email address.
 | 
			
		||||
# subjectAltName=email:copy
 | 
			
		||||
# An alternative to produce certificates that aren't
 | 
			
		||||
# deprecated according to PKIX.
 | 
			
		||||
# subjectAltName=email:move
 | 
			
		||||
 | 
			
		||||
# Copy subject details
 | 
			
		||||
# issuerAltName=issuer:copy
 | 
			
		||||
 | 
			
		||||
#nsCaRevocationUrl		= http://www.domain.dom/ca-crl.pem
 | 
			
		||||
#nsBaseUrl
 | 
			
		||||
#nsRevocationUrl
 | 
			
		||||
#nsRenewalUrl
 | 
			
		||||
#nsCaPolicyUrl
 | 
			
		||||
#nsSslServerName
 | 
			
		||||
 | 
			
		||||
# This really needs to be in place for it to be a proxy certificate.
 | 
			
		||||
proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										191
									
								
								apps/passwd.c
									
									
									
									
									
								
							
							
						
						
									
										191
									
								
								apps/passwd.c
									
									
									
									
									
								
							@@ -1,10 +1,10 @@
 | 
			
		||||
/* apps/passwd.c */
 | 
			
		||||
 | 
			
		||||
#if defined OPENSSL_NO_MD5 || defined CHARSET_EBCDIC
 | 
			
		||||
# define NO_MD5CRYPT_1
 | 
			
		||||
#if defined NO_MD5 || defined CHARSET_EBCDIC
 | 
			
		||||
# define NO_APR1
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if !defined(OPENSSL_NO_DES) || !defined(NO_MD5CRYPT_1)
 | 
			
		||||
#if !defined(NO_DES) || !defined(NO_APR1)
 | 
			
		||||
 | 
			
		||||
#include <assert.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
@@ -15,10 +15,11 @@
 | 
			
		||||
#include <openssl/err.h>
 | 
			
		||||
#include <openssl/evp.h>
 | 
			
		||||
#include <openssl/rand.h>
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
# include <openssl/des.h>
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef NO_MD5CRYPT_1
 | 
			
		||||
#ifndef NO_APR1
 | 
			
		||||
# include <openssl/md5.h>
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
@@ -41,15 +42,13 @@ static unsigned const char cov_2char[64]={
 | 
			
		||||
 | 
			
		||||
static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 | 
			
		||||
	char *passwd, BIO *out, int quiet, int table, int reverse,
 | 
			
		||||
	size_t pw_maxlen, int usecrypt, int use1, int useapr1);
 | 
			
		||||
	size_t pw_maxlen, int usecrypt, int useapr1);
 | 
			
		||||
 | 
			
		||||
/* -crypt        - standard Unix password algorithm (default)
 | 
			
		||||
 * -1            - MD5-based password algorithm
 | 
			
		||||
 * -apr1         - MD5-based password algorithm, Apache variant
 | 
			
		||||
/* -crypt        - standard Unix password algorithm (default, only choice)
 | 
			
		||||
 * -apr1         - MD5-based password algorithm
 | 
			
		||||
 * -salt string  - salt
 | 
			
		||||
 * -in file      - read passwords from file
 | 
			
		||||
 * -stdin        - read passwords from stdin
 | 
			
		||||
 * -noverify     - never verify when reading password from terminal
 | 
			
		||||
 * -quiet        - no warnings
 | 
			
		||||
 * -table        - format output as table
 | 
			
		||||
 * -reverse      - switch table columns
 | 
			
		||||
@@ -62,15 +61,13 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	int ret = 1;
 | 
			
		||||
	char *infile = NULL;
 | 
			
		||||
	int in_stdin = 0;
 | 
			
		||||
	int in_noverify = 0;
 | 
			
		||||
	char *salt = NULL, *passwd = NULL, **passwds = NULL;
 | 
			
		||||
	char *salt_malloc = NULL, *passwd_malloc = NULL;
 | 
			
		||||
	size_t passwd_malloc_size = 0;
 | 
			
		||||
	int pw_source_defined = 0;
 | 
			
		||||
	BIO *in = NULL, *out = NULL;
 | 
			
		||||
	int i, badopt, opt_done;
 | 
			
		||||
	int passed_salt = 0, quiet = 0, table = 0, reverse = 0;
 | 
			
		||||
	int usecrypt = 0, use1 = 0, useapr1 = 0;
 | 
			
		||||
	int usecrypt = 0, useapr1 = 0;
 | 
			
		||||
	size_t pw_maxlen = 0;
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
@@ -78,19 +75,10 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	if (bio_err == NULL)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto err;
 | 
			
		||||
	out = BIO_new(BIO_s_file());
 | 
			
		||||
	if (out == NULL)
 | 
			
		||||
		goto err;
 | 
			
		||||
	BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
	{
 | 
			
		||||
	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
	out = BIO_push(tmpbio, out);
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	badopt = 0, opt_done = 0;
 | 
			
		||||
	i = 0;
 | 
			
		||||
@@ -98,8 +86,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		{
 | 
			
		||||
		if (strcmp(argv[i], "-crypt") == 0)
 | 
			
		||||
			usecrypt = 1;
 | 
			
		||||
		else if (strcmp(argv[i], "-1") == 0)
 | 
			
		||||
			use1 = 1;
 | 
			
		||||
		else if (strcmp(argv[i], "-apr1") == 0)
 | 
			
		||||
			useapr1 = 1;
 | 
			
		||||
		else if (strcmp(argv[i], "-salt") == 0)
 | 
			
		||||
@@ -132,8 +118,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			else
 | 
			
		||||
				badopt = 1;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(argv[i], "-noverify") == 0)
 | 
			
		||||
			in_noverify = 1;
 | 
			
		||||
		else if (strcmp(argv[i], "-quiet") == 0)
 | 
			
		||||
			quiet = 1;
 | 
			
		||||
		else if (strcmp(argv[i], "-table") == 0)
 | 
			
		||||
@@ -153,34 +137,32 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			badopt = 1;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (!usecrypt && !use1 && !useapr1) /* use default */
 | 
			
		||||
	if (!usecrypt && !useapr1) /* use default */
 | 
			
		||||
		usecrypt = 1;
 | 
			
		||||
	if (usecrypt + use1 + useapr1 > 1) /* conflict */
 | 
			
		||||
	if (usecrypt + useapr1 > 1) /* conflict */
 | 
			
		||||
		badopt = 1;
 | 
			
		||||
 | 
			
		||||
	/* reject unsupported algorithms */
 | 
			
		||||
#ifdef OPENSSL_NO_DES
 | 
			
		||||
#ifdef NO_DES
 | 
			
		||||
	if (usecrypt) badopt = 1;
 | 
			
		||||
#endif
 | 
			
		||||
#ifdef NO_MD5CRYPT_1
 | 
			
		||||
	if (use1 || useapr1) badopt = 1;
 | 
			
		||||
#ifdef NO_APR1
 | 
			
		||||
	if (useapr1) badopt = 1;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	if (badopt) 
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err, "Usage: passwd [options] [passwords]\n");
 | 
			
		||||
		BIO_printf(bio_err, "where options are\n");
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
		BIO_printf(bio_err, "-crypt             standard Unix password algorithm (default)\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef NO_MD5CRYPT_1
 | 
			
		||||
		BIO_printf(bio_err, "-1                 MD5-based password algorithm\n");
 | 
			
		||||
		BIO_printf(bio_err, "-apr1              MD5-based password algorithm, Apache variant\n");
 | 
			
		||||
#ifndef NO_APR1
 | 
			
		||||
		BIO_printf(bio_err, "-apr1              MD5-based password algorithm\n");
 | 
			
		||||
#endif
 | 
			
		||||
		BIO_printf(bio_err, "-salt string       use provided salt\n");
 | 
			
		||||
		BIO_printf(bio_err, "-in file           read passwords from file\n");
 | 
			
		||||
		BIO_printf(bio_err, "-stdin             read passwords from stdin\n");
 | 
			
		||||
		BIO_printf(bio_err, "-noverify          never verify when reading password from terminal\n");
 | 
			
		||||
		BIO_printf(bio_err, "-quiet             no warnings\n");
 | 
			
		||||
		BIO_printf(bio_err, "-table             format output as table\n");
 | 
			
		||||
		BIO_printf(bio_err, "-reverse           switch table columns\n");
 | 
			
		||||
@@ -208,16 +190,13 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	
 | 
			
		||||
	if (usecrypt)
 | 
			
		||||
		pw_maxlen = 8;
 | 
			
		||||
	else if (use1 || useapr1)
 | 
			
		||||
	else if (useapr1)
 | 
			
		||||
		pw_maxlen = 256; /* arbitrary limit, should be enough for most passwords */
 | 
			
		||||
 | 
			
		||||
	if (passwds == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		/* no passwords on the command line */
 | 
			
		||||
 | 
			
		||||
		passwd_malloc_size = pw_maxlen + 2;
 | 
			
		||||
		/* longer than necessary so that we can warn about truncation */
 | 
			
		||||
		passwd = passwd_malloc = OPENSSL_malloc(passwd_malloc_size);
 | 
			
		||||
		passwd = passwd_malloc = Malloc(pw_maxlen + 1);
 | 
			
		||||
		if (passwd_malloc == NULL)
 | 
			
		||||
			goto err;
 | 
			
		||||
		}
 | 
			
		||||
@@ -229,7 +208,7 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		
 | 
			
		||||
		passwds = passwds_static;
 | 
			
		||||
		if (in == NULL)
 | 
			
		||||
			if (EVP_read_pw_string(passwd_malloc, passwd_malloc_size, "Password: ", !(passed_salt || in_noverify)) != 0)
 | 
			
		||||
			if (EVP_read_pw_string(passwd_malloc, pw_maxlen + 1, "Password: ", 0) != 0)
 | 
			
		||||
				goto err;
 | 
			
		||||
		passwds[0] = passwd_malloc;
 | 
			
		||||
		}
 | 
			
		||||
@@ -243,7 +222,7 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			{
 | 
			
		||||
			passwd = *passwds++;
 | 
			
		||||
			if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, out,
 | 
			
		||||
				quiet, table, reverse, pw_maxlen, usecrypt, use1, useapr1))
 | 
			
		||||
				quiet, table, reverse, pw_maxlen, usecrypt, useapr1))
 | 
			
		||||
				goto err;
 | 
			
		||||
			}
 | 
			
		||||
		while (*passwds != NULL);
 | 
			
		||||
@@ -272,104 +251,90 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
					}
 | 
			
		||||
				
 | 
			
		||||
				if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, out,
 | 
			
		||||
					quiet, table, reverse, pw_maxlen, usecrypt, use1, useapr1))
 | 
			
		||||
					quiet, table, reverse, pw_maxlen, usecrypt, useapr1))
 | 
			
		||||
					goto err;
 | 
			
		||||
				}
 | 
			
		||||
			done = (r <= 0);
 | 
			
		||||
			}
 | 
			
		||||
		while (!done);
 | 
			
		||||
		}
 | 
			
		||||
	ret = 0;
 | 
			
		||||
 | 
			
		||||
err:
 | 
			
		||||
	ERR_print_errors(bio_err);
 | 
			
		||||
	if (salt_malloc)
 | 
			
		||||
		OPENSSL_free(salt_malloc);
 | 
			
		||||
		Free(salt_malloc);
 | 
			
		||||
	if (passwd_malloc)
 | 
			
		||||
		OPENSSL_free(passwd_malloc);
 | 
			
		||||
		Free(passwd_malloc);
 | 
			
		||||
	if (in)
 | 
			
		||||
		BIO_free(in);
 | 
			
		||||
	if (out)
 | 
			
		||||
		BIO_free_all(out);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
		BIO_free(out);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#ifndef NO_MD5CRYPT_1
 | 
			
		||||
/* MD5-based password algorithm (should probably be available as a library
 | 
			
		||||
 * function; then the static buffer would not be acceptable).
 | 
			
		||||
 * For magic string "1", this should be compatible to the MD5-based BSD
 | 
			
		||||
 * password algorithm.
 | 
			
		||||
 * For 'magic' string "apr1", this is compatible to the MD5-based Apache
 | 
			
		||||
 * password algorithm.
 | 
			
		||||
 * (Apparently, the Apache password algorithm is identical except that the
 | 
			
		||||
 * 'magic' string was changed -- the laziest application of the NIH principle
 | 
			
		||||
 * I've ever encountered.)
 | 
			
		||||
 */
 | 
			
		||||
static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 | 
			
		||||
#ifndef NO_APR1
 | 
			
		||||
/* MD5-based password algorithm compatible to the one found in Apache
 | 
			
		||||
 * (should probably be available as a library function;
 | 
			
		||||
 * then the static buffer would not be acceptable) */
 | 
			
		||||
static char *apr1_crypt(const char *passwd, const char *salt)
 | 
			
		||||
	{
 | 
			
		||||
	static char out_buf[6 + 9 + 24 + 2]; /* "$apr1$..salt..$.......md5hash..........\0" */
 | 
			
		||||
	unsigned char buf[MD5_DIGEST_LENGTH];
 | 
			
		||||
	char *salt_out;
 | 
			
		||||
	int n;
 | 
			
		||||
	unsigned int i;
 | 
			
		||||
	EVP_MD_CTX md,md2;
 | 
			
		||||
	int n, i;
 | 
			
		||||
	MD5_CTX md;
 | 
			
		||||
	size_t passwd_len, salt_len;
 | 
			
		||||
 | 
			
		||||
	passwd_len = strlen(passwd);
 | 
			
		||||
	out_buf[0] = '$';
 | 
			
		||||
	out_buf[1] = 0;
 | 
			
		||||
	assert(strlen(magic) <= 4); /* "1" or "apr1" */
 | 
			
		||||
	strncat(out_buf, magic, 4);
 | 
			
		||||
	strncat(out_buf, "$", 1);
 | 
			
		||||
	strcpy(out_buf, "$apr1$");
 | 
			
		||||
	strncat(out_buf, salt, 8);
 | 
			
		||||
	assert(strlen(out_buf) <= 6 + 8); /* "$apr1$..salt.." */
 | 
			
		||||
	salt_out = out_buf + 2 + strlen(magic);
 | 
			
		||||
	salt_out = out_buf + 6;
 | 
			
		||||
	salt_len = strlen(salt_out);
 | 
			
		||||
	assert(salt_len <= 8);
 | 
			
		||||
	
 | 
			
		||||
	EVP_MD_CTX_init(&md);
 | 
			
		||||
	EVP_DigestInit_ex(&md,EVP_md5(), NULL);
 | 
			
		||||
	EVP_DigestUpdate(&md, passwd, passwd_len);
 | 
			
		||||
	EVP_DigestUpdate(&md, "$", 1);
 | 
			
		||||
	EVP_DigestUpdate(&md, magic, strlen(magic));
 | 
			
		||||
	EVP_DigestUpdate(&md, "$", 1);
 | 
			
		||||
	EVP_DigestUpdate(&md, salt_out, salt_len);
 | 
			
		||||
	MD5_Init(&md);
 | 
			
		||||
	MD5_Update(&md, passwd, passwd_len);
 | 
			
		||||
	MD5_Update(&md, "$apr1$", 6);
 | 
			
		||||
	MD5_Update(&md, salt_out, salt_len);
 | 
			
		||||
	
 | 
			
		||||
	EVP_MD_CTX_init(&md2);
 | 
			
		||||
	EVP_DigestInit_ex(&md2,EVP_md5(), NULL);
 | 
			
		||||
	EVP_DigestUpdate(&md2, passwd, passwd_len);
 | 
			
		||||
	EVP_DigestUpdate(&md2, salt_out, salt_len);
 | 
			
		||||
	EVP_DigestUpdate(&md2, passwd, passwd_len);
 | 
			
		||||
	EVP_DigestFinal_ex(&md2, buf, NULL);
 | 
			
		||||
	 {
 | 
			
		||||
		MD5_CTX md2;
 | 
			
		||||
 | 
			
		||||
		MD5_Init(&md2);
 | 
			
		||||
		MD5_Update(&md2, passwd, passwd_len);
 | 
			
		||||
		MD5_Update(&md2, salt_out, salt_len);
 | 
			
		||||
		MD5_Update(&md2, passwd, passwd_len);
 | 
			
		||||
		MD5_Final(buf, &md2);
 | 
			
		||||
	 }
 | 
			
		||||
	for (i = passwd_len; i > sizeof buf; i -= sizeof buf)
 | 
			
		||||
		EVP_DigestUpdate(&md, buf, sizeof buf);
 | 
			
		||||
	EVP_DigestUpdate(&md, buf, i);
 | 
			
		||||
		MD5_Update(&md, buf, sizeof buf);
 | 
			
		||||
	MD5_Update(&md, buf, i);
 | 
			
		||||
	
 | 
			
		||||
	n = passwd_len;
 | 
			
		||||
	while (n)
 | 
			
		||||
		{
 | 
			
		||||
		EVP_DigestUpdate(&md, (n & 1) ? "\0" : passwd, 1);
 | 
			
		||||
		MD5_Update(&md, (n & 1) ? "\0" : passwd, 1);
 | 
			
		||||
		n >>= 1;
 | 
			
		||||
		}
 | 
			
		||||
	EVP_DigestFinal_ex(&md, buf, NULL);
 | 
			
		||||
	MD5_Final(buf, &md);
 | 
			
		||||
 | 
			
		||||
	for (i = 0; i < 1000; i++)
 | 
			
		||||
		{
 | 
			
		||||
		EVP_DigestInit_ex(&md2,EVP_md5(), NULL);
 | 
			
		||||
		EVP_DigestUpdate(&md2, (i & 1) ? (unsigned const char *) passwd : buf,
 | 
			
		||||
		                       (i & 1) ? passwd_len : sizeof buf);
 | 
			
		||||
		MD5_CTX md2;
 | 
			
		||||
 | 
			
		||||
		MD5_Init(&md2);
 | 
			
		||||
		MD5_Update(&md2, (i & 1) ? (unsigned char *) passwd : buf,
 | 
			
		||||
		                 (i & 1) ? passwd_len : sizeof buf);
 | 
			
		||||
		if (i % 3)
 | 
			
		||||
			EVP_DigestUpdate(&md2, salt_out, salt_len);
 | 
			
		||||
			MD5_Update(&md2, salt_out, salt_len);
 | 
			
		||||
		if (i % 7)
 | 
			
		||||
			EVP_DigestUpdate(&md2, passwd, passwd_len);
 | 
			
		||||
		EVP_DigestUpdate(&md2, (i & 1) ? buf : (unsigned const char *) passwd,
 | 
			
		||||
		                       (i & 1) ? sizeof buf : passwd_len);
 | 
			
		||||
		EVP_DigestFinal_ex(&md2, buf, NULL);
 | 
			
		||||
			MD5_Update(&md2, passwd, passwd_len);
 | 
			
		||||
		MD5_Update(&md2, (i & 1) ? buf : (unsigned char *) passwd,
 | 
			
		||||
		                 (i & 1) ? sizeof buf : passwd_len);
 | 
			
		||||
		MD5_Final(buf, &md2);
 | 
			
		||||
		}
 | 
			
		||||
	EVP_MD_CTX_cleanup(&md2);
 | 
			
		||||
	
 | 
			
		||||
	 {
 | 
			
		||||
		/* transform buf into output string */
 | 
			
		||||
@@ -407,7 +372,6 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 | 
			
		||||
		*output = 0;
 | 
			
		||||
		assert(strlen(out_buf) < sizeof(out_buf));
 | 
			
		||||
	 }
 | 
			
		||||
	EVP_MD_CTX_cleanup(&md);
 | 
			
		||||
 | 
			
		||||
	return out_buf;
 | 
			
		||||
	}
 | 
			
		||||
@@ -416,7 +380,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 | 
			
		||||
 | 
			
		||||
static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 | 
			
		||||
	char *passwd, BIO *out,	int quiet, int table, int reverse,
 | 
			
		||||
	size_t pw_maxlen, int usecrypt, int use1, int useapr1)
 | 
			
		||||
	size_t pw_maxlen, int usecrypt, int useapr1)
 | 
			
		||||
	{
 | 
			
		||||
	char *hash = NULL;
 | 
			
		||||
 | 
			
		||||
@@ -426,12 +390,12 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 | 
			
		||||
	/* first make sure we have a salt */
 | 
			
		||||
	if (!passed_salt)
 | 
			
		||||
		{
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
		if (usecrypt)
 | 
			
		||||
			{
 | 
			
		||||
			if (*salt_malloc_p == NULL)
 | 
			
		||||
				{
 | 
			
		||||
				*salt_p = *salt_malloc_p = OPENSSL_malloc(3);
 | 
			
		||||
				*salt_p = *salt_malloc_p = Malloc(3);
 | 
			
		||||
				if (*salt_malloc_p == NULL)
 | 
			
		||||
					goto err;
 | 
			
		||||
				}
 | 
			
		||||
@@ -445,16 +409,16 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 | 
			
		||||
			                                    * back to ASCII */
 | 
			
		||||
#endif
 | 
			
		||||
			}
 | 
			
		||||
#endif /* !OPENSSL_NO_DES */
 | 
			
		||||
#endif /* !NO_DES */
 | 
			
		||||
 | 
			
		||||
#ifndef NO_MD5CRYPT_1
 | 
			
		||||
		if (use1 || useapr1)
 | 
			
		||||
#ifndef NO_APR1
 | 
			
		||||
		if (useapr1)
 | 
			
		||||
			{
 | 
			
		||||
			int i;
 | 
			
		||||
			
 | 
			
		||||
			if (*salt_malloc_p == NULL)
 | 
			
		||||
				{
 | 
			
		||||
				*salt_p = *salt_malloc_p = OPENSSL_malloc(9);
 | 
			
		||||
				*salt_p = *salt_malloc_p = Malloc(9);
 | 
			
		||||
				if (*salt_malloc_p == NULL)
 | 
			
		||||
					goto err;
 | 
			
		||||
				}
 | 
			
		||||
@@ -465,7 +429,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 | 
			
		||||
				(*salt_p)[i] = cov_2char[(*salt_p)[i] & 0x3f]; /* 6 bits */
 | 
			
		||||
			(*salt_p)[8] = 0;
 | 
			
		||||
			}
 | 
			
		||||
#endif /* !NO_MD5CRYPT_1 */
 | 
			
		||||
#endif /* !NO_APR1 */
 | 
			
		||||
		}
 | 
			
		||||
	
 | 
			
		||||
	assert(*salt_p != NULL);
 | 
			
		||||
@@ -474,20 +438,19 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 | 
			
		||||
	if ((strlen(passwd) > pw_maxlen))
 | 
			
		||||
		{
 | 
			
		||||
		if (!quiet)
 | 
			
		||||
			/* XXX: really we should know how to print a size_t, not cast it */
 | 
			
		||||
			BIO_printf(bio_err, "Warning: truncating password to %u characters\n", (unsigned)pw_maxlen);
 | 
			
		||||
			BIO_printf(bio_err, "Warning: truncating password to %u characters\n", pw_maxlen);
 | 
			
		||||
		passwd[pw_maxlen] = 0;
 | 
			
		||||
		}
 | 
			
		||||
	assert(strlen(passwd) <= pw_maxlen);
 | 
			
		||||
	
 | 
			
		||||
	/* now compute password hash */
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	if (usecrypt)
 | 
			
		||||
		hash = DES_crypt(passwd, *salt_p);
 | 
			
		||||
		hash = des_crypt(passwd, *salt_p);
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef NO_MD5CRYPT_1
 | 
			
		||||
	if (use1 || useapr1)
 | 
			
		||||
		hash = md5crypt(passwd, (use1 ? "1" : "apr1"), *salt_p);
 | 
			
		||||
#ifndef NO_APR1
 | 
			
		||||
	if (useapr1)
 | 
			
		||||
		hash = apr1_crypt(passwd, *salt_p);
 | 
			
		||||
#endif
 | 
			
		||||
	assert(hash != NULL);
 | 
			
		||||
 | 
			
		||||
@@ -507,6 +470,6 @@ err:
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
	fputs("Program not available.\n", stderr)
 | 
			
		||||
	OPENSSL_EXIT(1);
 | 
			
		||||
	EXIT(1);
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1 @@
 | 
			
		||||
07
 | 
			
		||||
01
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
/* crypto/dsa/dsa_key.c */
 | 
			
		||||
/* apps/pem_mail.c */
 | 
			
		||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 | 
			
		||||
 * All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
@@ -56,114 +56,115 @@
 | 
			
		||||
 * [including the GNU Public Licence.]
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#ifndef NO_RSA
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <time.h>
 | 
			
		||||
#ifndef OPENSSL_NO_SHA
 | 
			
		||||
#include <openssl/bn.h>
 | 
			
		||||
#include <openssl/dsa.h>
 | 
			
		||||
#include <openssl/rand.h>
 | 
			
		||||
#include <openssl/err.h>
 | 
			
		||||
#include <openssl/rsa.h>
 | 
			
		||||
#include <openssl/evp.h>
 | 
			
		||||
#include <openssl/fips.h>
 | 
			
		||||
#include "fips_locl.h"
 | 
			
		||||
#include <openssl/objects.h>
 | 
			
		||||
#include <openssl/x509.h>
 | 
			
		||||
#include <openssl/err.h>
 | 
			
		||||
#include <openssl/pem.h>
 | 
			
		||||
#include "apps.h"
 | 
			
		||||
 | 
			
		||||
#ifdef OPENSSL_FIPS
 | 
			
		||||
#undef PROG
 | 
			
		||||
#define PROG	pem_mail_main
 | 
			
		||||
 | 
			
		||||
static int fips_dsa_pairwise_fail = 0;
 | 
			
		||||
static char *usage[]={
 | 
			
		||||
"usage: pem_mail args\n",
 | 
			
		||||
"\n",
 | 
			
		||||
" -in arg         - input file - default stdin\n",
 | 
			
		||||
" -out arg        - output file - default stdout\n",
 | 
			
		||||
" -cert arg       - the certificate to use\n",
 | 
			
		||||
" -key arg        - the private key to use\n",
 | 
			
		||||
" -MIC           - sign the message\n",
 | 
			
		||||
" -enc arg        - encrypt with one of cbc-des\n",
 | 
			
		||||
NULL
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
void FIPS_corrupt_dsa_keygen(void)
 | 
			
		||||
 | 
			
		||||
typedef struct lines_St
 | 
			
		||||
	{
 | 
			
		||||
	fips_dsa_pairwise_fail = 1;
 | 
			
		||||
	}
 | 
			
		||||
	char *line;
 | 
			
		||||
	struct lines_st *next;
 | 
			
		||||
	} LINES;
 | 
			
		||||
 | 
			
		||||
static int dsa_builtin_keygen(DSA *dsa);
 | 
			
		||||
 | 
			
		||||
int fips_check_dsa(DSA *dsa)
 | 
			
		||||
int main(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
	EVP_PKEY pk;
 | 
			
		||||
	unsigned char tbs[] = "DSA Pairwise Check Data";
 | 
			
		||||
    	pk.type = EVP_PKEY_DSA;
 | 
			
		||||
    	pk.pkey.dsa = dsa;
 | 
			
		||||
	FILE *in;
 | 
			
		||||
	RSA *rsa=NULL;
 | 
			
		||||
	EVP_MD_CTX ctx;
 | 
			
		||||
	unsigned int mic=0,i,n;
 | 
			
		||||
	unsigned char buf[1024*15];
 | 
			
		||||
	char *prog,*infile=NULL,*outfile=NULL,*key=NULL;
 | 
			
		||||
	int badops=0;
 | 
			
		||||
 | 
			
		||||
	if (!fips_pkey_signature_test(&pk, tbs, -1,
 | 
			
		||||
					NULL, 0, EVP_dss1(), 0, NULL))
 | 
			
		||||
	apps_startup();
 | 
			
		||||
 | 
			
		||||
	prog=argv[0];
 | 
			
		||||
	argc--;
 | 
			
		||||
	argv++;
 | 
			
		||||
	while (argc >= 1)
 | 
			
		||||
		{
 | 
			
		||||
		FIPSerr(FIPS_F_FIPS_CHECK_DSA,FIPS_R_PAIRWISE_TEST_FAILED);
 | 
			
		||||
		fips_set_selftest_fail();
 | 
			
		||||
		return 0;
 | 
			
		||||
		}
 | 
			
		||||
	return 1;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
int DSA_generate_key(DSA *dsa)
 | 
			
		||||
	{
 | 
			
		||||
	if(dsa->meth->dsa_keygen)
 | 
			
		||||
		return dsa->meth->dsa_keygen(dsa);
 | 
			
		||||
	return dsa_builtin_keygen(dsa);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
static int dsa_builtin_keygen(DSA *dsa)
 | 
			
		||||
	{
 | 
			
		||||
	int ok=0;
 | 
			
		||||
	BN_CTX *ctx=NULL;
 | 
			
		||||
	BIGNUM *pub_key=NULL,*priv_key=NULL;
 | 
			
		||||
 | 
			
		||||
	if (FIPS_mode() && (BN_num_bits(dsa->p) < OPENSSL_DSA_FIPS_MIN_MODULUS_BITS))
 | 
			
		||||
		{
 | 
			
		||||
		DSAerr(DSA_F_DSA_BUILTIN_KEYGEN, DSA_R_KEY_SIZE_TOO_SMALL);
 | 
			
		||||
		goto err;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if ((ctx=BN_CTX_new()) == NULL) goto err;
 | 
			
		||||
 | 
			
		||||
	if (dsa->priv_key == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		if ((priv_key=BN_new()) == NULL) goto err;
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		priv_key=dsa->priv_key;
 | 
			
		||||
 | 
			
		||||
	do
 | 
			
		||||
		if (!BN_rand_range(priv_key,dsa->q)) goto err;
 | 
			
		||||
	while (BN_is_zero(priv_key));
 | 
			
		||||
 | 
			
		||||
	if (dsa->pub_key == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		if ((pub_key=BN_new()) == NULL) goto err;
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		pub_key=dsa->pub_key;
 | 
			
		||||
	
 | 
			
		||||
	{
 | 
			
		||||
		BIGNUM local_prk;
 | 
			
		||||
		BIGNUM *prk;
 | 
			
		||||
 | 
			
		||||
		if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0)
 | 
			
		||||
		if (strcmp(*argv,"-key") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			BN_init(&local_prk);
 | 
			
		||||
			prk = &local_prk;
 | 
			
		||||
			BN_with_flags(prk, priv_key, BN_FLG_CONSTTIME);
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			key= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-in") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			infile= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-out") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			outfile= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(*argv,"-mic") == 0)
 | 
			
		||||
			mic=1;
 | 
			
		||||
		else
 | 
			
		||||
			prk = priv_key;
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err,"unknown option %s\n",*argv);
 | 
			
		||||
			badops=1;
 | 
			
		||||
			break;
 | 
			
		||||
			}
 | 
			
		||||
		argc--;
 | 
			
		||||
		argv++;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if (!BN_mod_exp(pub_key,dsa->g,prk,dsa->p,ctx)) goto err;
 | 
			
		||||
	}
 | 
			
		||||
	if (badops)
 | 
			
		||||
		{
 | 
			
		||||
bad:
 | 
			
		||||
		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
 | 
			
		||||
		BIO_printf(bio_err,"where options  are\n");
 | 
			
		||||
		EXIT(1);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	dsa->priv_key=priv_key;
 | 
			
		||||
	dsa->pub_key=pub_key;
 | 
			
		||||
	if (fips_dsa_pairwise_fail)
 | 
			
		||||
		BN_add_word(dsa->pub_key, 1);
 | 
			
		||||
	if(!fips_check_dsa(dsa))
 | 
			
		||||
	    goto err;
 | 
			
		||||
	ok=1;
 | 
			
		||||
	if (key == NULL)
 | 
			
		||||
		{ BIO_printf(bio_err,"you need to specify a key\n"); EXIT(1); }
 | 
			
		||||
	in=fopen(key,"r");
 | 
			
		||||
	if (in == NULL) { perror(key); EXIT(1); }
 | 
			
		||||
	rsa=PEM_read_RSAPrivateKey(in,NULL,NULL);
 | 
			
		||||
	if (rsa == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err,"unable to load Private Key\n");
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		EXIT(1);
 | 
			
		||||
		}
 | 
			
		||||
	fclose(in);
 | 
			
		||||
 | 
			
		||||
	PEM_SignInit(&ctx,EVP_md5());
 | 
			
		||||
	for (;;)
 | 
			
		||||
		{
 | 
			
		||||
		i=fread(buf,1,1024*10,stdin);
 | 
			
		||||
		if (i <= 0) break;
 | 
			
		||||
		PEM_SignUpdate(&ctx,buf,i);
 | 
			
		||||
		}
 | 
			
		||||
	if (!PEM_SignFinal(&ctx,buf,&n,rsa)) goto err;
 | 
			
		||||
	BIO_printf(bio_err,"%s\n",buf);
 | 
			
		||||
	EXIT(0);
 | 
			
		||||
err:
 | 
			
		||||
	if ((pub_key != NULL) && (dsa->pub_key == NULL)) BN_free(pub_key);
 | 
			
		||||
	if ((priv_key != NULL) && (dsa->priv_key == NULL)) BN_free(priv_key);
 | 
			
		||||
	if (ctx != NULL) BN_CTX_free(ctx);
 | 
			
		||||
	return(ok);
 | 
			
		||||
	ERR_print_errors(bio_err);
 | 
			
		||||
	EXIT(1);
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
							
								
								
									
										550
									
								
								apps/pkcs12.c
									
									
									
									
									
								
							
							
						
						
									
										550
									
								
								apps/pkcs12.c
									
									
									
									
									
								
							@@ -1,9 +1,11 @@
 | 
			
		||||
/* pkcs12.c */
 | 
			
		||||
#if !defined(NO_DES) && !defined(NO_SHA1)
 | 
			
		||||
 | 
			
		||||
/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
 | 
			
		||||
 * project.
 | 
			
		||||
 * project 1999.
 | 
			
		||||
 */
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * Redistribution and use in source and binary forms, with or without
 | 
			
		||||
 * modification, are permitted provided that the following conditions
 | 
			
		||||
@@ -56,9 +58,6 @@
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include <openssl/opensslconf.h>
 | 
			
		||||
#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
 | 
			
		||||
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
@@ -70,7 +69,7 @@
 | 
			
		||||
 | 
			
		||||
#define PROG pkcs12_main
 | 
			
		||||
 | 
			
		||||
const EVP_CIPHER *enc;
 | 
			
		||||
EVP_CIPHER *enc;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#define NOKEYS		0x1
 | 
			
		||||
@@ -79,12 +78,11 @@ const EVP_CIPHER *enc;
 | 
			
		||||
#define CLCERTS		0x8
 | 
			
		||||
#define CACERTS		0x10
 | 
			
		||||
 | 
			
		||||
int get_cert_chain (X509 *cert, X509_STORE *store, STACK_OF(X509) **chain);
 | 
			
		||||
int get_cert_chain(X509 *cert, STACK_OF(X509) **chain);
 | 
			
		||||
int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass, int passlen, int options, char *pempass);
 | 
			
		||||
int dump_certs_pkeys_bags(BIO *out, STACK_OF(PKCS12_SAFEBAG) *bags, char *pass,
 | 
			
		||||
			  int passlen, int options, char *pempass);
 | 
			
		||||
int dump_certs_pkeys_bags(BIO *out, STACK *bags, char *pass, int passlen, int options, char *pempass);
 | 
			
		||||
int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, char *pass, int passlen, int options, char *pempass);
 | 
			
		||||
int print_attribs(BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name);
 | 
			
		||||
int print_attribs(BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst, char *name);
 | 
			
		||||
void hex_prin(BIO *out, unsigned char *buf, int len);
 | 
			
		||||
int alg_print(BIO *x, X509_ALGOR *alg);
 | 
			
		||||
int cert_load(BIO *in, STACK_OF(X509) *sk);
 | 
			
		||||
@@ -93,13 +91,11 @@ int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
{
 | 
			
		||||
    ENGINE *e = NULL;
 | 
			
		||||
    char *infile=NULL, *outfile=NULL, *keyname = NULL;	
 | 
			
		||||
    char *certfile=NULL;
 | 
			
		||||
    BIO *in=NULL, *out = NULL;
 | 
			
		||||
    BIO *in=NULL, *out = NULL, *inkey = NULL, *certsin = NULL;
 | 
			
		||||
    char **args;
 | 
			
		||||
    char *name = NULL;
 | 
			
		||||
    char *csp_name = NULL;
 | 
			
		||||
    PKCS12 *p12 = NULL;
 | 
			
		||||
    char pass[50], macpass[50];
 | 
			
		||||
    int export_cert = 0;
 | 
			
		||||
@@ -110,7 +106,7 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
    int maciter = PKCS12_DEFAULT_ITER;
 | 
			
		||||
    int twopass = 0;
 | 
			
		||||
    int keytype = 0;
 | 
			
		||||
    int cert_pbe;
 | 
			
		||||
    int cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC;
 | 
			
		||||
    int key_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
 | 
			
		||||
    int ret = 1;
 | 
			
		||||
    int macver = 1;
 | 
			
		||||
@@ -120,26 +116,12 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
    char *passargin = NULL, *passargout = NULL, *passarg = NULL;
 | 
			
		||||
    char *passin = NULL, *passout = NULL;
 | 
			
		||||
    char *inrand = NULL;
 | 
			
		||||
    char *CApath = NULL, *CAfile = NULL;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
    char *engine=NULL;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
    apps_startup();
 | 
			
		||||
 | 
			
		||||
#ifdef OPENSSL_FIPS
 | 
			
		||||
    if (FIPS_mode())
 | 
			
		||||
	cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
 | 
			
		||||
    else
 | 
			
		||||
#endif
 | 
			
		||||
    cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC;
 | 
			
		||||
 | 
			
		||||
    enc = EVP_des_ede3_cbc();
 | 
			
		||||
    if (bio_err == NULL ) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
    args = argv + 1;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -160,38 +142,20 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
    			cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
 | 
			
		||||
		else if (!strcmp (*args, "-export")) export_cert = 1;
 | 
			
		||||
		else if (!strcmp (*args, "-des")) enc=EVP_des_cbc();
 | 
			
		||||
		else if (!strcmp (*args, "-des3")) enc = EVP_des_ede3_cbc();
 | 
			
		||||
#ifndef OPENSSL_NO_IDEA
 | 
			
		||||
#ifndef NO_IDEA
 | 
			
		||||
		else if (!strcmp (*args, "-idea")) enc=EVP_idea_cbc();
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SEED
 | 
			
		||||
		else if (!strcmp(*args, "-seed")) enc=EVP_seed_cbc();
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_AES
 | 
			
		||||
		else if (!strcmp(*args,"-aes128")) enc=EVP_aes_128_cbc();
 | 
			
		||||
		else if (!strcmp(*args,"-aes192")) enc=EVP_aes_192_cbc();
 | 
			
		||||
		else if (!strcmp(*args,"-aes256")) enc=EVP_aes_256_cbc();
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAMELLIA
 | 
			
		||||
		else if (!strcmp(*args,"-camellia128")) enc=EVP_camellia_128_cbc();
 | 
			
		||||
		else if (!strcmp(*args,"-camellia192")) enc=EVP_camellia_192_cbc();
 | 
			
		||||
		else if (!strcmp(*args,"-camellia256")) enc=EVP_camellia_256_cbc();
 | 
			
		||||
#endif
 | 
			
		||||
		else if (!strcmp (*args, "-des3")) enc = EVP_des_ede3_cbc();
 | 
			
		||||
		else if (!strcmp (*args, "-noiter")) iter = 1;
 | 
			
		||||
		else if (!strcmp (*args, "-maciter"))
 | 
			
		||||
					 maciter = PKCS12_DEFAULT_ITER;
 | 
			
		||||
		else if (!strcmp (*args, "-nomaciter"))
 | 
			
		||||
					 maciter = 1;
 | 
			
		||||
		else if (!strcmp (*args, "-nomac"))
 | 
			
		||||
					 maciter = -1;
 | 
			
		||||
		else if (!strcmp (*args, "-nodes")) enc=NULL;
 | 
			
		||||
		else if (!strcmp (*args, "-certpbe")) {
 | 
			
		||||
			if (args[1]) {
 | 
			
		||||
				args++;
 | 
			
		||||
				if (!strcmp(*args, "NONE"))
 | 
			
		||||
					cert_pbe = -1;
 | 
			
		||||
				else
 | 
			
		||||
					cert_pbe=OBJ_txt2nid(*args);
 | 
			
		||||
				cert_pbe=OBJ_txt2nid(*args);
 | 
			
		||||
				if(cert_pbe == NID_undef) {
 | 
			
		||||
					BIO_printf(bio_err,
 | 
			
		||||
						 "Unknown PBE algorithm %s\n", *args);
 | 
			
		||||
@@ -201,10 +165,7 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		} else if (!strcmp (*args, "-keypbe")) {
 | 
			
		||||
			if (args[1]) {
 | 
			
		||||
				args++;
 | 
			
		||||
				if (!strcmp(*args, "NONE"))
 | 
			
		||||
					key_pbe = -1;
 | 
			
		||||
				else
 | 
			
		||||
					key_pbe=OBJ_txt2nid(*args);
 | 
			
		||||
				key_pbe=OBJ_txt2nid(*args);
 | 
			
		||||
				if(key_pbe == NID_undef) {
 | 
			
		||||
					BIO_printf(bio_err,
 | 
			
		||||
						 "Unknown PBE algorithm %s\n", *args);
 | 
			
		||||
@@ -231,15 +192,10 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			args++;	
 | 
			
		||||
			name = *args;
 | 
			
		||||
		    } else badarg = 1;
 | 
			
		||||
		} else if (!strcmp (*args, "-CSP")) {
 | 
			
		||||
		    if (args[1]) {
 | 
			
		||||
			args++;	
 | 
			
		||||
			csp_name = *args;
 | 
			
		||||
		    } else badarg = 1;
 | 
			
		||||
		} else if (!strcmp (*args, "-caname")) {
 | 
			
		||||
		    if (args[1]) {
 | 
			
		||||
			args++;	
 | 
			
		||||
			if (!canames) canames = sk_new_null();
 | 
			
		||||
			if (!canames) canames = sk_new(NULL);
 | 
			
		||||
			sk_push(canames, *args);
 | 
			
		||||
		    } else badarg = 1;
 | 
			
		||||
		} else if (!strcmp (*args, "-in")) {
 | 
			
		||||
@@ -268,23 +224,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			passarg = *args;
 | 
			
		||||
		    	noprompt = 1;
 | 
			
		||||
		    } else badarg = 1;
 | 
			
		||||
		} else if (!strcmp(*args,"-CApath")) {
 | 
			
		||||
		    if (args[1]) {
 | 
			
		||||
			args++;	
 | 
			
		||||
			CApath = *args;
 | 
			
		||||
		    } else badarg = 1;
 | 
			
		||||
		} else if (!strcmp(*args,"-CAfile")) {
 | 
			
		||||
		    if (args[1]) {
 | 
			
		||||
			args++;	
 | 
			
		||||
			CAfile = *args;
 | 
			
		||||
		    } else badarg = 1;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		} else if (!strcmp(*args,"-engine")) {
 | 
			
		||||
		    if (args[1]) {
 | 
			
		||||
			args++;	
 | 
			
		||||
			engine = *args;
 | 
			
		||||
		    } else badarg = 1;
 | 
			
		||||
#endif
 | 
			
		||||
		} else badarg = 1;
 | 
			
		||||
 | 
			
		||||
	} else badarg = 1;
 | 
			
		||||
@@ -298,8 +237,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	BIO_printf (bio_err, "-chain        add certificate chain\n");
 | 
			
		||||
	BIO_printf (bio_err, "-inkey file   private key if not infile\n");
 | 
			
		||||
	BIO_printf (bio_err, "-certfile f   add all certs in f\n");
 | 
			
		||||
	BIO_printf (bio_err, "-CApath arg   - PEM format directory of CA's\n");
 | 
			
		||||
	BIO_printf (bio_err, "-CAfile arg   - PEM format file of CA's\n");
 | 
			
		||||
	BIO_printf (bio_err, "-name \"name\"  use name as friendly name\n");
 | 
			
		||||
	BIO_printf (bio_err, "-caname \"nm\"  use nm as CA friendly name (can be used more than once).\n");
 | 
			
		||||
	BIO_printf (bio_err, "-in  infile   input filename\n");
 | 
			
		||||
@@ -313,19 +250,8 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	BIO_printf (bio_err, "-info         give info about PKCS#12 structure.\n");
 | 
			
		||||
	BIO_printf (bio_err, "-des          encrypt private keys with DES\n");
 | 
			
		||||
	BIO_printf (bio_err, "-des3         encrypt private keys with triple DES (default)\n");
 | 
			
		||||
#ifndef OPENSSL_NO_IDEA
 | 
			
		||||
#ifndef NO_IDEA
 | 
			
		||||
	BIO_printf (bio_err, "-idea         encrypt private keys with idea\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SEED
 | 
			
		||||
	BIO_printf (bio_err, "-seed         encrypt private keys with seed\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_AES
 | 
			
		||||
	BIO_printf (bio_err, "-aes128, -aes192, -aes256\n");
 | 
			
		||||
	BIO_printf (bio_err, "              encrypt PEM output with cbc aes\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAMELLIA
 | 
			
		||||
	BIO_printf (bio_err, "-camellia128, -camellia192, -camellia256\n");
 | 
			
		||||
	BIO_printf (bio_err, "              encrypt PEM output with cbc camellia\n");
 | 
			
		||||
#endif
 | 
			
		||||
	BIO_printf (bio_err, "-nodes        don't encrypt private keys\n");
 | 
			
		||||
	BIO_printf (bio_err, "-noiter       don't use encryption iteration\n");
 | 
			
		||||
@@ -339,19 +265,12 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	BIO_printf (bio_err, "-password p   set import/export password source\n");
 | 
			
		||||
	BIO_printf (bio_err, "-passin p     input file pass phrase source\n");
 | 
			
		||||
	BIO_printf (bio_err, "-passout p    output file pass phrase source\n");
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	BIO_printf (bio_err, "-engine e     use engine e, possibly a hardware device.\n");
 | 
			
		||||
#endif
 | 
			
		||||
	BIO_printf(bio_err,  "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 | 
			
		||||
	BIO_printf(bio_err,  "-rand file:file:...\n");
 | 
			
		||||
	BIO_printf(bio_err,  "              load the file (or the files in the directory) into\n");
 | 
			
		||||
	BIO_printf(bio_err,  "              the random number generator\n");
 | 
			
		||||
    	goto end;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
    e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
    if(passarg) {
 | 
			
		||||
	if(export_cert) passargout = passarg;
 | 
			
		||||
	else passargin = passarg;
 | 
			
		||||
@@ -396,20 +315,29 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	    goto end;
 | 
			
		||||
   }
 | 
			
		||||
 | 
			
		||||
   if (certfile) {
 | 
			
		||||
    	if(!(certsin = BIO_new_file(certfile, "r"))) {
 | 
			
		||||
	    BIO_printf(bio_err, "Can't open certificate file %s\n", certfile);
 | 
			
		||||
	    perror (certfile);
 | 
			
		||||
	    goto end;
 | 
			
		||||
	}
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (keyname) {
 | 
			
		||||
    	if(!(inkey = BIO_new_file(keyname, "r"))) {
 | 
			
		||||
	    BIO_printf(bio_err, "Can't key certificate file %s\n", keyname);
 | 
			
		||||
	    perror (keyname);
 | 
			
		||||
	    goto end;
 | 
			
		||||
	}
 | 
			
		||||
     }
 | 
			
		||||
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
    CRYPTO_pop_info();
 | 
			
		||||
    CRYPTO_push_info("write files");
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
    if (!outfile) {
 | 
			
		||||
	out = BIO_new_fp(stdout, BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
	{
 | 
			
		||||
	    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
	    out = BIO_push(tmpbio, out);
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
    } else out = BIO_new_file(outfile, "wb");
 | 
			
		||||
    if (!outfile) out = BIO_new_fp(stdout, BIO_NOCLOSE);
 | 
			
		||||
    else out = BIO_new_file(outfile, "wb");
 | 
			
		||||
    if (!out) {
 | 
			
		||||
	BIO_printf(bio_err, "Error opening output file %s\n",
 | 
			
		||||
						outfile ? outfile : "<stdout>");
 | 
			
		||||
@@ -420,7 +348,7 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
    CRYPTO_push_info("read MAC password");
 | 
			
		||||
#endif
 | 
			
		||||
	if(EVP_read_pw_string (macpass, sizeof macpass, "Enter MAC Password:", export_cert))
 | 
			
		||||
	if(EVP_read_pw_string (macpass, 50, "Enter MAC Password:", export_cert))
 | 
			
		||||
	{
 | 
			
		||||
    	    BIO_printf (bio_err, "Can't read Password\n");
 | 
			
		||||
    	    goto end;
 | 
			
		||||
@@ -431,196 +359,145 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (export_cert) {
 | 
			
		||||
	EVP_PKEY *key = NULL;
 | 
			
		||||
	X509 *ucert = NULL, *x = NULL;
 | 
			
		||||
	EVP_PKEY *key;
 | 
			
		||||
	STACK *bags, *safes;
 | 
			
		||||
	PKCS12_SAFEBAG *bag;
 | 
			
		||||
	PKCS8_PRIV_KEY_INFO *p8;
 | 
			
		||||
	PKCS7 *authsafe;
 | 
			
		||||
	X509 *ucert = NULL;
 | 
			
		||||
	STACK_OF(X509) *certs=NULL;
 | 
			
		||||
	unsigned char *catmp = NULL;
 | 
			
		||||
	char *catmp;
 | 
			
		||||
	int i;
 | 
			
		||||
 | 
			
		||||
	if ((options & (NOCERTS|NOKEYS)) == (NOCERTS|NOKEYS))
 | 
			
		||||
		{	
 | 
			
		||||
		BIO_printf(bio_err, "Nothing to do!\n");
 | 
			
		||||
		goto export_end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (options & NOCERTS)
 | 
			
		||||
		chain = 0;
 | 
			
		||||
	unsigned char keyid[EVP_MAX_MD_SIZE];
 | 
			
		||||
	unsigned int keyidlen = 0;
 | 
			
		||||
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
	CRYPTO_push_info("process -export_cert");
 | 
			
		||||
	CRYPTO_push_info("reading private key");
 | 
			
		||||
#endif
 | 
			
		||||
	if (!(options & NOKEYS))
 | 
			
		||||
		{
 | 
			
		||||
		key = load_key(bio_err, keyname ? keyname : infile,
 | 
			
		||||
				FORMAT_PEM, 1, passin, e, "private key");
 | 
			
		||||
		if (!key)
 | 
			
		||||
			goto export_end;
 | 
			
		||||
		}
 | 
			
		||||
	key = PEM_read_bio_PrivateKey(inkey ? inkey : in, NULL, NULL, passin);
 | 
			
		||||
	if (!inkey) (void) BIO_reset(in);
 | 
			
		||||
	else BIO_free(inkey);
 | 
			
		||||
	if (!key) {
 | 
			
		||||
		BIO_printf (bio_err, "Error loading private key\n");
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		goto end;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
	CRYPTO_pop_info();
 | 
			
		||||
	CRYPTO_push_info("reading certs from input");
 | 
			
		||||
#endif
 | 
			
		||||
	certs = sk_X509_new(NULL);
 | 
			
		||||
 | 
			
		||||
	/* Load in all certs in input file */
 | 
			
		||||
	if(!(options & NOCERTS))
 | 
			
		||||
		{
 | 
			
		||||
		certs = load_certs(bio_err, infile, FORMAT_PEM, NULL, e,
 | 
			
		||||
							"certificates");
 | 
			
		||||
		if (!certs)
 | 
			
		||||
			goto export_end;
 | 
			
		||||
 | 
			
		||||
		if (key)
 | 
			
		||||
			{
 | 
			
		||||
			/* Look for matching private key */
 | 
			
		||||
			for(i = 0; i < sk_X509_num(certs); i++)
 | 
			
		||||
				{
 | 
			
		||||
				x = sk_X509_value(certs, i);
 | 
			
		||||
				if(X509_check_private_key(x, key))
 | 
			
		||||
					{
 | 
			
		||||
					ucert = x;
 | 
			
		||||
					/* Zero keyid and alias */
 | 
			
		||||
					X509_keyid_set1(ucert, NULL, 0);
 | 
			
		||||
					X509_alias_set1(ucert, NULL, 0);
 | 
			
		||||
					/* Remove from list */
 | 
			
		||||
					sk_X509_delete(certs, i);
 | 
			
		||||
					break;
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			if (!ucert)
 | 
			
		||||
				{
 | 
			
		||||
				BIO_printf(bio_err, "No certificate matches private key\n");
 | 
			
		||||
				goto export_end;
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
	if(!cert_load(in, certs)) {
 | 
			
		||||
		BIO_printf(bio_err, "Error loading certificates from input\n");
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		goto end;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	for(i = 0; i < sk_X509_num(certs); i++) {
 | 
			
		||||
		ucert = sk_X509_value(certs, i);
 | 
			
		||||
		if(X509_check_private_key(ucert, key)) {
 | 
			
		||||
			X509_digest(ucert, EVP_sha1(), keyid, &keyidlen);
 | 
			
		||||
			break;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
	CRYPTO_pop_info();
 | 
			
		||||
	CRYPTO_push_info("reading certs from input 2");
 | 
			
		||||
#endif
 | 
			
		||||
	if(!keyidlen) {
 | 
			
		||||
		BIO_printf(bio_err, "No certificate matches private key\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	bags = sk_new (NULL);
 | 
			
		||||
 | 
			
		||||
	/* Add any more certificates asked for */
 | 
			
		||||
	if(certfile)
 | 
			
		||||
		{
 | 
			
		||||
		STACK_OF(X509) *morecerts=NULL;
 | 
			
		||||
		if(!(morecerts = load_certs(bio_err, certfile, FORMAT_PEM,
 | 
			
		||||
					    NULL, e,
 | 
			
		||||
					    "certificates from certfile")))
 | 
			
		||||
			goto export_end;
 | 
			
		||||
		while(sk_X509_num(morecerts) > 0)
 | 
			
		||||
			sk_X509_push(certs, sk_X509_shift(morecerts));
 | 
			
		||||
		sk_X509_free(morecerts);
 | 
			
		||||
 		}
 | 
			
		||||
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
	CRYPTO_pop_info();
 | 
			
		||||
	CRYPTO_push_info("reading certs from certfile");
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
	CRYPTO_pop_info();
 | 
			
		||||
	CRYPTO_push_info("building chain");
 | 
			
		||||
#endif
 | 
			
		||||
	if (certsin) {
 | 
			
		||||
		if(!cert_load(certsin, certs)) {
 | 
			
		||||
			BIO_printf(bio_err, "Error loading certificates from certfile\n");
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
			goto end;
 | 
			
		||||
		}
 | 
			
		||||
	    	BIO_free(certsin);
 | 
			
		||||
 	}
 | 
			
		||||
 | 
			
		||||
	/* If chaining get chain from user cert */
 | 
			
		||||
	if (chain) {
 | 
			
		||||
        	int vret;
 | 
			
		||||
		STACK_OF(X509) *chain2;
 | 
			
		||||
		X509_STORE *store = X509_STORE_new();
 | 
			
		||||
		if (!store)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf (bio_err, "Memory allocation error\n");
 | 
			
		||||
			goto export_end;
 | 
			
		||||
			}
 | 
			
		||||
		if (!X509_STORE_load_locations(store, CAfile, CApath))
 | 
			
		||||
			X509_STORE_set_default_paths (store);
 | 
			
		||||
 | 
			
		||||
		vret = get_cert_chain (ucert, store, &chain2);
 | 
			
		||||
		X509_STORE_free(store);
 | 
			
		||||
 | 
			
		||||
		if (!vret) {
 | 
			
		||||
		    /* Exclude verified certificate */
 | 
			
		||||
		    for (i = 1; i < sk_X509_num (chain2) ; i++) 
 | 
			
		||||
			sk_X509_push(certs, sk_X509_value (chain2, i));
 | 
			
		||||
		    /* Free first certificate */
 | 
			
		||||
		    X509_free(sk_X509_value(chain2, 0));
 | 
			
		||||
		    sk_X509_free(chain2);
 | 
			
		||||
		} else {
 | 
			
		||||
			if (vret >= 0)
 | 
			
		||||
				BIO_printf (bio_err, "Error %s getting chain.\n",
 | 
			
		||||
		vret = get_cert_chain (ucert, &chain2);
 | 
			
		||||
		if (vret) {
 | 
			
		||||
			BIO_printf (bio_err, "Error %s getting chain.\n",
 | 
			
		||||
					X509_verify_cert_error_string(vret));
 | 
			
		||||
			else
 | 
			
		||||
				ERR_print_errors(bio_err);
 | 
			
		||||
			goto export_end;
 | 
			
		||||
			goto end;
 | 
			
		||||
		}
 | 
			
		||||
		/* Exclude verified certificate */
 | 
			
		||||
		for (i = 1; i < sk_X509_num (chain2) ; i++) 
 | 
			
		||||
				 sk_X509_push(certs, sk_X509_value (chain2, i));
 | 
			
		||||
		sk_X509_free(chain2);
 | 
			
		||||
			
 | 
			
		||||
    	}
 | 
			
		||||
 | 
			
		||||
	/* Add any CA names */
 | 
			
		||||
 | 
			
		||||
	for (i = 0; i < sk_num(canames); i++)
 | 
			
		||||
		{
 | 
			
		||||
		catmp = (unsigned char *)sk_value(canames, i);
 | 
			
		||||
		X509_alias_set1(sk_X509_value(certs, i), catmp, -1);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (csp_name && key)
 | 
			
		||||
		EVP_PKEY_add1_attr_by_NID(key, NID_ms_csp_name,
 | 
			
		||||
				MBSTRING_ASC, (unsigned char *)csp_name, -1);
 | 
			
		||||
		
 | 
			
		||||
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
	CRYPTO_pop_info();
 | 
			
		||||
	CRYPTO_push_info("reading password");
 | 
			
		||||
#endif
 | 
			
		||||
	/* We now have loads of certificates: include them all */
 | 
			
		||||
	for(i = 0; i < sk_X509_num(certs); i++) {
 | 
			
		||||
		X509 *cert = NULL;
 | 
			
		||||
		cert = sk_X509_value(certs, i);
 | 
			
		||||
		bag = M_PKCS12_x5092certbag(cert);
 | 
			
		||||
		/* If it matches private key set id */
 | 
			
		||||
		if(cert == ucert) {
 | 
			
		||||
			if(name) PKCS12_add_friendlyname(bag, name, -1);
 | 
			
		||||
			PKCS12_add_localkeyid(bag, keyid, keyidlen);
 | 
			
		||||
		} else if((catmp = sk_shift(canames))) 
 | 
			
		||||
				PKCS12_add_friendlyname(bag, catmp, -1);
 | 
			
		||||
		sk_push(bags, (char *)bag);
 | 
			
		||||
	}
 | 
			
		||||
	sk_X509_pop_free(certs, X509_free);
 | 
			
		||||
	if (canames) sk_free(canames);
 | 
			
		||||
 | 
			
		||||
	if(!noprompt &&
 | 
			
		||||
		EVP_read_pw_string(pass, sizeof pass, "Enter Export Password:", 1))
 | 
			
		||||
		{
 | 
			
		||||
	    	BIO_printf (bio_err, "Can't read Password\n");
 | 
			
		||||
	    	goto export_end;
 | 
			
		||||
        	}
 | 
			
		||||
	if (!twopass) BUF_strlcpy(macpass, pass, sizeof macpass);
 | 
			
		||||
		EVP_read_pw_string(pass, 50, "Enter Export Password:", 1)) {
 | 
			
		||||
	    BIO_printf (bio_err, "Can't read Password\n");
 | 
			
		||||
	    goto end;
 | 
			
		||||
        }
 | 
			
		||||
	if (!twopass) strcpy(macpass, pass);
 | 
			
		||||
	/* Turn certbags into encrypted authsafe */
 | 
			
		||||
	authsafe = PKCS12_pack_p7encdata(cert_pbe, cpass, -1, NULL, 0,
 | 
			
		||||
								 iter, bags);
 | 
			
		||||
	sk_pop_free(bags, PKCS12_SAFEBAG_free);
 | 
			
		||||
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
	CRYPTO_pop_info();
 | 
			
		||||
	CRYPTO_push_info("creating PKCS#12 structure");
 | 
			
		||||
#endif
 | 
			
		||||
	if (!authsafe) {
 | 
			
		||||
		ERR_print_errors (bio_err);
 | 
			
		||||
		goto end;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	p12 = PKCS12_create(cpass, name, key, ucert, certs,
 | 
			
		||||
				key_pbe, cert_pbe, iter, -1, keytype);
 | 
			
		||||
	safes = sk_new (NULL);
 | 
			
		||||
	sk_push (safes, (char *)authsafe);
 | 
			
		||||
 | 
			
		||||
	if (!p12)
 | 
			
		||||
		{
 | 
			
		||||
	    	ERR_print_errors (bio_err);
 | 
			
		||||
		goto export_end;
 | 
			
		||||
		}
 | 
			
		||||
	/* Make a shrouded key bag */
 | 
			
		||||
	p8 = EVP_PKEY2PKCS8 (key);
 | 
			
		||||
	EVP_PKEY_free(key);
 | 
			
		||||
	if(keytype) PKCS8_add_keyusage(p8, keytype);
 | 
			
		||||
	bag = PKCS12_MAKE_SHKEYBAG(key_pbe, cpass, -1, NULL, 0, iter, p8);
 | 
			
		||||
	PKCS8_PRIV_KEY_INFO_free(p8);
 | 
			
		||||
        if (name) PKCS12_add_friendlyname (bag, name, -1);
 | 
			
		||||
	PKCS12_add_localkeyid (bag, keyid, keyidlen);
 | 
			
		||||
	bags = sk_new(NULL);
 | 
			
		||||
	sk_push (bags, (char *)bag);
 | 
			
		||||
	/* Turn it into unencrypted safe bag */
 | 
			
		||||
	authsafe = PKCS12_pack_p7data (bags);
 | 
			
		||||
	sk_pop_free(bags, PKCS12_SAFEBAG_free);
 | 
			
		||||
	sk_push (safes, (char *)authsafe);
 | 
			
		||||
 | 
			
		||||
	if (maciter != -1)
 | 
			
		||||
		PKCS12_set_mac(p12, mpass, -1, NULL, 0, maciter, NULL);
 | 
			
		||||
	p12 = PKCS12_init (NID_pkcs7_data);
 | 
			
		||||
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
	CRYPTO_pop_info();
 | 
			
		||||
	CRYPTO_push_info("writing pkcs12");
 | 
			
		||||
#endif
 | 
			
		||||
	M_PKCS12_pack_authsafes (p12, safes);
 | 
			
		||||
 | 
			
		||||
	i2d_PKCS12_bio(out, p12);
 | 
			
		||||
	sk_pop_free(safes, PKCS7_free);
 | 
			
		||||
 | 
			
		||||
	PKCS12_set_mac (p12, mpass, -1, NULL, 0, maciter, NULL);
 | 
			
		||||
 | 
			
		||||
	i2d_PKCS12_bio (out, p12);
 | 
			
		||||
 | 
			
		||||
	PKCS12_free(p12);
 | 
			
		||||
 | 
			
		||||
	ret = 0;
 | 
			
		||||
 | 
			
		||||
    export_end:
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
	CRYPTO_pop_info();
 | 
			
		||||
	CRYPTO_pop_info();
 | 
			
		||||
	CRYPTO_push_info("process -export_cert: freeing");
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	if (key) EVP_PKEY_free(key);
 | 
			
		||||
	if (certs) sk_X509_pop_free(certs, X509_free);
 | 
			
		||||
	if (ucert) X509_free(ucert);
 | 
			
		||||
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
	CRYPTO_pop_info();
 | 
			
		||||
#endif
 | 
			
		||||
@@ -636,7 +513,7 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
    CRYPTO_push_info("read import password");
 | 
			
		||||
#endif
 | 
			
		||||
    if(!noprompt && EVP_read_pw_string(pass, sizeof pass, "Enter Import Password:", 0)) {
 | 
			
		||||
    if(!noprompt && EVP_read_pw_string(pass, 50, "Enter Import Password:", 0)) {
 | 
			
		||||
	BIO_printf (bio_err, "Can't read Password\n");
 | 
			
		||||
	goto end;
 | 
			
		||||
    }
 | 
			
		||||
@@ -644,23 +521,18 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
    CRYPTO_pop_info();
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
    if (!twopass) BUF_strlcpy(macpass, pass, sizeof macpass);
 | 
			
		||||
    if (!twopass) strcpy(macpass, pass);
 | 
			
		||||
 | 
			
		||||
    if (options & INFO) BIO_printf (bio_err, "MAC Iteration %ld\n", p12->mac->iter ? ASN1_INTEGER_get (p12->mac->iter) : 1);
 | 
			
		||||
    if(macver) {
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
    CRYPTO_push_info("verify MAC");
 | 
			
		||||
#endif
 | 
			
		||||
	/* If we enter empty password try no password first */
 | 
			
		||||
	if(!mpass[0] && PKCS12_verify_mac(p12, NULL, 0)) {
 | 
			
		||||
		/* If mac and crypto pass the same set it to NULL too */
 | 
			
		||||
		if(!twopass) cpass = NULL;
 | 
			
		||||
	} else if (!PKCS12_verify_mac(p12, mpass, -1)) {
 | 
			
		||||
	if (!PKCS12_verify_mac (p12, mpass, -1)) {
 | 
			
		||||
	    BIO_printf (bio_err, "Mac verify error: invalid password?\n");
 | 
			
		||||
	    ERR_print_errors (bio_err);
 | 
			
		||||
	    goto end;
 | 
			
		||||
	}
 | 
			
		||||
	BIO_printf (bio_err, "MAC verified OK\n");
 | 
			
		||||
	} else BIO_printf (bio_err, "MAC verified OK\n");
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
    CRYPTO_pop_info();
 | 
			
		||||
#endif
 | 
			
		||||
@@ -677,74 +549,61 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
    CRYPTO_pop_info();
 | 
			
		||||
#endif
 | 
			
		||||
    PKCS12_free(p12);
 | 
			
		||||
    ret = 0;
 | 
			
		||||
 end:
 | 
			
		||||
    if (p12) PKCS12_free(p12);
 | 
			
		||||
    end:
 | 
			
		||||
    if(export_cert || inrand) app_RAND_write_file(NULL, bio_err);
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
    CRYPTO_remove_all_info();
 | 
			
		||||
#endif
 | 
			
		||||
    BIO_free(in);
 | 
			
		||||
    BIO_free_all(out);
 | 
			
		||||
    if (canames) sk_free(canames);
 | 
			
		||||
    if(passin) OPENSSL_free(passin);
 | 
			
		||||
    if(passout) OPENSSL_free(passout);
 | 
			
		||||
    apps_shutdown();
 | 
			
		||||
    OPENSSL_EXIT(ret);
 | 
			
		||||
    BIO_free(out);
 | 
			
		||||
    if(passin) Free(passin);
 | 
			
		||||
    if(passout) Free(passout);
 | 
			
		||||
    EXIT(ret);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,
 | 
			
		||||
	     int passlen, int options, char *pempass)
 | 
			
		||||
{
 | 
			
		||||
	STACK_OF(PKCS7) *asafes = NULL;
 | 
			
		||||
	STACK_OF(PKCS12_SAFEBAG) *bags;
 | 
			
		||||
	STACK *asafes, *bags;
 | 
			
		||||
	int i, bagnid;
 | 
			
		||||
	int ret = 0;
 | 
			
		||||
	PKCS7 *p7;
 | 
			
		||||
 | 
			
		||||
	if (!( asafes = PKCS12_unpack_authsafes(p12))) return 0;
 | 
			
		||||
	for (i = 0; i < sk_PKCS7_num (asafes); i++) {
 | 
			
		||||
		p7 = sk_PKCS7_value (asafes, i);
 | 
			
		||||
	if (!( asafes = M_PKCS12_unpack_authsafes (p12))) return 0;
 | 
			
		||||
	for (i = 0; i < sk_num (asafes); i++) {
 | 
			
		||||
		p7 = (PKCS7 *) sk_value (asafes, i);
 | 
			
		||||
		bagnid = OBJ_obj2nid (p7->type);
 | 
			
		||||
		if (bagnid == NID_pkcs7_data) {
 | 
			
		||||
			bags = PKCS12_unpack_p7data(p7);
 | 
			
		||||
			bags = M_PKCS12_unpack_p7data (p7);
 | 
			
		||||
			if (options & INFO) BIO_printf (bio_err, "PKCS7 Data\n");
 | 
			
		||||
		} else if (bagnid == NID_pkcs7_encrypted) {
 | 
			
		||||
			if (options & INFO) {
 | 
			
		||||
				BIO_printf(bio_err, "PKCS7 Encrypted data: ");
 | 
			
		||||
				alg_print(bio_err, 
 | 
			
		||||
				BIO_printf (bio_err, "PKCS7 Encrypted data: ");
 | 
			
		||||
				alg_print (bio_err, 
 | 
			
		||||
					p7->d.encrypted->enc_data->algorithm);
 | 
			
		||||
			}
 | 
			
		||||
			bags = PKCS12_unpack_p7encdata(p7, pass, passlen);
 | 
			
		||||
			bags = M_PKCS12_unpack_p7encdata (p7, pass, passlen);
 | 
			
		||||
		} else continue;
 | 
			
		||||
		if (!bags) goto err;
 | 
			
		||||
		if (!bags) return 0;
 | 
			
		||||
	    	if (!dump_certs_pkeys_bags (out, bags, pass, passlen, 
 | 
			
		||||
						 options, pempass)) {
 | 
			
		||||
			sk_PKCS12_SAFEBAG_pop_free (bags, PKCS12_SAFEBAG_free);
 | 
			
		||||
			goto err;
 | 
			
		||||
			sk_pop_free (bags, PKCS12_SAFEBAG_free);
 | 
			
		||||
			return 0;
 | 
			
		||||
		}
 | 
			
		||||
		sk_PKCS12_SAFEBAG_pop_free (bags, PKCS12_SAFEBAG_free);
 | 
			
		||||
		bags = NULL;
 | 
			
		||||
		sk_pop_free (bags, PKCS12_SAFEBAG_free);
 | 
			
		||||
	}
 | 
			
		||||
	ret = 1;
 | 
			
		||||
 | 
			
		||||
	err:
 | 
			
		||||
 | 
			
		||||
	if (asafes)
 | 
			
		||||
		sk_PKCS7_pop_free (asafes, PKCS7_free);
 | 
			
		||||
	return ret;
 | 
			
		||||
	sk_pop_free (asafes, PKCS7_free);
 | 
			
		||||
	return 1;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int dump_certs_pkeys_bags (BIO *out, STACK_OF(PKCS12_SAFEBAG) *bags,
 | 
			
		||||
			   char *pass, int passlen, int options, char *pempass)
 | 
			
		||||
int dump_certs_pkeys_bags (BIO *out, STACK *bags, char *pass,
 | 
			
		||||
	     int passlen, int options, char *pempass)
 | 
			
		||||
{
 | 
			
		||||
	int i;
 | 
			
		||||
	for (i = 0; i < sk_PKCS12_SAFEBAG_num (bags); i++) {
 | 
			
		||||
	for (i = 0; i < sk_num (bags); i++) {
 | 
			
		||||
		if (!dump_certs_pkeys_bag (out,
 | 
			
		||||
					   sk_PKCS12_SAFEBAG_value (bags, i),
 | 
			
		||||
					   pass, passlen,
 | 
			
		||||
					   options, pempass))
 | 
			
		||||
		    return 0;
 | 
			
		||||
			 (PKCS12_SAFEBAG *)sk_value (bags, i), pass, passlen,
 | 
			
		||||
					 	options, pempass)) return 0;
 | 
			
		||||
	}
 | 
			
		||||
	return 1;
 | 
			
		||||
}
 | 
			
		||||
@@ -776,12 +635,9 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
 | 
			
		||||
		}
 | 
			
		||||
		if (options & NOKEYS) return 1;
 | 
			
		||||
		print_attribs (out, bag->attrib, "Bag Attributes");
 | 
			
		||||
		if (!(p8 = PKCS12_decrypt_skey(bag, pass, passlen)))
 | 
			
		||||
		if (!(p8 = M_PKCS12_decrypt_skey (bag, pass, passlen)))
 | 
			
		||||
				return 0;
 | 
			
		||||
		if (!(pkey = EVP_PKCS82PKEY (p8))) {
 | 
			
		||||
			PKCS8_PRIV_KEY_INFO_free(p8);
 | 
			
		||||
			return 0;
 | 
			
		||||
		}
 | 
			
		||||
		if (!(pkey = EVP_PKCS82PKEY (p8))) return 0;
 | 
			
		||||
		print_attribs (out, p8->attributes, "Key Attributes");
 | 
			
		||||
		PKCS8_PRIV_KEY_INFO_free(p8);
 | 
			
		||||
		PEM_write_bio_PrivateKey (out, pkey, enc, NULL, 0, NULL, pempass);
 | 
			
		||||
@@ -797,7 +653,7 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
 | 
			
		||||
		print_attribs (out, bag->attrib, "Bag Attributes");
 | 
			
		||||
		if (M_PKCS12_cert_bag_type(bag) != NID_x509Certificate )
 | 
			
		||||
								 return 1;
 | 
			
		||||
		if (!(x509 = PKCS12_certbag2x509(bag))) return 0;
 | 
			
		||||
		if (!(x509 = M_PKCS12_certbag2x509(bag))) return 0;
 | 
			
		||||
		dump_cert_text (out, x509);
 | 
			
		||||
		PEM_write_bio_X509 (out, x509);
 | 
			
		||||
		X509_free(x509);
 | 
			
		||||
@@ -823,29 +679,26 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
 | 
			
		||||
 | 
			
		||||
/* Hope this is OK .... */
 | 
			
		||||
 | 
			
		||||
int get_cert_chain (X509 *cert, X509_STORE *store, STACK_OF(X509) **chain)
 | 
			
		||||
int get_cert_chain (X509 *cert, STACK_OF(X509) **chain)
 | 
			
		||||
{
 | 
			
		||||
	X509_STORE *store;
 | 
			
		||||
	X509_STORE_CTX store_ctx;
 | 
			
		||||
	STACK_OF(X509) *chn;
 | 
			
		||||
	int i = 0;
 | 
			
		||||
	int i;
 | 
			
		||||
 | 
			
		||||
	/* FIXME: Should really check the return status of X509_STORE_CTX_init
 | 
			
		||||
	 * for an error, but how that fits into the return value of this
 | 
			
		||||
	 * function is less obvious. */
 | 
			
		||||
	store = X509_STORE_new ();
 | 
			
		||||
	X509_STORE_set_default_paths (store);
 | 
			
		||||
	X509_STORE_CTX_init(&store_ctx, store, cert, NULL);
 | 
			
		||||
	if (X509_verify_cert(&store_ctx) <= 0) {
 | 
			
		||||
		i = X509_STORE_CTX_get_error (&store_ctx);
 | 
			
		||||
		if (i == 0)
 | 
			
		||||
			/* avoid returning 0 if X509_verify_cert() did not
 | 
			
		||||
			 * set an appropriate error value in the context */
 | 
			
		||||
			i = -1;
 | 
			
		||||
		chn = NULL;
 | 
			
		||||
		goto err;
 | 
			
		||||
	} else
 | 
			
		||||
		chn = X509_STORE_CTX_get1_chain(&store_ctx);
 | 
			
		||||
	}
 | 
			
		||||
	chn =  X509_STORE_CTX_get1_chain(&store_ctx);
 | 
			
		||||
	i = 0;
 | 
			
		||||
	*chain = chn;
 | 
			
		||||
err:
 | 
			
		||||
	X509_STORE_CTX_cleanup(&store_ctx);
 | 
			
		||||
	*chain = chn;
 | 
			
		||||
	X509_STORE_free(store);
 | 
			
		||||
	
 | 
			
		||||
	return i;
 | 
			
		||||
}	
 | 
			
		||||
@@ -853,16 +706,13 @@ err:
 | 
			
		||||
int alg_print (BIO *x, X509_ALGOR *alg)
 | 
			
		||||
{
 | 
			
		||||
	PBEPARAM *pbe;
 | 
			
		||||
	const unsigned char *p;
 | 
			
		||||
	unsigned char *p;
 | 
			
		||||
	p = alg->parameter->value.sequence->data;
 | 
			
		||||
	pbe = d2i_PBEPARAM(NULL, &p, alg->parameter->value.sequence->length);
 | 
			
		||||
	if (!pbe)
 | 
			
		||||
		return 1;
 | 
			
		||||
	BIO_printf (bio_err, "%s, Iteration %ld\n", 
 | 
			
		||||
		OBJ_nid2ln(OBJ_obj2nid(alg->algorithm)),
 | 
			
		||||
		ASN1_INTEGER_get(pbe->iter));
 | 
			
		||||
	pbe = d2i_PBEPARAM (NULL, &p, alg->parameter->value.sequence->length);
 | 
			
		||||
	BIO_printf (bio_err, "%s, Iteration %d\n", 
 | 
			
		||||
	OBJ_nid2ln(OBJ_obj2nid(alg->algorithm)), ASN1_INTEGER_get(pbe->iter));
 | 
			
		||||
	PBEPARAM_free (pbe);
 | 
			
		||||
	return 1;
 | 
			
		||||
	return 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* Load all certificates from a given file */
 | 
			
		||||
@@ -872,29 +722,17 @@ int cert_load(BIO *in, STACK_OF(X509) *sk)
 | 
			
		||||
	int ret;
 | 
			
		||||
	X509 *cert;
 | 
			
		||||
	ret = 0;
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
	CRYPTO_push_info("cert_load(): reading one cert");
 | 
			
		||||
#endif
 | 
			
		||||
	while((cert = PEM_read_bio_X509(in, NULL, NULL, NULL))) {
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
		CRYPTO_pop_info();
 | 
			
		||||
#endif
 | 
			
		||||
		ret = 1;
 | 
			
		||||
		sk_X509_push(sk, cert);
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
		CRYPTO_push_info("cert_load(): reading one cert");
 | 
			
		||||
#endif
 | 
			
		||||
	}
 | 
			
		||||
#ifdef CRYPTO_MDEBUG
 | 
			
		||||
	CRYPTO_pop_info();
 | 
			
		||||
#endif
 | 
			
		||||
	if(ret) ERR_clear_error();
 | 
			
		||||
	return ret;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* Generalised attribute print: handle PKCS#8 and bag attributes */
 | 
			
		||||
 | 
			
		||||
int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name)
 | 
			
		||||
int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst, char *name)
 | 
			
		||||
{
 | 
			
		||||
	X509_ATTRIBUTE *attr;
 | 
			
		||||
	ASN1_TYPE *av;
 | 
			
		||||
@@ -925,18 +763,18 @@ int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name)
 | 
			
		||||
        			value = uni2asc(av->value.bmpstring->data,
 | 
			
		||||
                                	       av->value.bmpstring->length);
 | 
			
		||||
				BIO_printf(out, "%s\n", value);
 | 
			
		||||
				OPENSSL_free(value);
 | 
			
		||||
				Free(value);
 | 
			
		||||
				break;
 | 
			
		||||
 | 
			
		||||
				case V_ASN1_OCTET_STRING:
 | 
			
		||||
				hex_prin(out, av->value.octet_string->data,
 | 
			
		||||
					av->value.octet_string->length);
 | 
			
		||||
				hex_prin(out, av->value.bit_string->data,
 | 
			
		||||
					av->value.bit_string->length);
 | 
			
		||||
				BIO_printf(out, "\n");	
 | 
			
		||||
				break;
 | 
			
		||||
 | 
			
		||||
				case V_ASN1_BIT_STRING:
 | 
			
		||||
				hex_prin(out, av->value.bit_string->data,
 | 
			
		||||
					av->value.bit_string->length);
 | 
			
		||||
				hex_prin(out, av->value.octet_string->data,
 | 
			
		||||
					av->value.octet_string->length);
 | 
			
		||||
				BIO_printf(out, "\n");	
 | 
			
		||||
				break;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										41
									
								
								apps/pkcs7.c
									
									
									
									
									
								
							
							
						
						
									
										41
									
								
								apps/pkcs7.c
									
									
									
									
									
								
							@@ -82,19 +82,13 @@ int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	ENGINE *e = NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	PKCS7 *p7=NULL;
 | 
			
		||||
	int i,badops=0;
 | 
			
		||||
	BIO *in=NULL,*out=NULL;
 | 
			
		||||
	int informat,outformat;
 | 
			
		||||
	char *infile,*outfile,*prog;
 | 
			
		||||
	int print_certs=0,text=0,noout=0;
 | 
			
		||||
	int ret=1;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	char *engine=NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	int ret=0;
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
 | 
			
		||||
@@ -102,9 +96,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
	infile=NULL;
 | 
			
		||||
	outfile=NULL;
 | 
			
		||||
	informat=FORMAT_PEM;
 | 
			
		||||
@@ -141,13 +132,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			text=1;
 | 
			
		||||
		else if (strcmp(*argv,"-print_certs") == 0)
 | 
			
		||||
			print_certs=1;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		else if (strcmp(*argv,"-engine") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			engine= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err,"unknown option %s\n",*argv);
 | 
			
		||||
@@ -170,19 +154,11 @@ bad:
 | 
			
		||||
		BIO_printf(bio_err," -print_certs  print any certs or crl in the input\n");
 | 
			
		||||
		BIO_printf(bio_err," -text         print full details of certificates\n");
 | 
			
		||||
		BIO_printf(bio_err," -noout        don't output encoded data\n");
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
 | 
			
		||||
#endif
 | 
			
		||||
		ret = 1;
 | 
			
		||||
		goto end;
 | 
			
		||||
		EXIT(1);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	ERR_load_crypto_strings();
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
        e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	in=BIO_new(BIO_s_file());
 | 
			
		||||
	out=BIO_new(BIO_s_file());
 | 
			
		||||
	if ((in == NULL) || (out == NULL))
 | 
			
		||||
@@ -220,15 +196,7 @@ bad:
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (outfile == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_write_filename(out,outfile) <= 0)
 | 
			
		||||
@@ -312,7 +280,6 @@ bad:
 | 
			
		||||
end:
 | 
			
		||||
	if (p7 != NULL) PKCS7_free(p7);
 | 
			
		||||
	if (in != NULL) BIO_free(in);
 | 
			
		||||
	if (out != NULL) BIO_free_all(out);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	if (out != NULL) BIO_free(out);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										367
									
								
								apps/pkcs8.c
									
									
									
									
									
								
							
							
						
						
									
										367
									
								
								apps/pkcs8.c
									
									
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
			
		||||
/* pkcs8.c */
 | 
			
		||||
/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
 | 
			
		||||
 * project 1999-2004.
 | 
			
		||||
 * project 1999.
 | 
			
		||||
 */
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
@@ -63,13 +63,13 @@
 | 
			
		||||
#include <openssl/evp.h>
 | 
			
		||||
#include <openssl/pkcs12.h>
 | 
			
		||||
 | 
			
		||||
#include "apps.h"
 | 
			
		||||
#define PROG pkcs8_main
 | 
			
		||||
 | 
			
		||||
int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
	ENGINE *e = NULL;
 | 
			
		||||
{
 | 
			
		||||
	char **args, *infile = NULL, *outfile = NULL;
 | 
			
		||||
	char *passargin = NULL, *passargout = NULL;
 | 
			
		||||
	BIO *in = NULL, *out = NULL;
 | 
			
		||||
@@ -82,88 +82,52 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	int nocrypt = 0;
 | 
			
		||||
	X509_SIG *p8;
 | 
			
		||||
	PKCS8_PRIV_KEY_INFO *p8inf;
 | 
			
		||||
	EVP_PKEY *pkey=NULL;
 | 
			
		||||
	EVP_PKEY *pkey;
 | 
			
		||||
	char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL;
 | 
			
		||||
	int badarg = 0;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	char *engine=NULL;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
	informat=FORMAT_PEM;
 | 
			
		||||
	outformat=FORMAT_PEM;
 | 
			
		||||
 | 
			
		||||
	ERR_load_crypto_strings();
 | 
			
		||||
	OpenSSL_add_all_algorithms();
 | 
			
		||||
	args = argv + 1;
 | 
			
		||||
	while (!badarg && *args && *args[0] == '-')
 | 
			
		||||
		{
 | 
			
		||||
		if (!strcmp(*args,"-v2"))
 | 
			
		||||
			{
 | 
			
		||||
			if (args[1])
 | 
			
		||||
				{
 | 
			
		||||
	while (!badarg && *args && *args[0] == '-') {
 | 
			
		||||
		if (!strcmp(*args,"-v2")) {
 | 
			
		||||
			if (args[1]) {
 | 
			
		||||
				args++;
 | 
			
		||||
				cipher=EVP_get_cipherbyname(*args);
 | 
			
		||||
				if (!cipher)
 | 
			
		||||
					{
 | 
			
		||||
				if(!cipher) {
 | 
			
		||||
					BIO_printf(bio_err,
 | 
			
		||||
						 "Unknown cipher %s\n", *args);
 | 
			
		||||
					badarg = 1;
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			else
 | 
			
		||||
				badarg = 1;
 | 
			
		||||
			}
 | 
			
		||||
		else if (!strcmp(*args,"-v1"))
 | 
			
		||||
			{
 | 
			
		||||
			if (args[1])
 | 
			
		||||
				{
 | 
			
		||||
			} else badarg = 1;
 | 
			
		||||
		} else if (!strcmp(*args,"-v1")) {
 | 
			
		||||
			if (args[1]) {
 | 
			
		||||
				args++;
 | 
			
		||||
				pbe_nid=OBJ_txt2nid(*args);
 | 
			
		||||
				if (pbe_nid == NID_undef)
 | 
			
		||||
					{
 | 
			
		||||
				if(pbe_nid == NID_undef) {
 | 
			
		||||
					BIO_printf(bio_err,
 | 
			
		||||
						 "Unknown PBE algorithm %s\n", *args);
 | 
			
		||||
					badarg = 1;
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			else
 | 
			
		||||
				badarg = 1;
 | 
			
		||||
			}
 | 
			
		||||
		else if (!strcmp(*args,"-inform"))
 | 
			
		||||
			{
 | 
			
		||||
			if (args[1])
 | 
			
		||||
				{
 | 
			
		||||
			} else badarg = 1;
 | 
			
		||||
		} else if (!strcmp(*args,"-inform")) {
 | 
			
		||||
			if (args[1]) {
 | 
			
		||||
				args++;
 | 
			
		||||
				informat=str2fmt(*args);
 | 
			
		||||
				}
 | 
			
		||||
			else badarg = 1;
 | 
			
		||||
			}
 | 
			
		||||
		else if (!strcmp(*args,"-outform"))
 | 
			
		||||
			{
 | 
			
		||||
			if (args[1])
 | 
			
		||||
				{
 | 
			
		||||
			} else badarg = 1;
 | 
			
		||||
		} else if (!strcmp(*args,"-outform")) {
 | 
			
		||||
			if (args[1]) {
 | 
			
		||||
				args++;
 | 
			
		||||
				outformat=str2fmt(*args);
 | 
			
		||||
				}
 | 
			
		||||
			else badarg = 1;
 | 
			
		||||
			}
 | 
			
		||||
		else if (!strcmp (*args, "-topk8"))
 | 
			
		||||
			topk8 = 1;
 | 
			
		||||
		else if (!strcmp (*args, "-noiter"))
 | 
			
		||||
			iter = 1;
 | 
			
		||||
		else if (!strcmp (*args, "-nocrypt"))
 | 
			
		||||
			nocrypt = 1;
 | 
			
		||||
		else if (!strcmp (*args, "-nooct"))
 | 
			
		||||
			p8_broken = PKCS8_NO_OCTET;
 | 
			
		||||
		else if (!strcmp (*args, "-nsdb"))
 | 
			
		||||
			p8_broken = PKCS8_NS_DB;
 | 
			
		||||
		else if (!strcmp (*args, "-embed"))
 | 
			
		||||
			p8_broken = PKCS8_EMBEDDED_PARAM;
 | 
			
		||||
			} else badarg = 1;
 | 
			
		||||
		} else if (!strcmp (*args, "-topk8")) topk8 = 1;
 | 
			
		||||
		else if (!strcmp (*args, "-noiter")) iter = 1;
 | 
			
		||||
		else if (!strcmp (*args, "-nocrypt")) nocrypt = 1;
 | 
			
		||||
		else if (!strcmp (*args, "-nooct")) p8_broken = PKCS8_NO_OCTET;
 | 
			
		||||
		else if (!strcmp (*args, "-nsdb")) p8_broken = PKCS8_NS_DB;
 | 
			
		||||
		else if (!strcmp (*args, "-embed")) p8_broken = PKCS8_EMBEDDED_PARAM;
 | 
			
		||||
		else if (!strcmp(*args,"-passin"))
 | 
			
		||||
			{
 | 
			
		||||
			if (!args[1]) goto bad;
 | 
			
		||||
@@ -174,37 +138,21 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			if (!args[1]) goto bad;
 | 
			
		||||
			passargout= *(++args);
 | 
			
		||||
			}
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		else if (strcmp(*args,"-engine") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (!args[1]) goto bad;
 | 
			
		||||
			engine= *(++args);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
		else if (!strcmp (*args, "-in"))
 | 
			
		||||
			{
 | 
			
		||||
			if (args[1])
 | 
			
		||||
				{
 | 
			
		||||
		else if (!strcmp (*args, "-in")) {
 | 
			
		||||
			if (args[1]) {
 | 
			
		||||
				args++;
 | 
			
		||||
				infile = *args;
 | 
			
		||||
				}
 | 
			
		||||
			else badarg = 1;
 | 
			
		||||
			}
 | 
			
		||||
		else if (!strcmp (*args, "-out"))
 | 
			
		||||
			{
 | 
			
		||||
			if (args[1])
 | 
			
		||||
				{
 | 
			
		||||
			} else badarg = 1;
 | 
			
		||||
		} else if (!strcmp (*args, "-out")) {
 | 
			
		||||
			if (args[1]) {
 | 
			
		||||
				args++;
 | 
			
		||||
				outfile = *args;
 | 
			
		||||
				}
 | 
			
		||||
			else badarg = 1;
 | 
			
		||||
			}
 | 
			
		||||
		else badarg = 1;
 | 
			
		||||
			} else badarg = 1;
 | 
			
		||||
		} else badarg = 1;
 | 
			
		||||
		args++;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (badarg)
 | 
			
		||||
		{
 | 
			
		||||
	if (badarg) {
 | 
			
		||||
		bad:
 | 
			
		||||
		BIO_printf(bio_err, "Usage pkcs8 [options]\n");
 | 
			
		||||
		BIO_printf(bio_err, "where options are\n");
 | 
			
		||||
@@ -222,202 +170,143 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		BIO_printf(bio_err, "-nocrypt        use or expect unencrypted private key\n");
 | 
			
		||||
		BIO_printf(bio_err, "-v2 alg         use PKCS#5 v2.0 and cipher \"alg\"\n");
 | 
			
		||||
		BIO_printf(bio_err, "-v1 obj         use PKCS#5 v1.5 and cipher \"alg\"\n");
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
 | 
			
		||||
#endif
 | 
			
		||||
		return 1;
 | 
			
		||||
		}
 | 
			
		||||
		return (1);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
        e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	if (!app_passwd(bio_err, passargin, passargout, &passin, &passout))
 | 
			
		||||
		{
 | 
			
		||||
	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
 | 
			
		||||
		BIO_printf(bio_err, "Error getting passwords\n");
 | 
			
		||||
		return 1;
 | 
			
		||||
		}
 | 
			
		||||
		return (1);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if ((pbe_nid == -1) && !cipher)
 | 
			
		||||
		pbe_nid = NID_pbeWithMD5AndDES_CBC;
 | 
			
		||||
	if ((pbe_nid == -1) && !cipher) pbe_nid = NID_pbeWithMD5AndDES_CBC;
 | 
			
		||||
 | 
			
		||||
	if (infile)
 | 
			
		||||
		{
 | 
			
		||||
		if (!(in = BIO_new_file(infile, "rb")))
 | 
			
		||||
			{
 | 
			
		||||
	if (infile) {
 | 
			
		||||
		if (!(in = BIO_new_file(infile, "rb"))) {
 | 
			
		||||
			BIO_printf(bio_err,
 | 
			
		||||
				 "Can't open input file %s\n", infile);
 | 
			
		||||
			return (1);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		in = BIO_new_fp (stdin, BIO_NOCLOSE);
 | 
			
		||||
	} else in = BIO_new_fp (stdin, BIO_NOCLOSE);
 | 
			
		||||
 | 
			
		||||
	if (outfile)
 | 
			
		||||
		{
 | 
			
		||||
		if (!(out = BIO_new_file (outfile, "wb")))
 | 
			
		||||
			{
 | 
			
		||||
	if (outfile) {
 | 
			
		||||
		if (!(out = BIO_new_file (outfile, "wb"))) {
 | 
			
		||||
			BIO_printf(bio_err,
 | 
			
		||||
				 "Can't open output file %s\n", outfile);
 | 
			
		||||
			return (1);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		out = BIO_new_fp (stdout, BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
			{
 | 
			
		||||
			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
			out = BIO_push(tmpbio, out);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
	} else out = BIO_new_fp (stdout, BIO_NOCLOSE);
 | 
			
		||||
 | 
			
		||||
	if (topk8) {
 | 
			
		||||
		if(informat == FORMAT_PEM)
 | 
			
		||||
			pkey = PEM_read_bio_PrivateKey(in, NULL, NULL, passin);
 | 
			
		||||
		else if(informat == FORMAT_ASN1)
 | 
			
		||||
			pkey = d2i_PrivateKey_bio(in, NULL);
 | 
			
		||||
		else {
 | 
			
		||||
			BIO_printf(bio_err, "Bad format specified for key\n");
 | 
			
		||||
			return (1);
 | 
			
		||||
		}
 | 
			
		||||
	if (topk8)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_free(in); /* Not needed in this section */
 | 
			
		||||
		pkey = load_key(bio_err, infile, informat, 1,
 | 
			
		||||
			passin, e, "key");
 | 
			
		||||
		if (!pkey)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_free_all(out);
 | 
			
		||||
			return 1;
 | 
			
		||||
			}
 | 
			
		||||
		if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken)))
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err, "Error converting key\n");
 | 
			
		||||
		if (!pkey) {
 | 
			
		||||
			BIO_printf(bio_err, "Error reading key\n", outfile);
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
			EVP_PKEY_free(pkey);
 | 
			
		||||
			BIO_free_all(out);
 | 
			
		||||
			return 1;
 | 
			
		||||
			}
 | 
			
		||||
		if (nocrypt)
 | 
			
		||||
			{
 | 
			
		||||
			if (outformat == FORMAT_PEM) 
 | 
			
		||||
			return (1);
 | 
			
		||||
		}
 | 
			
		||||
		BIO_free(in);
 | 
			
		||||
		if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) {
 | 
			
		||||
			BIO_printf(bio_err, "Error converting key\n", outfile);
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
			return (1);
 | 
			
		||||
		}
 | 
			
		||||
		if(nocrypt) {
 | 
			
		||||
			if(outformat == FORMAT_PEM) 
 | 
			
		||||
				PEM_write_bio_PKCS8_PRIV_KEY_INFO(out, p8inf);
 | 
			
		||||
			else if (outformat == FORMAT_ASN1)
 | 
			
		||||
			else if(outformat == FORMAT_ASN1)
 | 
			
		||||
				i2d_PKCS8_PRIV_KEY_INFO_bio(out, p8inf);
 | 
			
		||||
			else
 | 
			
		||||
				{
 | 
			
		||||
			else {
 | 
			
		||||
				BIO_printf(bio_err, "Bad format specified for key\n");
 | 
			
		||||
				PKCS8_PRIV_KEY_INFO_free(p8inf);
 | 
			
		||||
				EVP_PKEY_free(pkey);
 | 
			
		||||
				BIO_free_all(out);
 | 
			
		||||
				return (1);
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
			if (passout)
 | 
			
		||||
				p8pass = passout;
 | 
			
		||||
			else
 | 
			
		||||
				{
 | 
			
		||||
		} else {
 | 
			
		||||
			if(passout) p8pass = passout;
 | 
			
		||||
			else {
 | 
			
		||||
				p8pass = pass;
 | 
			
		||||
				if (EVP_read_pw_string(pass, sizeof pass, "Enter Encryption Password:", 1))
 | 
			
		||||
					{
 | 
			
		||||
					PKCS8_PRIV_KEY_INFO_free(p8inf);
 | 
			
		||||
					EVP_PKEY_free(pkey);
 | 
			
		||||
					BIO_free_all(out);
 | 
			
		||||
					return (1);
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
				EVP_read_pw_string(pass, 50, "Enter Encryption Password:", 1);
 | 
			
		||||
			}
 | 
			
		||||
			app_RAND_load_file(NULL, bio_err, 0);
 | 
			
		||||
			if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
 | 
			
		||||
					p8pass, strlen(p8pass),
 | 
			
		||||
					NULL, 0, iter, p8inf)))
 | 
			
		||||
				{
 | 
			
		||||
				BIO_printf(bio_err, "Error encrypting key\n");
 | 
			
		||||
					NULL, 0, iter, p8inf))) {
 | 
			
		||||
				BIO_printf(bio_err, "Error encrypting key\n",
 | 
			
		||||
								 outfile);
 | 
			
		||||
				ERR_print_errors(bio_err);
 | 
			
		||||
				PKCS8_PRIV_KEY_INFO_free(p8inf);
 | 
			
		||||
				EVP_PKEY_free(pkey);
 | 
			
		||||
				BIO_free_all(out);
 | 
			
		||||
				return (1);
 | 
			
		||||
				}
 | 
			
		||||
			app_RAND_write_file(NULL, bio_err);
 | 
			
		||||
			if (outformat == FORMAT_PEM) 
 | 
			
		||||
				PEM_write_bio_PKCS8(out, p8);
 | 
			
		||||
			else if (outformat == FORMAT_ASN1)
 | 
			
		||||
				i2d_PKCS8_bio(out, p8);
 | 
			
		||||
			else
 | 
			
		||||
				{
 | 
			
		||||
				BIO_printf(bio_err, "Bad format specified for key\n");
 | 
			
		||||
				PKCS8_PRIV_KEY_INFO_free(p8inf);
 | 
			
		||||
				EVP_PKEY_free(pkey);
 | 
			
		||||
				BIO_free_all(out);
 | 
			
		||||
				return (1);
 | 
			
		||||
				}
 | 
			
		||||
			X509_SIG_free(p8);
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			app_RAND_write_file(NULL, bio_err);
 | 
			
		||||
			if(outformat == FORMAT_PEM) 
 | 
			
		||||
				PEM_write_bio_PKCS8(out, p8);
 | 
			
		||||
			else if(outformat == FORMAT_ASN1)
 | 
			
		||||
				i2d_PKCS8_bio(out, p8);
 | 
			
		||||
			else {
 | 
			
		||||
				BIO_printf(bio_err, "Bad format specified for key\n");
 | 
			
		||||
				return (1);
 | 
			
		||||
			}
 | 
			
		||||
			X509_SIG_free(p8);
 | 
			
		||||
		}
 | 
			
		||||
		PKCS8_PRIV_KEY_INFO_free (p8inf);
 | 
			
		||||
		EVP_PKEY_free(pkey);
 | 
			
		||||
		BIO_free_all(out);
 | 
			
		||||
		if (passin)
 | 
			
		||||
			OPENSSL_free(passin);
 | 
			
		||||
		if (passout)
 | 
			
		||||
			OPENSSL_free(passout);
 | 
			
		||||
		BIO_free(out);
 | 
			
		||||
		if(passin) Free(passin);
 | 
			
		||||
		if(passout) Free(passout);
 | 
			
		||||
		return (0);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (nocrypt)
 | 
			
		||||
		{
 | 
			
		||||
		if (informat == FORMAT_PEM) 
 | 
			
		||||
	if(nocrypt) {
 | 
			
		||||
		if(informat == FORMAT_PEM) 
 | 
			
		||||
			p8inf = PEM_read_bio_PKCS8_PRIV_KEY_INFO(in,NULL,NULL, NULL);
 | 
			
		||||
		else if (informat == FORMAT_ASN1)
 | 
			
		||||
		else if(informat == FORMAT_ASN1)
 | 
			
		||||
			p8inf = d2i_PKCS8_PRIV_KEY_INFO_bio(in, NULL);
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
		else {
 | 
			
		||||
			BIO_printf(bio_err, "Bad format specified for key\n");
 | 
			
		||||
			return (1);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (informat == FORMAT_PEM) 
 | 
			
		||||
	} else {
 | 
			
		||||
		if(informat == FORMAT_PEM) 
 | 
			
		||||
			p8 = PEM_read_bio_PKCS8(in, NULL, NULL, NULL);
 | 
			
		||||
		else if (informat == FORMAT_ASN1)
 | 
			
		||||
		else if(informat == FORMAT_ASN1)
 | 
			
		||||
			p8 = d2i_PKCS8_bio(in, NULL);
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
		else {
 | 
			
		||||
			BIO_printf(bio_err, "Bad format specified for key\n");
 | 
			
		||||
			return (1);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if (!p8)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf (bio_err, "Error reading key\n");
 | 
			
		||||
		if (!p8) {
 | 
			
		||||
			BIO_printf (bio_err, "Error reading key\n", outfile);
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
			return (1);
 | 
			
		||||
			}
 | 
			
		||||
		if (passin)
 | 
			
		||||
			p8pass = passin;
 | 
			
		||||
		else
 | 
			
		||||
			{
 | 
			
		||||
		}
 | 
			
		||||
		if(passin) p8pass = passin;
 | 
			
		||||
		else {
 | 
			
		||||
			p8pass = pass;
 | 
			
		||||
			EVP_read_pw_string(pass, sizeof pass, "Enter Password:", 0);
 | 
			
		||||
			}
 | 
			
		||||
		p8inf = PKCS8_decrypt(p8, p8pass, strlen(p8pass));
 | 
			
		||||
			EVP_read_pw_string(pass, 50, "Enter Password:", 0);
 | 
			
		||||
		}
 | 
			
		||||
		p8inf = M_PKCS8_decrypt(p8, p8pass, strlen(p8pass));
 | 
			
		||||
		X509_SIG_free(p8);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (!p8inf)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err, "Error decrypting key\n");
 | 
			
		||||
	if (!p8inf) {
 | 
			
		||||
		BIO_printf(bio_err, "Error decrypting key\n", outfile);
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		return (1);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (!(pkey = EVP_PKCS82PKEY(p8inf)))
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err, "Error converting key\n");
 | 
			
		||||
	if (!(pkey = EVP_PKCS82PKEY(p8inf))) {
 | 
			
		||||
		BIO_printf(bio_err, "Error converting key\n", outfile);
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		return (1);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	if (p8inf->broken)
 | 
			
		||||
		{
 | 
			
		||||
	if (p8inf->broken) {
 | 
			
		||||
		BIO_printf(bio_err, "Warning: broken key encoding: ");
 | 
			
		||||
		switch (p8inf->broken)
 | 
			
		||||
			{
 | 
			
		||||
		switch (p8inf->broken) {
 | 
			
		||||
			case PKCS8_NO_OCTET:
 | 
			
		||||
			BIO_printf(bio_err, "No Octet String in PrivateKey\n");
 | 
			
		||||
			break;
 | 
			
		||||
@@ -437,24 +326,20 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	PKCS8_PRIV_KEY_INFO_free(p8inf);
 | 
			
		||||
	if (outformat == FORMAT_PEM) 
 | 
			
		||||
	if(outformat == FORMAT_PEM) 
 | 
			
		||||
		PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, passout);
 | 
			
		||||
	else if (outformat == FORMAT_ASN1)
 | 
			
		||||
	else if(outformat == FORMAT_ASN1)
 | 
			
		||||
		i2d_PrivateKey_bio(out, pkey);
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
	else {
 | 
			
		||||
		BIO_printf(bio_err, "Bad format specified for key\n");
 | 
			
		||||
			return (1);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	end:
 | 
			
		||||
	EVP_PKEY_free(pkey);
 | 
			
		||||
	BIO_free_all(out);
 | 
			
		||||
	BIO_free(out);
 | 
			
		||||
	BIO_free(in);
 | 
			
		||||
	if (passin)
 | 
			
		||||
		OPENSSL_free(passin);
 | 
			
		||||
	if (passout)
 | 
			
		||||
		OPENSSL_free(passout);
 | 
			
		||||
	if(passin) Free(passin);
 | 
			
		||||
	if(passout) Free(passout);
 | 
			
		||||
 | 
			
		||||
	return (0);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										130
									
								
								apps/prime.c
									
									
									
									
									
								
							
							
						
						
									
										130
									
								
								apps/prime.c
									
									
									
									
									
								
							@@ -1,130 +0,0 @@
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * 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 above 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 acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 | 
			
		||||
 *    endorse or promote products derived from this software without
 | 
			
		||||
 *    prior written permission. For written permission, please contact
 | 
			
		||||
 *    openssl-core@openssl.org.
 | 
			
		||||
 *
 | 
			
		||||
 * 5. Products derived from this software may not be called "OpenSSL"
 | 
			
		||||
 *    nor may "OpenSSL" appear in their names without prior written
 | 
			
		||||
 *    permission of the OpenSSL Project.
 | 
			
		||||
 *
 | 
			
		||||
 * 6. Redistributions of any form whatsoever must retain the following
 | 
			
		||||
 *    acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 | 
			
		||||
 * EXPRESSED 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 OpenSSL PROJECT OR
 | 
			
		||||
 * ITS 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.
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include <string.h>
 | 
			
		||||
 | 
			
		||||
#include "apps.h"
 | 
			
		||||
#include <openssl/bn.h>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#undef PROG
 | 
			
		||||
#define PROG prime_main
 | 
			
		||||
 | 
			
		||||
int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
    {
 | 
			
		||||
    int hex=0;
 | 
			
		||||
    int checks=20;
 | 
			
		||||
    BIGNUM *bn=NULL;
 | 
			
		||||
    BIO *bio_out;
 | 
			
		||||
 | 
			
		||||
    apps_startup();
 | 
			
		||||
 | 
			
		||||
    if (bio_err == NULL)
 | 
			
		||||
	if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
	    BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
    --argc;
 | 
			
		||||
    ++argv;
 | 
			
		||||
    while (argc >= 1 && **argv == '-')
 | 
			
		||||
	{
 | 
			
		||||
	if(!strcmp(*argv,"-hex"))
 | 
			
		||||
	    hex=1;
 | 
			
		||||
	else if(!strcmp(*argv,"-checks"))
 | 
			
		||||
	    if(--argc < 1)
 | 
			
		||||
		goto bad;
 | 
			
		||||
	    else
 | 
			
		||||
		checks=atoi(*++argv);
 | 
			
		||||
	else
 | 
			
		||||
	    {
 | 
			
		||||
	    BIO_printf(bio_err,"Unknown option '%s'\n",*argv);
 | 
			
		||||
	    goto bad;
 | 
			
		||||
	    }
 | 
			
		||||
	--argc;
 | 
			
		||||
	++argv;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
    if (argv[0] == NULL)
 | 
			
		||||
	{
 | 
			
		||||
	BIO_printf(bio_err,"No prime specified\n");
 | 
			
		||||
	goto bad;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
   if ((bio_out=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
	{
 | 
			
		||||
	BIO_set_fp(bio_out,stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
	    {
 | 
			
		||||
	    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
	    bio_out = BIO_push(tmpbio, bio_out);
 | 
			
		||||
	    }
 | 
			
		||||
#endif
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
    if(hex)
 | 
			
		||||
	BN_hex2bn(&bn,argv[0]);
 | 
			
		||||
    else
 | 
			
		||||
	BN_dec2bn(&bn,argv[0]);
 | 
			
		||||
 | 
			
		||||
    BN_print(bio_out,bn);
 | 
			
		||||
    BIO_printf(bio_out," is %sprime\n",
 | 
			
		||||
	       BN_is_prime_ex(bn,checks,NULL,NULL) ? "" : "not ");
 | 
			
		||||
 | 
			
		||||
    BN_free(bn);
 | 
			
		||||
    BIO_free_all(bio_out);
 | 
			
		||||
 | 
			
		||||
    return 0;
 | 
			
		||||
 | 
			
		||||
    bad:
 | 
			
		||||
    BIO_printf(bio_err,"options are\n");
 | 
			
		||||
    BIO_printf(bio_err,"%-14s hex\n","-hex");
 | 
			
		||||
    BIO_printf(bio_err,"%-14s number of checks\n","-checks <n>");
 | 
			
		||||
    return 1;
 | 
			
		||||
    }
 | 
			
		||||
							
								
								
									
										210
									
								
								apps/progs.h
									
									
									
									
									
								
							
							
						
						
									
										210
									
								
								apps/progs.h
									
									
									
									
									
								
							@@ -14,11 +14,8 @@ extern int errstr_main(int argc,char *argv[]);
 | 
			
		||||
extern int ca_main(int argc,char *argv[]);
 | 
			
		||||
extern int crl_main(int argc,char *argv[]);
 | 
			
		||||
extern int rsa_main(int argc,char *argv[]);
 | 
			
		||||
extern int rsautl_main(int argc,char *argv[]);
 | 
			
		||||
extern int dsa_main(int argc,char *argv[]);
 | 
			
		||||
extern int dsaparam_main(int argc,char *argv[]);
 | 
			
		||||
extern int ec_main(int argc,char *argv[]);
 | 
			
		||||
extern int ecparam_main(int argc,char *argv[]);
 | 
			
		||||
extern int x509_main(int argc,char *argv[]);
 | 
			
		||||
extern int genrsa_main(int argc,char *argv[]);
 | 
			
		||||
extern int gendsa_main(int argc,char *argv[]);
 | 
			
		||||
@@ -36,10 +33,6 @@ extern int pkcs12_main(int argc,char *argv[]);
 | 
			
		||||
extern int pkcs8_main(int argc,char *argv[]);
 | 
			
		||||
extern int spkac_main(int argc,char *argv[]);
 | 
			
		||||
extern int smime_main(int argc,char *argv[]);
 | 
			
		||||
extern int rand_main(int argc,char *argv[]);
 | 
			
		||||
extern int engine_main(int argc,char *argv[]);
 | 
			
		||||
extern int ocsp_main(int argc,char *argv[]);
 | 
			
		||||
extern int prime_main(int argc,char *argv[]);
 | 
			
		||||
 | 
			
		||||
#define FUNC_TYPE_GENERAL	1
 | 
			
		||||
#define FUNC_TYPE_MD		2
 | 
			
		||||
@@ -47,8 +40,8 @@ extern int prime_main(int argc,char *argv[]);
 | 
			
		||||
 | 
			
		||||
typedef struct {
 | 
			
		||||
	int type;
 | 
			
		||||
	const char *name;
 | 
			
		||||
	int (*func)(int argc,char *argv[]);
 | 
			
		||||
	char *name;
 | 
			
		||||
	int (*func)();
 | 
			
		||||
	} FUNCTION;
 | 
			
		||||
 | 
			
		||||
FUNCTION functions[] = {
 | 
			
		||||
@@ -56,283 +49,200 @@ FUNCTION functions[] = {
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"asn1parse",asn1parse_main},
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"req",req_main},
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"dgst",dgst_main},
 | 
			
		||||
#ifndef OPENSSL_NO_DH
 | 
			
		||||
#ifndef NO_DH
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"dh",dh_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DH
 | 
			
		||||
#ifndef NO_DH
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"dhparam",dhparam_main},
 | 
			
		||||
#endif
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"enc",enc_main},
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"passwd",passwd_main},
 | 
			
		||||
#ifndef OPENSSL_NO_DH
 | 
			
		||||
#ifndef NO_DH
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"gendh",gendh_main},
 | 
			
		||||
#endif
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"errstr",errstr_main},
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"ca",ca_main},
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"crl",crl_main},
 | 
			
		||||
#ifndef OPENSSL_NO_RSA
 | 
			
		||||
#ifndef NO_RSA
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"rsa",rsa_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RSA
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"rsautl",rsautl_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DSA
 | 
			
		||||
#ifndef NO_DSA
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"dsa",dsa_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DSA
 | 
			
		||||
#ifndef NO_DSA
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"dsaparam",dsaparam_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_EC
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"ec",ec_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_EC
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"ecparam",ecparam_main},
 | 
			
		||||
#endif
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"x509",x509_main},
 | 
			
		||||
#ifndef OPENSSL_NO_RSA
 | 
			
		||||
#ifndef NO_RSA
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"genrsa",genrsa_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DSA
 | 
			
		||||
#ifndef NO_DSA
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"gendsa",gendsa_main},
 | 
			
		||||
#endif
 | 
			
		||||
#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
 | 
			
		||||
#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3))
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"s_server",s_server_main},
 | 
			
		||||
#endif
 | 
			
		||||
#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
 | 
			
		||||
#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3))
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"s_client",s_client_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SPEED
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"speed",speed_main},
 | 
			
		||||
#endif
 | 
			
		||||
#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
 | 
			
		||||
#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3))
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"s_time",s_time_main},
 | 
			
		||||
#endif
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"version",version_main},
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"pkcs7",pkcs7_main},
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"crl2pkcs7",crl2pkcs7_main},
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"sess_id",sess_id_main},
 | 
			
		||||
#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
 | 
			
		||||
#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3))
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"ciphers",ciphers_main},
 | 
			
		||||
#endif
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"nseq",nseq_main},
 | 
			
		||||
#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
 | 
			
		||||
#if !defined(NO_DES) && !defined(NO_SHA1)
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"pkcs12",pkcs12_main},
 | 
			
		||||
#endif
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"pkcs8",pkcs8_main},
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"spkac",spkac_main},
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"smime",smime_main},
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"rand",rand_main},
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"engine",engine_main},
 | 
			
		||||
#endif
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
 | 
			
		||||
	{FUNC_TYPE_GENERAL,"prime",prime_main},
 | 
			
		||||
#ifndef OPENSSL_NO_MD2
 | 
			
		||||
	{FUNC_TYPE_MD,"md2",dgst_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_MD4
 | 
			
		||||
	{FUNC_TYPE_MD,"md4",dgst_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_MD5
 | 
			
		||||
	{FUNC_TYPE_MD,"md5",dgst_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SHA
 | 
			
		||||
	{FUNC_TYPE_MD,"sha",dgst_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SHA1
 | 
			
		||||
	{FUNC_TYPE_MD,"sha1",dgst_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_MDC2
 | 
			
		||||
	{FUNC_TYPE_MD,"mdc2",dgst_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RMD160
 | 
			
		||||
	{FUNC_TYPE_MD,"rmd160",dgst_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_AES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"aes-128-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_AES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"aes-128-ecb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_AES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"aes-192-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_AES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"aes-192-ecb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_AES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"aes-256-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_AES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"aes-256-ecb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAMELLIA
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"camellia-128-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAMELLIA
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"camellia-128-ecb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAMELLIA
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"camellia-192-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAMELLIA
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"camellia-192-ecb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAMELLIA
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"camellia-256-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAMELLIA
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"camellia-256-ecb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"base64",enc_main},
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"des",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"des3",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"desx",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_IDEA
 | 
			
		||||
#ifndef NO_IDEA
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"idea",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SEED
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"seed",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RC4
 | 
			
		||||
#ifndef NO_RC4
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"rc4",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RC4
 | 
			
		||||
#ifndef NO_RC4
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"rc4-40",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RC2
 | 
			
		||||
#ifndef NO_RC2
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"rc2",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_BF
 | 
			
		||||
#ifndef NO_BF
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"bf",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAST
 | 
			
		||||
#ifndef NO_CAST
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"cast",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RC5
 | 
			
		||||
#ifndef NO_RC5
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"rc5",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"des-ecb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"des-ede",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"des-ede3",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"des-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"des-ede-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"des-ede3-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"des-cfb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"des-ede-cfb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"des-ede3-cfb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"des-ofb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"des-ede-ofb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_DES
 | 
			
		||||
#ifndef NO_DES
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"des-ede3-ofb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_IDEA
 | 
			
		||||
#ifndef NO_IDEA
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"idea-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_IDEA
 | 
			
		||||
#ifndef NO_IDEA
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"idea-ecb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_IDEA
 | 
			
		||||
#ifndef NO_IDEA
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"idea-cfb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_IDEA
 | 
			
		||||
#ifndef NO_IDEA
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"idea-ofb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SEED
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"seed-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SEED
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"seed-ecb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SEED
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"seed-cfb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SEED
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"seed-ofb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RC2
 | 
			
		||||
#ifndef NO_RC2
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"rc2-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RC2
 | 
			
		||||
#ifndef NO_RC2
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"rc2-ecb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RC2
 | 
			
		||||
#ifndef NO_RC2
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"rc2-cfb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RC2
 | 
			
		||||
#ifndef NO_RC2
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"rc2-ofb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RC2
 | 
			
		||||
#ifndef NO_RC2
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"rc2-64-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RC2
 | 
			
		||||
#ifndef NO_RC2
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"rc2-40-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_BF
 | 
			
		||||
#ifndef NO_BF
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"bf-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_BF
 | 
			
		||||
#ifndef NO_BF
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"bf-ecb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_BF
 | 
			
		||||
#ifndef NO_BF
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"bf-cfb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_BF
 | 
			
		||||
#ifndef NO_BF
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"bf-ofb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAST
 | 
			
		||||
#ifndef NO_CAST
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"cast5-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAST
 | 
			
		||||
#ifndef NO_CAST
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"cast5-ecb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAST
 | 
			
		||||
#ifndef NO_CAST
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"cast5-cfb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAST
 | 
			
		||||
#ifndef NO_CAST
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"cast5-ofb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAST
 | 
			
		||||
#ifndef NO_CAST
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"cast-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RC5
 | 
			
		||||
#ifndef NO_RC5
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"rc5-cbc",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RC5
 | 
			
		||||
#ifndef NO_RC5
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"rc5-ecb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RC5
 | 
			
		||||
#ifndef NO_RC5
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"rc5-cfb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_RC5
 | 
			
		||||
#ifndef NO_RC5
 | 
			
		||||
	{FUNC_TYPE_CIPHER,"rc5-ofb",enc_main},
 | 
			
		||||
#endif
 | 
			
		||||
	{0,NULL,NULL}
 | 
			
		||||
 
 | 
			
		||||
@@ -16,8 +16,8 @@ print <<'EOF';
 | 
			
		||||
 | 
			
		||||
typedef struct {
 | 
			
		||||
	int type;
 | 
			
		||||
	const char *name;
 | 
			
		||||
	int (*func)(int argc,char *argv[]);
 | 
			
		||||
	char *name;
 | 
			
		||||
	int (*func)();
 | 
			
		||||
	} FUNCTION;
 | 
			
		||||
 | 
			
		||||
FUNCTION functions[] = {
 | 
			
		||||
@@ -28,47 +28,34 @@ foreach (@ARGV)
 | 
			
		||||
	push(@files,$_);
 | 
			
		||||
	$str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";
 | 
			
		||||
	if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))
 | 
			
		||||
		{ print "#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))\n${str}#endif\n"; } 
 | 
			
		||||
	elsif ( ($_ =~ /^speed$/))
 | 
			
		||||
		{ print "#ifndef OPENSSL_NO_SPEED\n${str}#endif\n"; }
 | 
			
		||||
	elsif ( ($_ =~ /^engine$/))
 | 
			
		||||
		{ print "#ifndef OPENSSL_NO_ENGINE\n${str}#endif\n"; }
 | 
			
		||||
	elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/) || ($_ =~ /^rsautl$/)) 
 | 
			
		||||
		{ print "#ifndef OPENSSL_NO_RSA\n${str}#endif\n";  }
 | 
			
		||||
		{ print "#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3))\n${str}#endif\n"; } 
 | 
			
		||||
	elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/) ) 
 | 
			
		||||
		{ print "#ifndef NO_RSA\n${str}#endif\n";  }
 | 
			
		||||
	elsif ( ($_ =~ /^dsa$/) || ($_ =~ /^gendsa$/) || ($_ =~ /^dsaparam$/))
 | 
			
		||||
		{ print "#ifndef OPENSSL_NO_DSA\n${str}#endif\n"; }
 | 
			
		||||
	elsif ( ($_ =~ /^ec$/) || ($_ =~ /^ecparam$/))
 | 
			
		||||
		{ print "#ifndef OPENSSL_NO_EC\n${str}#endif\n";}
 | 
			
		||||
		{ print "#ifndef NO_DSA\n${str}#endif\n"; }
 | 
			
		||||
	elsif ( ($_ =~ /^dh$/) || ($_ =~ /^gendh$/) || ($_ =~ /^dhparam$/))
 | 
			
		||||
		{ print "#ifndef OPENSSL_NO_DH\n${str}#endif\n"; }
 | 
			
		||||
		{ print "#ifndef NO_DH\n${str}#endif\n"; }
 | 
			
		||||
	elsif ( ($_ =~ /^pkcs12$/))
 | 
			
		||||
		{ print "#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)\n${str}#endif\n"; }
 | 
			
		||||
		{ print "#if !defined(NO_DES) && !defined(NO_SHA1)\n${str}#endif\n"; }
 | 
			
		||||
	else
 | 
			
		||||
		{ print $str; }
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
foreach ("md2","md4","md5","sha","sha1","mdc2","rmd160")
 | 
			
		||||
foreach ("md2","md5","sha","sha1","mdc2","rmd160")
 | 
			
		||||
	{
 | 
			
		||||
	push(@files,$_);
 | 
			
		||||
	printf "#ifndef OPENSSL_NO_".uc($_)."\n\t{FUNC_TYPE_MD,\"".$_."\",dgst_main},\n#endif\n";
 | 
			
		||||
	printf "\t{FUNC_TYPE_MD,\"%s\",dgst_main},\n",$_;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
foreach (
 | 
			
		||||
	"aes-128-cbc", "aes-128-ecb",
 | 
			
		||||
	"aes-192-cbc", "aes-192-ecb",
 | 
			
		||||
	"aes-256-cbc", "aes-256-ecb",
 | 
			
		||||
	"camellia-128-cbc", "camellia-128-ecb",
 | 
			
		||||
	"camellia-192-cbc", "camellia-192-ecb",
 | 
			
		||||
	"camellia-256-cbc", "camellia-256-ecb",
 | 
			
		||||
	"base64",
 | 
			
		||||
	"des", "des3", "desx", "idea", "seed", "rc4", "rc4-40",
 | 
			
		||||
	"des", "des3", "desx", "idea", "rc4", "rc4-40",
 | 
			
		||||
	"rc2", "bf", "cast", "rc5",
 | 
			
		||||
	"des-ecb", "des-ede",    "des-ede3",
 | 
			
		||||
	"des-cbc", "des-ede-cbc","des-ede3-cbc",
 | 
			
		||||
	"des-cfb", "des-ede-cfb","des-ede3-cfb",
 | 
			
		||||
	"des-ofb", "des-ede-ofb","des-ede3-ofb",
 | 
			
		||||
	"idea-cbc","idea-ecb",    "idea-cfb", "idea-ofb",
 | 
			
		||||
	"seed-cbc","seed-ecb",    "seed-cfb", "seed-ofb",
 | 
			
		||||
	"idea-cbc","idea-ecb",   "idea-cfb", "idea-ofb",
 | 
			
		||||
	"rc2-cbc", "rc2-ecb", "rc2-cfb","rc2-ofb", "rc2-64-cbc", "rc2-40-cbc",
 | 
			
		||||
	"bf-cbc",  "bf-ecb",     "bf-cfb",   "bf-ofb",
 | 
			
		||||
	"cast5-cbc","cast5-ecb", "cast5-cfb","cast5-ofb",
 | 
			
		||||
@@ -77,16 +64,13 @@ foreach (
 | 
			
		||||
	push(@files,$_);
 | 
			
		||||
 | 
			
		||||
	$t=sprintf("\t{FUNC_TYPE_CIPHER,\"%s\",enc_main},\n",$_);
 | 
			
		||||
	if    ($_ =~ /des/)  { $t="#ifndef OPENSSL_NO_DES\n${t}#endif\n"; }
 | 
			
		||||
	elsif ($_ =~ /aes/)  { $t="#ifndef OPENSSL_NO_AES\n${t}#endif\n"; }
 | 
			
		||||
	elsif ($_ =~ /camellia/)  { $t="#ifndef OPENSSL_NO_CAMELLIA\n${t}#endif\n"; }
 | 
			
		||||
	elsif ($_ =~ /idea/) { $t="#ifndef OPENSSL_NO_IDEA\n${t}#endif\n"; }
 | 
			
		||||
	elsif ($_ =~ /seed/) { $t="#ifndef OPENSSL_NO_SEED\n${t}#endif\n"; }
 | 
			
		||||
	elsif ($_ =~ /rc4/)  { $t="#ifndef OPENSSL_NO_RC4\n${t}#endif\n"; }
 | 
			
		||||
	elsif ($_ =~ /rc2/)  { $t="#ifndef OPENSSL_NO_RC2\n${t}#endif\n"; }
 | 
			
		||||
	elsif ($_ =~ /bf/)   { $t="#ifndef OPENSSL_NO_BF\n${t}#endif\n"; }
 | 
			
		||||
	elsif ($_ =~ /cast/) { $t="#ifndef OPENSSL_NO_CAST\n${t}#endif\n"; }
 | 
			
		||||
	elsif ($_ =~ /rc5/)  { $t="#ifndef OPENSSL_NO_RC5\n${t}#endif\n"; }
 | 
			
		||||
	if    ($_ =~ /des/)  { $t="#ifndef NO_DES\n${t}#endif\n"; }
 | 
			
		||||
	elsif ($_ =~ /idea/) { $t="#ifndef NO_IDEA\n${t}#endif\n"; }
 | 
			
		||||
	elsif ($_ =~ /rc4/)  { $t="#ifndef NO_RC4\n${t}#endif\n"; }
 | 
			
		||||
	elsif ($_ =~ /rc2/)  { $t="#ifndef NO_RC2\n${t}#endif\n"; }
 | 
			
		||||
	elsif ($_ =~ /bf/)   { $t="#ifndef NO_BF\n${t}#endif\n"; }
 | 
			
		||||
	elsif ($_ =~ /cast/) { $t="#ifndef NO_CAST\n${t}#endif\n"; }
 | 
			
		||||
	elsif ($_ =~ /rc5/)  { $t="#ifndef NO_RC5\n${t}#endif\n"; }
 | 
			
		||||
	print $t;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										227
									
								
								apps/rand.c
									
									
									
									
									
								
							
							
						
						
									
										227
									
								
								apps/rand.c
									
									
									
									
									
								
							@@ -1,227 +0,0 @@
 | 
			
		||||
/* apps/rand.c */
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * 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 above 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 acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 | 
			
		||||
 *    endorse or promote products derived from this software without
 | 
			
		||||
 *    prior written permission. For written permission, please contact
 | 
			
		||||
 *    openssl-core@openssl.org.
 | 
			
		||||
 *
 | 
			
		||||
 * 5. Products derived from this software may not be called "OpenSSL"
 | 
			
		||||
 *    nor may "OpenSSL" appear in their names without prior written
 | 
			
		||||
 *    permission of the OpenSSL Project.
 | 
			
		||||
 *
 | 
			
		||||
 * 6. Redistributions of any form whatsoever must retain the following
 | 
			
		||||
 *    acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 | 
			
		||||
 * EXPRESSED 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 OpenSSL PROJECT OR
 | 
			
		||||
 * ITS 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.
 | 
			
		||||
 * ====================================================================
 | 
			
		||||
 *
 | 
			
		||||
 * This product includes cryptographic software written by Eric Young
 | 
			
		||||
 * (eay@cryptsoft.com).  This product includes software written by Tim
 | 
			
		||||
 * Hudson (tjh@cryptsoft.com).
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include "apps.h"
 | 
			
		||||
 | 
			
		||||
#include <ctype.h>
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
 | 
			
		||||
#include <openssl/bio.h>
 | 
			
		||||
#include <openssl/err.h>
 | 
			
		||||
#include <openssl/rand.h>
 | 
			
		||||
 | 
			
		||||
#undef PROG
 | 
			
		||||
#define PROG rand_main
 | 
			
		||||
 | 
			
		||||
/* -out file         - write to file
 | 
			
		||||
 * -rand file:file   - PRNG seed files
 | 
			
		||||
 * -base64           - encode output
 | 
			
		||||
 * num               - write 'num' bytes
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	ENGINE *e = NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	int i, r, ret = 1;
 | 
			
		||||
	int badopt;
 | 
			
		||||
	char *outfile = NULL;
 | 
			
		||||
	char *inrand = NULL;
 | 
			
		||||
	int base64 = 0;
 | 
			
		||||
	BIO *out = NULL;
 | 
			
		||||
	int num = -1;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	char *engine=NULL;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
 | 
			
		||||
	if (bio_err == NULL)
 | 
			
		||||
		if ((bio_err = BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto err;
 | 
			
		||||
 | 
			
		||||
	badopt = 0;
 | 
			
		||||
	i = 0;
 | 
			
		||||
	while (!badopt && argv[++i] != NULL)
 | 
			
		||||
		{
 | 
			
		||||
		if (strcmp(argv[i], "-out") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if ((argv[i+1] != NULL) && (outfile == NULL))
 | 
			
		||||
				outfile = argv[++i];
 | 
			
		||||
			else
 | 
			
		||||
				badopt = 1;
 | 
			
		||||
			}
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		else if (strcmp(argv[i], "-engine") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if ((argv[i+1] != NULL) && (engine == NULL))
 | 
			
		||||
				engine = argv[++i];
 | 
			
		||||
			else
 | 
			
		||||
				badopt = 1;
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
		else if (strcmp(argv[i], "-rand") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if ((argv[i+1] != NULL) && (inrand == NULL))
 | 
			
		||||
				inrand = argv[++i];
 | 
			
		||||
			else
 | 
			
		||||
				badopt = 1;
 | 
			
		||||
			}
 | 
			
		||||
		else if (strcmp(argv[i], "-base64") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (!base64)
 | 
			
		||||
				base64 = 1;
 | 
			
		||||
			else
 | 
			
		||||
				badopt = 1;
 | 
			
		||||
			}
 | 
			
		||||
		else if (isdigit((unsigned char)argv[i][0]))
 | 
			
		||||
			{
 | 
			
		||||
			if (num < 0)
 | 
			
		||||
				{
 | 
			
		||||
				r = sscanf(argv[i], "%d", &num);
 | 
			
		||||
				if (r == 0 || num < 0)
 | 
			
		||||
					badopt = 1;
 | 
			
		||||
				}
 | 
			
		||||
			else
 | 
			
		||||
				badopt = 1;
 | 
			
		||||
			}
 | 
			
		||||
		else
 | 
			
		||||
			badopt = 1;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (num < 0)
 | 
			
		||||
		badopt = 1;
 | 
			
		||||
	
 | 
			
		||||
	if (badopt) 
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err, "Usage: rand [options] num\n");
 | 
			
		||||
		BIO_printf(bio_err, "where options are\n");
 | 
			
		||||
		BIO_printf(bio_err, "-out file             - write to file\n");
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		BIO_printf(bio_err, "-engine e             - use engine e, possibly a hardware device.\n");
 | 
			
		||||
#endif
 | 
			
		||||
		BIO_printf(bio_err, "-rand file%cfile%c... - seed PRNG from files\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 | 
			
		||||
		BIO_printf(bio_err, "-base64               - encode output\n");
 | 
			
		||||
		goto err;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
        e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	app_RAND_load_file(NULL, bio_err, (inrand != NULL));
 | 
			
		||||
	if (inrand != NULL)
 | 
			
		||||
		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 | 
			
		||||
			app_RAND_load_files(inrand));
 | 
			
		||||
 | 
			
		||||
	out = BIO_new(BIO_s_file());
 | 
			
		||||
	if (out == NULL)
 | 
			
		||||
		goto err;
 | 
			
		||||
	if (outfile != NULL)
 | 
			
		||||
		r = BIO_write_filename(out, outfile);
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		r = BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
		}
 | 
			
		||||
	if (r <= 0)
 | 
			
		||||
		goto err;
 | 
			
		||||
 | 
			
		||||
	if (base64)
 | 
			
		||||
		{
 | 
			
		||||
		BIO *b64 = BIO_new(BIO_f_base64());
 | 
			
		||||
		if (b64 == NULL)
 | 
			
		||||
			goto err;
 | 
			
		||||
		out = BIO_push(b64, out);
 | 
			
		||||
		}
 | 
			
		||||
	
 | 
			
		||||
	while (num > 0) 
 | 
			
		||||
		{
 | 
			
		||||
		unsigned char buf[4096];
 | 
			
		||||
		int chunk;
 | 
			
		||||
 | 
			
		||||
		chunk = num;
 | 
			
		||||
		if (chunk > (int)sizeof(buf))
 | 
			
		||||
			chunk = sizeof buf;
 | 
			
		||||
		r = RAND_bytes(buf, chunk);
 | 
			
		||||
		if (r <= 0)
 | 
			
		||||
			goto err;
 | 
			
		||||
		BIO_write(out, buf, chunk);
 | 
			
		||||
		num -= chunk;
 | 
			
		||||
		}
 | 
			
		||||
	(void)BIO_flush(out);
 | 
			
		||||
 | 
			
		||||
	app_RAND_write_file(NULL, bio_err);
 | 
			
		||||
	ret = 0;
 | 
			
		||||
	
 | 
			
		||||
err:
 | 
			
		||||
	ERR_print_errors(bio_err);
 | 
			
		||||
	if (out)
 | 
			
		||||
		BIO_free_all(out);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
							
								
								
									
										902
									
								
								apps/req.c
									
									
									
									
									
								
							
							
						
						
									
										902
									
								
								apps/req.c
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										173
									
								
								apps/rsa.c
									
									
									
									
									
								
							
							
						
						
									
										173
									
								
								apps/rsa.c
									
									
									
									
									
								
							@@ -56,8 +56,7 @@
 | 
			
		||||
 * [including the GNU Public Licence.]
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include <openssl/opensslconf.h>
 | 
			
		||||
#ifndef OPENSSL_NO_RSA
 | 
			
		||||
#ifndef NO_RSA
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
@@ -69,7 +68,6 @@
 | 
			
		||||
#include <openssl/evp.h>
 | 
			
		||||
#include <openssl/x509.h>
 | 
			
		||||
#include <openssl/pem.h>
 | 
			
		||||
#include <openssl/bn.h>
 | 
			
		||||
 | 
			
		||||
#undef PROG
 | 
			
		||||
#define PROG	rsa_main
 | 
			
		||||
@@ -81,13 +79,6 @@
 | 
			
		||||
 * -des		- encrypt output if PEM format with DES in cbc mode
 | 
			
		||||
 * -des3	- encrypt output if PEM format
 | 
			
		||||
 * -idea	- encrypt output if PEM format
 | 
			
		||||
 * -seed	- encrypt output if PEM format
 | 
			
		||||
 * -aes128	- encrypt output if PEM format
 | 
			
		||||
 * -aes192	- encrypt output if PEM format
 | 
			
		||||
 * -aes256	- encrypt output if PEM format
 | 
			
		||||
 * -camellia128 - encrypt output if PEM format
 | 
			
		||||
 * -camellia192 - encrypt output if PEM format
 | 
			
		||||
 * -camellia256 - encrypt output if PEM format
 | 
			
		||||
 * -text	- print a text version
 | 
			
		||||
 * -modulus	- print the RSA key modulus
 | 
			
		||||
 * -check	- verify key consistency
 | 
			
		||||
@@ -99,20 +90,16 @@ int MAIN(int, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
	{
 | 
			
		||||
	ENGINE *e = NULL;
 | 
			
		||||
	int ret=1;
 | 
			
		||||
	RSA *rsa=NULL;
 | 
			
		||||
	int i,badops=0, sgckey=0;
 | 
			
		||||
	int i,badops=0;
 | 
			
		||||
	const EVP_CIPHER *enc=NULL;
 | 
			
		||||
	BIO *out=NULL;
 | 
			
		||||
	BIO *in=NULL,*out=NULL;
 | 
			
		||||
	int informat,outformat,text=0,check=0,noout=0;
 | 
			
		||||
	int pubin = 0, pubout = 0;
 | 
			
		||||
	char *infile,*outfile,*prog;
 | 
			
		||||
	char *passargin = NULL, *passargout = NULL;
 | 
			
		||||
	char *passin = NULL, *passout = NULL;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	char *engine=NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	int modulus=0;
 | 
			
		||||
 | 
			
		||||
	apps_startup();
 | 
			
		||||
@@ -121,9 +108,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
			
		||||
			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
 | 
			
		||||
	infile=NULL;
 | 
			
		||||
	outfile=NULL;
 | 
			
		||||
	informat=FORMAT_PEM;
 | 
			
		||||
@@ -164,15 +148,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			passargout= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		else if (strcmp(*argv,"-engine") == 0)
 | 
			
		||||
			{
 | 
			
		||||
			if (--argc < 1) goto bad;
 | 
			
		||||
			engine= *(++argv);
 | 
			
		||||
			}
 | 
			
		||||
#endif
 | 
			
		||||
		else if (strcmp(*argv,"-sgckey") == 0)
 | 
			
		||||
			sgckey=1;
 | 
			
		||||
		else if (strcmp(*argv,"-pubin") == 0)
 | 
			
		||||
			pubin=1;
 | 
			
		||||
		else if (strcmp(*argv,"-pubout") == 0)
 | 
			
		||||
@@ -203,25 +178,14 @@ bad:
 | 
			
		||||
		BIO_printf(bio_err," -inform arg     input format - one of DER NET PEM\n");
 | 
			
		||||
		BIO_printf(bio_err," -outform arg    output format - one of DER NET PEM\n");
 | 
			
		||||
		BIO_printf(bio_err," -in arg         input file\n");
 | 
			
		||||
		BIO_printf(bio_err," -sgckey         Use IIS SGC key format\n");
 | 
			
		||||
		BIO_printf(bio_err," -passin arg     input file pass phrase source\n");
 | 
			
		||||
		BIO_printf(bio_err," -in arg         input file\n");
 | 
			
		||||
		BIO_printf(bio_err," -out arg        output file\n");
 | 
			
		||||
		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
 | 
			
		||||
		BIO_printf(bio_err," -des            encrypt PEM output with cbc des\n");
 | 
			
		||||
		BIO_printf(bio_err," -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
 | 
			
		||||
#ifndef OPENSSL_NO_IDEA
 | 
			
		||||
#ifndef NO_IDEA
 | 
			
		||||
		BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_SEED
 | 
			
		||||
		BIO_printf(bio_err," -seed           encrypt PEM output with cbc seed\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_AES
 | 
			
		||||
		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
 | 
			
		||||
		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
 | 
			
		||||
#endif
 | 
			
		||||
#ifndef OPENSSL_NO_CAMELLIA
 | 
			
		||||
		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
 | 
			
		||||
		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
 | 
			
		||||
#endif
 | 
			
		||||
		BIO_printf(bio_err," -text           print the key in text\n");
 | 
			
		||||
		BIO_printf(bio_err," -noout          don't print key out\n");
 | 
			
		||||
@@ -229,18 +193,11 @@ bad:
 | 
			
		||||
		BIO_printf(bio_err," -check          verify key consistency\n");
 | 
			
		||||
		BIO_printf(bio_err," -pubin          expect a public key in input file\n");
 | 
			
		||||
		BIO_printf(bio_err," -pubout         output a public key\n");
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
 | 
			
		||||
#endif
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	ERR_load_crypto_strings();
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
        e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
 | 
			
		||||
		BIO_printf(bio_err, "Error getting passwords\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
@@ -251,43 +208,75 @@ bad:
 | 
			
		||||
		goto end;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	in=BIO_new(BIO_s_file());
 | 
			
		||||
	out=BIO_new(BIO_s_file());
 | 
			
		||||
 | 
			
		||||
	{
 | 
			
		||||
		EVP_PKEY	*pkey;
 | 
			
		||||
 | 
			
		||||
		if (pubin)
 | 
			
		||||
			pkey = load_pubkey(bio_err, infile,
 | 
			
		||||
				(informat == FORMAT_NETSCAPE && sgckey ?
 | 
			
		||||
					FORMAT_IISSGC : informat), 1,
 | 
			
		||||
				passin, e, "Public Key");
 | 
			
		||||
		else
 | 
			
		||||
			pkey = load_key(bio_err, infile,
 | 
			
		||||
				(informat == FORMAT_NETSCAPE && sgckey ?
 | 
			
		||||
					FORMAT_IISSGC : informat), 1,
 | 
			
		||||
				passin, e, "Private Key");
 | 
			
		||||
 | 
			
		||||
		if (pkey != NULL)
 | 
			
		||||
		rsa = pkey == NULL ? NULL : EVP_PKEY_get1_RSA(pkey);
 | 
			
		||||
		EVP_PKEY_free(pkey);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (rsa == NULL)
 | 
			
		||||
	if ((in == NULL) || (out == NULL))
 | 
			
		||||
		{
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (outfile == NULL)
 | 
			
		||||
	if (infile == NULL)
 | 
			
		||||
		BIO_set_fp(in,stdin,BIO_NOCLOSE);
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		if (BIO_read_filename(in,infile) <= 0)
 | 
			
		||||
			{
 | 
			
		||||
			perror(infile);
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	BIO_printf(bio_err,"read RSA key\n");
 | 
			
		||||
	if	(informat == FORMAT_ASN1) {
 | 
			
		||||
		if (pubin) rsa=d2i_RSA_PUBKEY_bio(in,NULL);
 | 
			
		||||
		else rsa=d2i_RSAPrivateKey_bio(in,NULL);
 | 
			
		||||
	}
 | 
			
		||||
#ifndef NO_RC4
 | 
			
		||||
	else if (informat == FORMAT_NETSCAPE)
 | 
			
		||||
		{
 | 
			
		||||
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		out = BIO_push(tmpbio, out);
 | 
			
		||||
		BUF_MEM *buf=NULL;
 | 
			
		||||
		unsigned char *p;
 | 
			
		||||
		int size=0;
 | 
			
		||||
 | 
			
		||||
		buf=BUF_MEM_new();
 | 
			
		||||
		for (;;)
 | 
			
		||||
			{
 | 
			
		||||
			if ((buf == NULL) || (!BUF_MEM_grow(buf,size+1024*10)))
 | 
			
		||||
				goto end;
 | 
			
		||||
			i=BIO_read(in,&(buf->data[size]),1024*10);
 | 
			
		||||
			size+=i;
 | 
			
		||||
			if (i == 0) break;
 | 
			
		||||
			if (i < 0)
 | 
			
		||||
				{
 | 
			
		||||
				perror("reading private key");
 | 
			
		||||
				BUF_MEM_free(buf);
 | 
			
		||||
				goto end;
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		p=(unsigned char *)buf->data;
 | 
			
		||||
		rsa=d2i_Netscape_RSA(NULL,&p,(long)size,NULL);
 | 
			
		||||
		BUF_MEM_free(buf);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
	else if (informat == FORMAT_PEM) {
 | 
			
		||||
		if(pubin) rsa=PEM_read_bio_RSA_PUBKEY(in,NULL,NULL,NULL);
 | 
			
		||||
		else rsa=PEM_read_bio_RSAPrivateKey(in,NULL, NULL,passin);
 | 
			
		||||
	}
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err,"bad input format specified for key\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
	if (rsa == NULL)
 | 
			
		||||
		{
 | 
			
		||||
		BIO_printf(bio_err,"unable to load key\n");
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		goto end;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
	if (outfile == NULL)
 | 
			
		||||
		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 | 
			
		||||
	else
 | 
			
		||||
		{
 | 
			
		||||
		if (BIO_write_filename(out,outfile) <= 0)
 | 
			
		||||
@@ -320,14 +309,14 @@ bad:
 | 
			
		||||
			BIO_printf(out,"RSA key ok\n");
 | 
			
		||||
		else if (r == 0)
 | 
			
		||||
			{
 | 
			
		||||
			unsigned long err;
 | 
			
		||||
			long e;
 | 
			
		||||
 | 
			
		||||
			while ((err = ERR_peek_error()) != 0 &&
 | 
			
		||||
				ERR_GET_LIB(err) == ERR_LIB_RSA &&
 | 
			
		||||
				ERR_GET_FUNC(err) == RSA_F_RSA_CHECK_KEY &&
 | 
			
		||||
				ERR_GET_REASON(err) != ERR_R_MALLOC_FAILURE)
 | 
			
		||||
			while ((e = ERR_peek_error()) != 0 &&
 | 
			
		||||
				ERR_GET_LIB(e) == ERR_LIB_RSA &&
 | 
			
		||||
				ERR_GET_FUNC(e) == RSA_F_RSA_CHECK_KEY &&
 | 
			
		||||
				ERR_GET_REASON(e) != ERR_R_MALLOC_FAILURE)
 | 
			
		||||
				{
 | 
			
		||||
				BIO_printf(out, "RSA key error: %s\n", ERR_reason_error_string(err));
 | 
			
		||||
				BIO_printf(out, "RSA key error: %s\n", ERR_reason_error_string(e));
 | 
			
		||||
				ERR_get_error(); /* remove e from error stack */
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
@@ -349,23 +338,23 @@ bad:
 | 
			
		||||
		if(pubout || pubin) i=i2d_RSA_PUBKEY_bio(out,rsa);
 | 
			
		||||
		else i=i2d_RSAPrivateKey_bio(out,rsa);
 | 
			
		||||
	}
 | 
			
		||||
#ifndef OPENSSL_NO_RC4
 | 
			
		||||
#ifndef NO_RC4
 | 
			
		||||
	else if (outformat == FORMAT_NETSCAPE)
 | 
			
		||||
		{
 | 
			
		||||
		unsigned char *p,*pp;
 | 
			
		||||
		int size;
 | 
			
		||||
 | 
			
		||||
		i=1;
 | 
			
		||||
		size=i2d_RSA_NET(rsa,NULL,NULL, sgckey);
 | 
			
		||||
		if ((p=(unsigned char *)OPENSSL_malloc(size)) == NULL)
 | 
			
		||||
		size=i2d_Netscape_RSA(rsa,NULL,NULL);
 | 
			
		||||
		if ((p=(unsigned char *)Malloc(size)) == NULL)
 | 
			
		||||
			{
 | 
			
		||||
			BIO_printf(bio_err,"Memory allocation failure\n");
 | 
			
		||||
			BIO_printf(bio_err,"Malloc failure\n");
 | 
			
		||||
			goto end;
 | 
			
		||||
			}
 | 
			
		||||
		pp=p;
 | 
			
		||||
		i2d_RSA_NET(rsa,&p,NULL, sgckey);
 | 
			
		||||
		i2d_Netscape_RSA(rsa,&p,NULL);
 | 
			
		||||
		BIO_write(out,(char *)pp,size);
 | 
			
		||||
		OPENSSL_free(pp);
 | 
			
		||||
		Free(pp);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
	else if (outformat == FORMAT_PEM) {
 | 
			
		||||
@@ -385,14 +374,14 @@ bad:
 | 
			
		||||
	else
 | 
			
		||||
		ret=0;
 | 
			
		||||
end:
 | 
			
		||||
	if(out != NULL) BIO_free_all(out);
 | 
			
		||||
	if(in != NULL) BIO_free(in);
 | 
			
		||||
	if(out != NULL) BIO_free(out);
 | 
			
		||||
	if(rsa != NULL) RSA_free(rsa);
 | 
			
		||||
	if(passin) OPENSSL_free(passin);
 | 
			
		||||
	if(passout) OPENSSL_free(passout);
 | 
			
		||||
	apps_shutdown();
 | 
			
		||||
	OPENSSL_EXIT(ret);
 | 
			
		||||
	if(passin) Free(passin);
 | 
			
		||||
	if(passout) Free(passout);
 | 
			
		||||
	EXIT(ret);
 | 
			
		||||
	}
 | 
			
		||||
#else /* !OPENSSL_NO_RSA */
 | 
			
		||||
#else /* !NO_RSA */
 | 
			
		||||
 | 
			
		||||
# if PEDANTIC
 | 
			
		||||
static void *dummy=&dummy;
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										15
									
								
								apps/rsa/01.pem
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								apps/rsa/01.pem
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,15 @@
 | 
			
		||||
-----BEGIN CERTIFICATE-----
 | 
			
		||||
MIICTjCCAbsCEGiuFKTJn6nzmiPPLxUZs1owDQYJKoZIhvcNAQEEBQAwXzELMAkG
 | 
			
		||||
A1UEBhMCVVMxIDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYD
 | 
			
		||||
VQQLEyVTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk4
 | 
			
		||||
MDUxODAwMDAwMFoXDTk5MDUxODIzNTk1OVowdTELMAkGA1UEBhMCVVMxETAPBgNV
 | 
			
		||||
BAgTCE5ldyBZb3JrMREwDwYDVQQHFAhOZXcgWW9yazEeMBwGA1UEChQVSW5kdXN0
 | 
			
		||||
cmlhbCBQcmVzcyBJbmMuMSAwHgYDVQQDFBd3d3cuaW5kdXN0cmlhbHByZXNzLmNv
 | 
			
		||||
bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqiH9xUJNHvqCmaDon27ValJb
 | 
			
		||||
qTLymF3yKKWBxbODLWjX7yKjewoqWhotaEARI6jXPqomU87gFU1tH4r/bgwh3FmU
 | 
			
		||||
MK3qo92XOsvwNAHzXzWRXQNJmm54g2F1RUt00pgYiOximDse1t9RL5POCDEbfX8D
 | 
			
		||||
gugrE/WwkS2FrSoc5/cCAwEAATANBgkqhkiG9w0BAQQFAAN+AIw7fvF0EtEvrNS/
 | 
			
		||||
LYuqAgUw/tH0FLgCkqKLmYYm/yR+Z0hD2eP/UhF+jAwmV8rHtBnaTM7oN23RVW2k
 | 
			
		||||
Cf8soiGfr2PYtfufpXtd7azUFa+WJCWnp0N29EG0BR1JOFC0Q/4dh/X9qulM8luq
 | 
			
		||||
Pjrmw2eSgbdmmdumWAcNPVbV
 | 
			
		||||
-----END CERTIFICATE-----
 | 
			
		||||
							
								
								
									
										50
									
								
								apps/rsa/1.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										50
									
								
								apps/rsa/1.txt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,50 @@
 | 
			
		||||
issuer= /C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority
 | 
			
		||||
subject=/C=US/ST=New York/L=New York/O=Industrial Press Inc./CN=www.industrialpress.com
 | 
			
		||||
Certificate:
 | 
			
		||||
    Data:
 | 
			
		||||
        Version: 1 (0x0)
 | 
			
		||||
        Serial Number:
 | 
			
		||||
            68:ae:14:a4:c9:9f:a9:f3:9a:23:cf:2f:15:19:b3:5a
 | 
			
		||||
        Signature Algorithm: md5WithRSAEncryption
 | 
			
		||||
        Issuer: C=US, O=RSA Data Security, Inc., OU=Secure Server Certification Authority
 | 
			
		||||
        Validity
 | 
			
		||||
            Not Before: May 18 00:00:00 1998 GMT
 | 
			
		||||
            Not After : May 18 23:59:59 1999 GMT
 | 
			
		||||
        Subject: C=US, ST=New York, L=New York, O=Industrial Press Inc., CN=www.industrialpress.com
 | 
			
		||||
        Subject Public Key Info:
 | 
			
		||||
            Public Key Algorithm: rsaEncryption
 | 
			
		||||
            RSA Public Key: (1024 bit)
 | 
			
		||||
                Modulus (1024 bit):
 | 
			
		||||
                    00:aa:21:fd:c5:42:4d:1e:fa:82:99:a0:e8:9f:6e:
 | 
			
		||||
                    d5:6a:52:5b:a9:32:f2:98:5d:f2:28:a5:81:c5:b3:
 | 
			
		||||
                    83:2d:68:d7:ef:22:a3:7b:0a:2a:5a:1a:2d:68:40:
 | 
			
		||||
                    11:23:a8:d7:3e:aa:26:53:ce:e0:15:4d:6d:1f:8a:
 | 
			
		||||
                    ff:6e:0c:21:dc:59:94:30:ad:ea:a3:dd:97:3a:cb:
 | 
			
		||||
                    f0:34:01:f3:5f:35:91:5d:03:49:9a:6e:78:83:61:
 | 
			
		||||
                    75:45:4b:74:d2:98:18:88:ec:62:98:3b:1e:d6:df:
 | 
			
		||||
                    51:2f:93:ce:08:31:1b:7d:7f:03:82:e8:2b:13:f5:
 | 
			
		||||
                    b0:91:2d:85:ad:2a:1c:e7:f7
 | 
			
		||||
                Exponent: 65537 (0x10001)
 | 
			
		||||
    Signature Algorithm: md5WithRSAEncryption
 | 
			
		||||
        8c:3b:7e:f1:74:12:d1:2f:ac:d4:bf:2d:8b:aa:02:05:30:fe:
 | 
			
		||||
        d1:f4:14:b8:02:92:a2:8b:99:86:26:ff:24:7e:67:48:43:d9:
 | 
			
		||||
        e3:ff:52:11:7e:8c:0c:26:57:ca:c7:b4:19:da:4c:ce:e8:37:
 | 
			
		||||
        6d:d1:55:6d:a4:09:ff:2c:a2:21:9f:af:63:d8:b5:fb:9f:a5:
 | 
			
		||||
        7b:5d:ed:ac:d4:15:af:96:24:25:a7:a7:43:76:f4:41:b4:05:
 | 
			
		||||
        1d:49:38:50:b4:43:fe:1d:87:f5:fd:aa:e9:4c:f2:5b:aa:3e:
 | 
			
		||||
        3a:e6:c3:67:92:81:b7:66:99:db:a6:58:07:0d:3d:56:d5
 | 
			
		||||
-----BEGIN CERTIFICATE-----
 | 
			
		||||
MIICTjCCAbsCEGiuFKTJn6nzmiPPLxUZs1owDQYJKoZIhvcNAQEEBQAwXzELMAkG
 | 
			
		||||
A1UEBhMCVVMxIDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYD
 | 
			
		||||
VQQLEyVTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk4
 | 
			
		||||
MDUxODAwMDAwMFoXDTk5MDUxODIzNTk1OVowdTELMAkGA1UEBhMCVVMxETAPBgNV
 | 
			
		||||
BAgTCE5ldyBZb3JrMREwDwYDVQQHFAhOZXcgWW9yazEeMBwGA1UEChQVSW5kdXN0
 | 
			
		||||
cmlhbCBQcmVzcyBJbmMuMSAwHgYDVQQDFBd3d3cuaW5kdXN0cmlhbHByZXNzLmNv
 | 
			
		||||
bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqiH9xUJNHvqCmaDon27ValJb
 | 
			
		||||
qTLymF3yKKWBxbODLWjX7yKjewoqWhotaEARI6jXPqomU87gFU1tH4r/bgwh3FmU
 | 
			
		||||
MK3qo92XOsvwNAHzXzWRXQNJmm54g2F1RUt00pgYiOximDse1t9RL5POCDEbfX8D
 | 
			
		||||
gugrE/WwkS2FrSoc5/cCAwEAATANBgkqhkiG9w0BAQQFAAN+AIw7fvF0EtEvrNS/
 | 
			
		||||
LYuqAgUw/tH0FLgCkqKLmYYm/yR+Z0hD2eP/UhF+jAwmV8rHtBnaTM7oN23RVW2k
 | 
			
		||||
Cf8soiGfr2PYtfufpXtd7azUFa+WJCWnp0N29EG0BR1JOFC0Q/4dh/X9qulM8luq
 | 
			
		||||
Pjrmw2eSgbdmmdumWAcNPVbV
 | 
			
		||||
-----END CERTIFICATE-----
 | 
			
		||||
							
								
								
									
										47
									
								
								apps/rsa/SecureServer.pem
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										47
									
								
								apps/rsa/SecureServer.pem
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,47 @@
 | 
			
		||||
Certificate:
 | 
			
		||||
    Data:
 | 
			
		||||
        Version: 1 (0x0)
 | 
			
		||||
        Serial Number:
 | 
			
		||||
            02:ad:66:7e:4e:45:fe:5e:57:6f:3c:98:19:5e:dd:c0
 | 
			
		||||
        Signature Algorithm: md2WithRSAEncryption
 | 
			
		||||
        Issuer: C=US, O=RSA Data Security, Inc., OU=Secure Server Certification Authority
 | 
			
		||||
        Validity
 | 
			
		||||
            Not Before: Nov  9 00:00:00 1994 GMT
 | 
			
		||||
            Not After : Jan  7 23:59:59 2010 GMT
 | 
			
		||||
        Subject: C=US, O=RSA Data Security, Inc., OU=Secure Server Certification Authority
 | 
			
		||||
        Subject Public Key Info:
 | 
			
		||||
            Public Key Algorithm: rsaEncryption
 | 
			
		||||
            RSA Public Key: (1000 bit)
 | 
			
		||||
                Modulus (1000 bit):
 | 
			
		||||
                    00:92:ce:7a:c1:ae:83:3e:5a:aa:89:83:57:ac:25:
 | 
			
		||||
                    01:76:0c:ad:ae:8e:2c:37:ce:eb:35:78:64:54:03:
 | 
			
		||||
                    e5:84:40:51:c9:bf:8f:08:e2:8a:82:08:d2:16:86:
 | 
			
		||||
                    37:55:e9:b1:21:02:ad:76:68:81:9a:05:a2:4b:c9:
 | 
			
		||||
                    4b:25:66:22:56:6c:88:07:8f:f7:81:59:6d:84:07:
 | 
			
		||||
                    65:70:13:71:76:3e:9b:77:4c:e3:50:89:56:98:48:
 | 
			
		||||
                    b9:1d:a7:29:1a:13:2e:4a:11:59:9c:1e:15:d5:49:
 | 
			
		||||
                    54:2c:73:3a:69:82:b1:97:39:9c:6d:70:67:48:e5:
 | 
			
		||||
                    dd:2d:d6:c8:1e:7b
 | 
			
		||||
                Exponent: 65537 (0x10001)
 | 
			
		||||
    Signature Algorithm: md2WithRSAEncryption
 | 
			
		||||
        65:dd:7e:e1:b2:ec:b0:e2:3a:e0:ec:71:46:9a:19:11:b8:d3:
 | 
			
		||||
        c7:a0:b4:03:40:26:02:3e:09:9c:e1:12:b3:d1:5a:f6:37:a5:
 | 
			
		||||
        b7:61:03:b6:5b:16:69:3b:c6:44:08:0c:88:53:0c:6b:97:49:
 | 
			
		||||
        c7:3e:35:dc:6c:b9:bb:aa:df:5c:bb:3a:2f:93:60:b6:a9:4b:
 | 
			
		||||
        4d:f2:20:f7:cd:5f:7f:64:7b:8e:dc:00:5c:d7:fa:77:ca:39:
 | 
			
		||||
        16:59:6f:0e:ea:d3:b5:83:7f:4d:4d:42:56:76:b4:c9:5f:04:
 | 
			
		||||
        f8:38:f8:eb:d2:5f:75:5f:cd:7b:fc:e5:8e:80:7c:fc:50
 | 
			
		||||
-----BEGIN CERTIFICATE-----
 | 
			
		||||
MIICNDCCAaECEAKtZn5ORf5eV288mBle3cAwDQYJKoZIhvcNAQECBQAwXzELMAkG
 | 
			
		||||
A1UEBhMCVVMxIDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYD
 | 
			
		||||
VQQLEyVTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk0
 | 
			
		||||
MTEwOTAwMDAwMFoXDTEwMDEwNzIzNTk1OVowXzELMAkGA1UEBhMCVVMxIDAeBgNV
 | 
			
		||||
BAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2Vy
 | 
			
		||||
dmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGbMA0GCSqGSIb3DQEBAQUAA4GJ
 | 
			
		||||
ADCBhQJ+AJLOesGugz5aqomDV6wlAXYMra6OLDfO6zV4ZFQD5YRAUcm/jwjiioII
 | 
			
		||||
0haGN1XpsSECrXZogZoFokvJSyVmIlZsiAeP94FZbYQHZXATcXY+m3dM41CJVphI
 | 
			
		||||
uR2nKRoTLkoRWZweFdVJVCxzOmmCsZc5nG1wZ0jl3S3WyB57AgMBAAEwDQYJKoZI
 | 
			
		||||
hvcNAQECBQADfgBl3X7hsuyw4jrg7HFGmhkRuNPHoLQDQCYCPgmc4RKz0Vr2N6W3
 | 
			
		||||
YQO2WxZpO8ZECAyIUwxrl0nHPjXcbLm7qt9cuzovk2C2qUtN8iD3zV9/ZHuO3ABc
 | 
			
		||||
1/p3yjkWWW8O6tO1g39NTUJWdrTJXwT4OPjr0l91X817/OWOgHz8UA==
 | 
			
		||||
-----END CERTIFICATE-----
 | 
			
		||||
							
								
								
									
										49
									
								
								apps/rsa/s.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										49
									
								
								apps/rsa/s.txt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,49 @@
 | 
			
		||||
issuer= /C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority
 | 
			
		||||
subject=/C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority
 | 
			
		||||
Certificate:
 | 
			
		||||
    Data:
 | 
			
		||||
        Version: 1 (0x0)
 | 
			
		||||
        Serial Number:
 | 
			
		||||
            02:ad:66:7e:4e:45:fe:5e:57:6f:3c:98:19:5e:dd:c0
 | 
			
		||||
        Signature Algorithm: md2WithRSAEncryption
 | 
			
		||||
        Issuer: C=US, O=RSA Data Security, Inc., OU=Secure Server Certification Authority
 | 
			
		||||
        Validity
 | 
			
		||||
            Not Before: Nov  9 00:00:00 1994 GMT
 | 
			
		||||
            Not After : Jan  7 23:59:59 2010 GMT
 | 
			
		||||
        Subject: C=US, O=RSA Data Security, Inc., OU=Secure Server Certification Authority
 | 
			
		||||
        Subject Public Key Info:
 | 
			
		||||
            Public Key Algorithm: rsaEncryption
 | 
			
		||||
            RSA Public Key: (1000 bit)
 | 
			
		||||
                Modulus (1000 bit):
 | 
			
		||||
                    00:92:ce:7a:c1:ae:83:3e:5a:aa:89:83:57:ac:25:
 | 
			
		||||
                    01:76:0c:ad:ae:8e:2c:37:ce:eb:35:78:64:54:03:
 | 
			
		||||
                    e5:84:40:51:c9:bf:8f:08:e2:8a:82:08:d2:16:86:
 | 
			
		||||
                    37:55:e9:b1:21:02:ad:76:68:81:9a:05:a2:4b:c9:
 | 
			
		||||
                    4b:25:66:22:56:6c:88:07:8f:f7:81:59:6d:84:07:
 | 
			
		||||
                    65:70:13:71:76:3e:9b:77:4c:e3:50:89:56:98:48:
 | 
			
		||||
                    b9:1d:a7:29:1a:13:2e:4a:11:59:9c:1e:15:d5:49:
 | 
			
		||||
                    54:2c:73:3a:69:82:b1:97:39:9c:6d:70:67:48:e5:
 | 
			
		||||
                    dd:2d:d6:c8:1e:7b
 | 
			
		||||
                Exponent: 65537 (0x10001)
 | 
			
		||||
    Signature Algorithm: md2WithRSAEncryption
 | 
			
		||||
        65:dd:7e:e1:b2:ec:b0:e2:3a:e0:ec:71:46:9a:19:11:b8:d3:
 | 
			
		||||
        c7:a0:b4:03:40:26:02:3e:09:9c:e1:12:b3:d1:5a:f6:37:a5:
 | 
			
		||||
        b7:61:03:b6:5b:16:69:3b:c6:44:08:0c:88:53:0c:6b:97:49:
 | 
			
		||||
        c7:3e:35:dc:6c:b9:bb:aa:df:5c:bb:3a:2f:93:60:b6:a9:4b:
 | 
			
		||||
        4d:f2:20:f7:cd:5f:7f:64:7b:8e:dc:00:5c:d7:fa:77:ca:39:
 | 
			
		||||
        16:59:6f:0e:ea:d3:b5:83:7f:4d:4d:42:56:76:b4:c9:5f:04:
 | 
			
		||||
        f8:38:f8:eb:d2:5f:75:5f:cd:7b:fc:e5:8e:80:7c:fc:50
 | 
			
		||||
-----BEGIN CERTIFICATE-----
 | 
			
		||||
MIICNDCCAaECEAKtZn5ORf5eV288mBle3cAwDQYJKoZIhvcNAQECBQAwXzELMAkG
 | 
			
		||||
A1UEBhMCVVMxIDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYD
 | 
			
		||||
VQQLEyVTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk0
 | 
			
		||||
MTEwOTAwMDAwMFoXDTEwMDEwNzIzNTk1OVowXzELMAkGA1UEBhMCVVMxIDAeBgNV
 | 
			
		||||
BAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2Vy
 | 
			
		||||
dmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGbMA0GCSqGSIb3DQEBAQUAA4GJ
 | 
			
		||||
ADCBhQJ+AJLOesGugz5aqomDV6wlAXYMra6OLDfO6zV4ZFQD5YRAUcm/jwjiioII
 | 
			
		||||
0haGN1XpsSECrXZogZoFokvJSyVmIlZsiAeP94FZbYQHZXATcXY+m3dM41CJVphI
 | 
			
		||||
uR2nKRoTLkoRWZweFdVJVCxzOmmCsZc5nG1wZ0jl3S3WyB57AgMBAAEwDQYJKoZI
 | 
			
		||||
hvcNAQECBQADfgBl3X7hsuyw4jrg7HFGmhkRuNPHoLQDQCYCPgmc4RKz0Vr2N6W3
 | 
			
		||||
YQO2WxZpO8ZECAyIUwxrl0nHPjXcbLm7qt9cuzovk2C2qUtN8iD3zV9/ZHuO3ABc
 | 
			
		||||
1/p3yjkWWW8O6tO1g39NTUJWdrTJXwT4OPjr0l91X817/OWOgHz8UA==
 | 
			
		||||
-----END CERTIFICATE-----
 | 
			
		||||
							
								
								
									
										333
									
								
								apps/rsautl.c
									
									
									
									
									
								
							
							
						
						
									
										333
									
								
								apps/rsautl.c
									
									
									
									
									
								
							@@ -1,333 +0,0 @@
 | 
			
		||||
/* rsautl.c */
 | 
			
		||||
/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
 | 
			
		||||
 * project 2000.
 | 
			
		||||
 */
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * 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 above 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 acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 | 
			
		||||
 *    endorse or promote products derived from this software without
 | 
			
		||||
 *    prior written permission. For written permission, please contact
 | 
			
		||||
 *    licensing@OpenSSL.org.
 | 
			
		||||
 *
 | 
			
		||||
 * 5. Products derived from this software may not be called "OpenSSL"
 | 
			
		||||
 *    nor may "OpenSSL" appear in their names without prior written
 | 
			
		||||
 *    permission of the OpenSSL Project.
 | 
			
		||||
 *
 | 
			
		||||
 * 6. Redistributions of any form whatsoever must retain the following
 | 
			
		||||
 *    acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 | 
			
		||||
 * EXPRESSED 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 OpenSSL PROJECT OR
 | 
			
		||||
 * ITS 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.
 | 
			
		||||
 * ====================================================================
 | 
			
		||||
 *
 | 
			
		||||
 * This product includes cryptographic software written by Eric Young
 | 
			
		||||
 * (eay@cryptsoft.com).  This product includes software written by Tim
 | 
			
		||||
 * Hudson (tjh@cryptsoft.com).
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include <openssl/opensslconf.h>
 | 
			
		||||
#ifndef OPENSSL_NO_RSA
 | 
			
		||||
 | 
			
		||||
#include "apps.h"
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include <openssl/err.h>
 | 
			
		||||
#include <openssl/pem.h>
 | 
			
		||||
#include <openssl/rsa.h>
 | 
			
		||||
 | 
			
		||||
#define RSA_SIGN 	1
 | 
			
		||||
#define RSA_VERIFY 	2
 | 
			
		||||
#define RSA_ENCRYPT 	3
 | 
			
		||||
#define RSA_DECRYPT 	4
 | 
			
		||||
 | 
			
		||||
#define KEY_PRIVKEY	1
 | 
			
		||||
#define KEY_PUBKEY	2
 | 
			
		||||
#define KEY_CERT	3
 | 
			
		||||
 | 
			
		||||
static void usage(void);
 | 
			
		||||
 | 
			
		||||
#undef PROG
 | 
			
		||||
 | 
			
		||||
#define PROG rsautl_main
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **);
 | 
			
		||||
 | 
			
		||||
int MAIN(int argc, char **argv)
 | 
			
		||||
{
 | 
			
		||||
	ENGINE *e = NULL;
 | 
			
		||||
	BIO *in = NULL, *out = NULL;
 | 
			
		||||
	char *infile = NULL, *outfile = NULL;
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	char *engine = NULL;
 | 
			
		||||
#endif
 | 
			
		||||
	char *keyfile = NULL;
 | 
			
		||||
	char rsa_mode = RSA_VERIFY, key_type = KEY_PRIVKEY;
 | 
			
		||||
	int keyform = FORMAT_PEM;
 | 
			
		||||
	char need_priv = 0, badarg = 0, rev = 0;
 | 
			
		||||
	char hexdump = 0, asn1parse = 0;
 | 
			
		||||
	X509 *x;
 | 
			
		||||
	EVP_PKEY *pkey = NULL;
 | 
			
		||||
	RSA *rsa = NULL;
 | 
			
		||||
	unsigned char *rsa_in = NULL, *rsa_out = NULL, pad;
 | 
			
		||||
	char *passargin = NULL, *passin = NULL;
 | 
			
		||||
	int rsa_inlen, rsa_outlen = 0;
 | 
			
		||||
	int keysize;
 | 
			
		||||
 | 
			
		||||
	int ret = 1;
 | 
			
		||||
 | 
			
		||||
	argc--;
 | 
			
		||||
	argv++;
 | 
			
		||||
 | 
			
		||||
	if(!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 | 
			
		||||
 | 
			
		||||
	if (!load_config(bio_err, NULL))
 | 
			
		||||
		goto end;
 | 
			
		||||
	ERR_load_crypto_strings();
 | 
			
		||||
	OpenSSL_add_all_algorithms();
 | 
			
		||||
	pad = RSA_PKCS1_PADDING;
 | 
			
		||||
	
 | 
			
		||||
	while(argc >= 1)
 | 
			
		||||
	{
 | 
			
		||||
		if (!strcmp(*argv,"-in")) {
 | 
			
		||||
			if (--argc < 1) badarg = 1;
 | 
			
		||||
                        infile= *(++argv);
 | 
			
		||||
		} else if (!strcmp(*argv,"-out")) {
 | 
			
		||||
			if (--argc < 1) badarg = 1;
 | 
			
		||||
			outfile= *(++argv);
 | 
			
		||||
		} else if(!strcmp(*argv, "-inkey")) {
 | 
			
		||||
			if (--argc < 1) badarg = 1;
 | 
			
		||||
			keyfile = *(++argv);
 | 
			
		||||
		} else if (!strcmp(*argv,"-passin")) {
 | 
			
		||||
			if (--argc < 1) badarg = 1;
 | 
			
		||||
			passargin= *(++argv);
 | 
			
		||||
		} else if (strcmp(*argv,"-keyform") == 0) {
 | 
			
		||||
			if (--argc < 1) badarg = 1;
 | 
			
		||||
			keyform=str2fmt(*(++argv));
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
		} else if(!strcmp(*argv, "-engine")) {
 | 
			
		||||
			if (--argc < 1) badarg = 1;
 | 
			
		||||
			engine = *(++argv);
 | 
			
		||||
#endif
 | 
			
		||||
		} else if(!strcmp(*argv, "-pubin")) {
 | 
			
		||||
			key_type = KEY_PUBKEY;
 | 
			
		||||
		} else if(!strcmp(*argv, "-certin")) {
 | 
			
		||||
			key_type = KEY_CERT;
 | 
			
		||||
		} 
 | 
			
		||||
		else if(!strcmp(*argv, "-asn1parse")) asn1parse = 1;
 | 
			
		||||
		else if(!strcmp(*argv, "-hexdump")) hexdump = 1;
 | 
			
		||||
		else if(!strcmp(*argv, "-raw")) pad = RSA_NO_PADDING;
 | 
			
		||||
		else if(!strcmp(*argv, "-oaep")) pad = RSA_PKCS1_OAEP_PADDING;
 | 
			
		||||
		else if(!strcmp(*argv, "-ssl")) pad = RSA_SSLV23_PADDING;
 | 
			
		||||
		else if(!strcmp(*argv, "-pkcs")) pad = RSA_PKCS1_PADDING;
 | 
			
		||||
		else if(!strcmp(*argv, "-x931")) pad = RSA_X931_PADDING;
 | 
			
		||||
		else if(!strcmp(*argv, "-sign")) {
 | 
			
		||||
			rsa_mode = RSA_SIGN;
 | 
			
		||||
			need_priv = 1;
 | 
			
		||||
		} else if(!strcmp(*argv, "-verify")) rsa_mode = RSA_VERIFY;
 | 
			
		||||
		else if(!strcmp(*argv, "-rev")) rev = 1;
 | 
			
		||||
		else if(!strcmp(*argv, "-encrypt")) rsa_mode = RSA_ENCRYPT;
 | 
			
		||||
		else if(!strcmp(*argv, "-decrypt")) {
 | 
			
		||||
			rsa_mode = RSA_DECRYPT;
 | 
			
		||||
			need_priv = 1;
 | 
			
		||||
		} else badarg = 1;
 | 
			
		||||
		if(badarg) {
 | 
			
		||||
			usage();
 | 
			
		||||
			goto end;
 | 
			
		||||
		}
 | 
			
		||||
		argc--;
 | 
			
		||||
		argv++;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if(need_priv && (key_type != KEY_PRIVKEY)) {
 | 
			
		||||
		BIO_printf(bio_err, "A private key is needed for this operation\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
        e = setup_engine(bio_err, engine, 0);
 | 
			
		||||
#endif
 | 
			
		||||
	if(!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
 | 
			
		||||
		BIO_printf(bio_err, "Error getting password\n");
 | 
			
		||||
		goto end;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
/* FIXME: seed PRNG only if needed */
 | 
			
		||||
	app_RAND_load_file(NULL, bio_err, 0);
 | 
			
		||||
	
 | 
			
		||||
	switch(key_type) {
 | 
			
		||||
		case KEY_PRIVKEY:
 | 
			
		||||
		pkey = load_key(bio_err, keyfile, keyform, 0,
 | 
			
		||||
			passin, e, "Private Key");
 | 
			
		||||
		break;
 | 
			
		||||
 | 
			
		||||
		case KEY_PUBKEY:
 | 
			
		||||
		pkey = load_pubkey(bio_err, keyfile, keyform, 0,
 | 
			
		||||
			NULL, e, "Public Key");
 | 
			
		||||
		break;
 | 
			
		||||
 | 
			
		||||
		case KEY_CERT:
 | 
			
		||||
		x = load_cert(bio_err, keyfile, keyform,
 | 
			
		||||
			NULL, e, "Certificate");
 | 
			
		||||
		if(x) {
 | 
			
		||||
			pkey = X509_get_pubkey(x);
 | 
			
		||||
			X509_free(x);
 | 
			
		||||
		}
 | 
			
		||||
		break;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if(!pkey) {
 | 
			
		||||
		return 1;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	rsa = EVP_PKEY_get1_RSA(pkey);
 | 
			
		||||
	EVP_PKEY_free(pkey);
 | 
			
		||||
 | 
			
		||||
	if(!rsa) {
 | 
			
		||||
		BIO_printf(bio_err, "Error getting RSA key\n");
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		goto end;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
	if(infile) {
 | 
			
		||||
		if(!(in = BIO_new_file(infile, "rb"))) {
 | 
			
		||||
			BIO_printf(bio_err, "Error Reading Input File\n");
 | 
			
		||||
			ERR_print_errors(bio_err);	
 | 
			
		||||
			goto end;
 | 
			
		||||
		}
 | 
			
		||||
	} else in = BIO_new_fp(stdin, BIO_NOCLOSE);
 | 
			
		||||
 | 
			
		||||
	if(outfile) {
 | 
			
		||||
		if(!(out = BIO_new_file(outfile, "wb"))) {
 | 
			
		||||
			BIO_printf(bio_err, "Error Reading Output File\n");
 | 
			
		||||
			ERR_print_errors(bio_err);	
 | 
			
		||||
			goto end;
 | 
			
		||||
		}
 | 
			
		||||
	} else {
 | 
			
		||||
		out = BIO_new_fp(stdout, BIO_NOCLOSE);
 | 
			
		||||
#ifdef OPENSSL_SYS_VMS
 | 
			
		||||
		{
 | 
			
		||||
		    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
			
		||||
		    out = BIO_push(tmpbio, out);
 | 
			
		||||
		}
 | 
			
		||||
#endif
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	keysize = RSA_size(rsa);
 | 
			
		||||
 | 
			
		||||
	rsa_in = OPENSSL_malloc(keysize * 2);
 | 
			
		||||
	rsa_out = OPENSSL_malloc(keysize);
 | 
			
		||||
 | 
			
		||||
	/* Read the input data */
 | 
			
		||||
	rsa_inlen = BIO_read(in, rsa_in, keysize * 2);
 | 
			
		||||
	if(rsa_inlen <= 0) {
 | 
			
		||||
		BIO_printf(bio_err, "Error reading input Data\n");
 | 
			
		||||
		exit(1);
 | 
			
		||||
	}
 | 
			
		||||
	if(rev) {
 | 
			
		||||
		int i;
 | 
			
		||||
		unsigned char ctmp;
 | 
			
		||||
		for(i = 0; i < rsa_inlen/2; i++) {
 | 
			
		||||
			ctmp = rsa_in[i];
 | 
			
		||||
			rsa_in[i] = rsa_in[rsa_inlen - 1 - i];
 | 
			
		||||
			rsa_in[rsa_inlen - 1 - i] = ctmp;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	switch(rsa_mode) {
 | 
			
		||||
 | 
			
		||||
		case RSA_VERIFY:
 | 
			
		||||
			rsa_outlen  = RSA_public_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
 | 
			
		||||
		break;
 | 
			
		||||
 | 
			
		||||
		case RSA_SIGN:
 | 
			
		||||
			rsa_outlen  = RSA_private_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
 | 
			
		||||
		break;
 | 
			
		||||
 | 
			
		||||
		case RSA_ENCRYPT:
 | 
			
		||||
			rsa_outlen  = RSA_public_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
 | 
			
		||||
		break;
 | 
			
		||||
 | 
			
		||||
		case RSA_DECRYPT:
 | 
			
		||||
			rsa_outlen  = RSA_private_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
 | 
			
		||||
		break;
 | 
			
		||||
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if(rsa_outlen <= 0) {
 | 
			
		||||
		BIO_printf(bio_err, "RSA operation error\n");
 | 
			
		||||
		ERR_print_errors(bio_err);
 | 
			
		||||
		goto end;
 | 
			
		||||
	}
 | 
			
		||||
	ret = 0;
 | 
			
		||||
	if(asn1parse) {
 | 
			
		||||
		if(!ASN1_parse_dump(out, rsa_out, rsa_outlen, 1, -1)) {
 | 
			
		||||
			ERR_print_errors(bio_err);
 | 
			
		||||
		}
 | 
			
		||||
	} else if(hexdump) BIO_dump(out, (char *)rsa_out, rsa_outlen);
 | 
			
		||||
	else BIO_write(out, rsa_out, rsa_outlen);
 | 
			
		||||
	end:
 | 
			
		||||
	RSA_free(rsa);
 | 
			
		||||
	BIO_free(in);
 | 
			
		||||
	BIO_free_all(out);
 | 
			
		||||
	if(rsa_in) OPENSSL_free(rsa_in);
 | 
			
		||||
	if(rsa_out) OPENSSL_free(rsa_out);
 | 
			
		||||
	if(passin) OPENSSL_free(passin);
 | 
			
		||||
	return ret;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void usage()
 | 
			
		||||
{
 | 
			
		||||
	BIO_printf(bio_err, "Usage: rsautl [options]\n");
 | 
			
		||||
	BIO_printf(bio_err, "-in file        input file\n");
 | 
			
		||||
	BIO_printf(bio_err, "-out file       output file\n");
 | 
			
		||||
	BIO_printf(bio_err, "-inkey file     input key\n");
 | 
			
		||||
	BIO_printf(bio_err, "-keyform arg    private key format - default PEM\n");
 | 
			
		||||
	BIO_printf(bio_err, "-pubin          input is an RSA public\n");
 | 
			
		||||
	BIO_printf(bio_err, "-certin         input is a certificate carrying an RSA public key\n");
 | 
			
		||||
	BIO_printf(bio_err, "-ssl            use SSL v2 padding\n");
 | 
			
		||||
	BIO_printf(bio_err, "-raw            use no padding\n");
 | 
			
		||||
	BIO_printf(bio_err, "-pkcs           use PKCS#1 v1.5 padding (default)\n");
 | 
			
		||||
	BIO_printf(bio_err, "-oaep           use PKCS#1 OAEP\n");
 | 
			
		||||
	BIO_printf(bio_err, "-sign           sign with private key\n");
 | 
			
		||||
	BIO_printf(bio_err, "-verify         verify with public key\n");
 | 
			
		||||
	BIO_printf(bio_err, "-encrypt        encrypt with public key\n");
 | 
			
		||||
	BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
 | 
			
		||||
	BIO_printf(bio_err, "-hexdump        hex dump output\n");
 | 
			
		||||
#ifndef OPENSSL_NO_ENGINE
 | 
			
		||||
	BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
 | 
			
		||||
	BIO_printf (bio_err, "-passin arg    pass phrase source\n");
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
@@ -55,73 +55,9 @@
 | 
			
		||||
 * copied and put under another distribution licence
 | 
			
		||||
 * [including the GNU Public Licence.]
 | 
			
		||||
 */
 | 
			
		||||
/* ====================================================================
 | 
			
		||||
 * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * 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 above 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 acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 | 
			
		||||
 *    endorse or promote products derived from this software without
 | 
			
		||||
 *    prior written permission. For written permission, please contact
 | 
			
		||||
 *    openssl-core@openssl.org.
 | 
			
		||||
 *
 | 
			
		||||
 * 5. Products derived from this software may not be called "OpenSSL"
 | 
			
		||||
 *    nor may "OpenSSL" appear in their names without prior written
 | 
			
		||||
 *    permission of the OpenSSL Project.
 | 
			
		||||
 *
 | 
			
		||||
 * 6. Redistributions of any form whatsoever must retain the following
 | 
			
		||||
 *    acknowledgment:
 | 
			
		||||
 *    "This product includes software developed by the OpenSSL Project
 | 
			
		||||
 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 | 
			
		||||
 *
 | 
			
		||||
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 | 
			
		||||
 * EXPRESSED 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 OpenSSL PROJECT OR
 | 
			
		||||
 * ITS 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.
 | 
			
		||||
 * ====================================================================
 | 
			
		||||
 *
 | 
			
		||||
 * This product includes cryptographic software written by Eric Young
 | 
			
		||||
 * (eay@cryptsoft.com).  This product includes software written by Tim
 | 
			
		||||
 * Hudson (tjh@cryptsoft.com).
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
#if !defined(OPENSSL_SYS_NETWARE)  /* conflicts with winsock2 stuff on netware */
 | 
			
		||||
 | 
			
		||||
#include <sys/types.h>
 | 
			
		||||
#endif
 | 
			
		||||
#include <openssl/opensslconf.h>
 | 
			
		||||
 | 
			
		||||
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
 | 
			
		||||
#include <conio.h>
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef OPENSSL_SYS_MSDOS
 | 
			
		||||
#define _kbhit kbhit
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if defined(OPENSSL_SYS_VMS) && !defined(FD_SET)
 | 
			
		||||
#if (defined(VMS) || defined(__VMS)) && !defined(FD_SET)
 | 
			
		||||
/* VAX C does not defined fd_set and friends, but it's actually quite simple */
 | 
			
		||||
/* These definitions are borrowed from SOCKETSHR.	/Richard Levitte */
 | 
			
		||||
#define MAX_NOFILE	32
 | 
			
		||||
@@ -148,23 +84,37 @@ typedef fd_mask fd_set;
 | 
			
		||||
#define PORT_STR        "4433"
 | 
			
		||||
#define PROTOCOL        "tcp"
 | 
			
		||||
 | 
			
		||||
int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
 | 
			
		||||
int do_accept(int acc_sock, int *sock, char **host);
 | 
			
		||||
int do_server(int port, int *ret, int (*cb) (), char *context);
 | 
			
		||||
#ifdef HEADER_X509_H
 | 
			
		||||
int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
 | 
			
		||||
#else
 | 
			
		||||
int MS_CALLBACK verify_callback(int ok, char *ctx);
 | 
			
		||||
#endif
 | 
			
		||||
#ifdef HEADER_SSL_H
 | 
			
		||||
int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
 | 
			
		||||
int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);
 | 
			
		||||
#else
 | 
			
		||||
int set_cert_stuff(char *ctx, char *cert_file, char *key_file);
 | 
			
		||||
#endif
 | 
			
		||||
int init_client(int *sock, char *server, int port, int type);
 | 
			
		||||
int init_client(int *sock, char *server, int port);
 | 
			
		||||
int init_client_ip(int *sock,unsigned char ip[4], int port);
 | 
			
		||||
int nbio_init_client_ip(int *sock,unsigned char ip[4], int port);
 | 
			
		||||
int nbio_sock_error(int sock);
 | 
			
		||||
int spawn(int argc, char **argv, int *in, int *out);
 | 
			
		||||
int init_server(int *sock, int port);
 | 
			
		||||
int init_server_long(int *sock, int port,char *ip);
 | 
			
		||||
int should_retry(int i);
 | 
			
		||||
void sock_cleanup(void );
 | 
			
		||||
int extract_port(char *str, short *port_ptr);
 | 
			
		||||
int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
 | 
			
		||||
int host_ip(char *str, unsigned char ip[4]);
 | 
			
		||||
 | 
			
		||||
long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
 | 
			
		||||
long MS_CALLBACK bio_dump_cb(BIO *bio, int cmd, const char *argp,
 | 
			
		||||
	int argi, long argl, long ret);
 | 
			
		||||
 | 
			
		||||
#ifdef HEADER_SSL_H
 | 
			
		||||
void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret);
 | 
			
		||||
void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg);
 | 
			
		||||
void MS_CALLBACK apps_ssl_info_callback(SSL *s, int where, int ret);
 | 
			
		||||
#else
 | 
			
		||||
void MS_CALLBACK apps_ssl_info_callback(char *s, int where, int ret);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user