Commit 863fe2ec authored by Bodo Möller's avatar Bodo Möller
Browse files

cleaning up a little

parent 3a6a39c3

Configure

+3 −4
Original line number Diff line number Diff line
@@ -937,12 +937,11 @@ sub dofile 
		{

		grep(/$k/ && ($_=sprintf($m{$k}."\n",$p)),@a);

		}

	($ff=$f) =~ s/\..*$//;

	open(OUT,">$ff.new") || die "unable to open $f:$!\n";

	open(OUT,">$f.new") || die "unable to open $f.new:$!\n";

	print OUT @a;

	close(OUT);

	rename($f,"$ff.bak") || die "unable to rename $f\n" if -e $f;

	rename("$ff.new",$f) || die "unable to rename $ff.new\n";

	rename($f,"$f.bak") || die "unable to rename $f\n" if -e $f;

	rename("$f.new",$f) || die "unable to rename $f.new\n";

	}



sub print_table_entry

apps/eay.c

deleted100644 → 0
+0 −131
Original line number Diff line number Diff line 
/* 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

apps/openssl.c

+0 −34
Original line number Diff line number Diff line
@@ -56,10 +56,6 @@ 
 * [including the GNU Public Licence.]

 */



#ifndef DEBUG

#undef DEBUG

#endif



#include <stdio.h>

#include <string.h>

#include <stdlib.h>
@@ -77,12 +73,6 @@ 
#include "s_apps.h"

#include <openssl/err.h>



/*

#ifdef WINDOWS

#include "bss_file.c"

#endif

*/



static unsigned long MS_CALLBACK hash(FUNCTION *a);

static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b);

static LHASH *prog_init(void );
@@ -90,15 +80,6 @@ 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

BIO *bio_err=NULL;
@@ -120,15 +101,6 @@ int main(int Argc, char *Argv[]) 
	arg.data=NULL;

	arg.count=0;



#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();
@@ -235,12 +207,6 @@ end: 
	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)

		{

apps/rsa/01.pem

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
-----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-----

apps/rsa/1.txt

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
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-----