openssl

asn1

Merge from main trunk, conflicts resolved

2000-08-01 12:21:46 +00:00

bf

Things merged from the main trunk, among others some well needed Win32

2000-06-23 22:24:53 +00:00

bio

Merge from main trunk, conflicts resolved

2000-08-01 12:21:46 +00:00

bn

Merge from main trunk, conflicts resolved

2000-08-01 12:21:46 +00:00

buffer

- merged in the latest from the main trunk, fixed all conflicts

2000-06-13 16:21:06 +00:00

cast

Merge in code from main trunk to BRANCH_engine.

2000-06-08 11:00:37 +00:00

comp

Merge from main, all conflicts resolved.

2000-07-12 16:34:34 +00:00

conf

Merge of stuff from main trunk, all conflicts resolved.

2000-06-19 14:44:57 +00:00

des

- merged in the latest from the main trunk, fixed all conflicts

2000-06-13 16:21:06 +00:00

dh

Merge from main, all conflicts resolved.

2000-07-12 16:34:34 +00:00

dsa

Merge from main, all conflicts resolved.

2000-07-12 16:34:34 +00:00

dso

Things merged from the main trunk, among others some well needed Win32

2000-06-23 22:24:53 +00:00

engine

This commit takes care of a couple of things;

2000-07-31 15:05:30 +00:00

err

Merge from main trunk, conflicts resolved

2000-08-01 12:21:46 +00:00

evp

Merge from main trunk, conflicts resolved

2000-08-01 12:21:46 +00:00

hmac

Merge from main, all conflicts resolved.

2000-07-12 16:34:34 +00:00

idea

Merge in code from main trunk to BRANCH_engine.

2000-06-08 11:00:37 +00:00

lhash

- merged in the latest from the main trunk, fixed all conflicts

2000-06-13 16:21:06 +00:00

md2

- merged in the latest from the main trunk, fixed all conflicts

2000-06-13 16:21:06 +00:00

md5

Things merged from the main trunk, among others some well needed Win32

2000-06-23 22:24:53 +00:00

mdc2

- merged in the latest from the main trunk, fixed all conflicts

2000-06-13 16:21:06 +00:00

objects

"make update"

2000-07-24 10:02:47 +00:00

pem

Merge from main, all conflicts resolved.

2000-07-12 16:34:34 +00:00

perlasm

Move the 'file scope' argument in set_label to

2000-03-03 00:06:40 +00:00

pkcs7

Merge from main, all conflicts resolved.

2000-07-12 16:34:34 +00:00

pkcs12

Merge from main, all conflicts resolved.

2000-07-12 16:34:34 +00:00

rand

Merge from main trunk, conflicts resolved

2000-08-01 12:21:46 +00:00

rc2

Merge in code from main trunk to BRANCH_engine.

2000-06-08 11:00:37 +00:00

rc4

In Message-ID: <003201bfb332$14a07520$0801a8c0@janm.transactionsite.com>,

2000-05-02 12:16:01 +00:00

rc5

Merge in code from main trunk to BRANCH_engine.

2000-06-08 11:00:37 +00:00

ripemd

Things merged from the main trunk, among others some well needed Win32

2000-06-23 22:24:53 +00:00

rsa

Merge from main trunk, conflicts resolved

2000-08-01 12:21:46 +00:00

sha

In some of the Makefiles CPP was not defined.

2000-03-20 18:16:52 +00:00

stack

"make update"

2000-07-24 10:02:47 +00:00

threads

Merge in code from main trunk to BRANCH_engine.

2000-06-08 11:00:37 +00:00

txt_db

- merged in the latest from the main trunk, fixed all conflicts

2000-06-13 16:21:06 +00:00

x509

Merge from main trunk, conflicts resolved

2000-08-01 12:21:46 +00:00

x509v3

Merge from main, all conflicts resolved.

2000-07-12 16:34:34 +00:00

.cvsignore

Always use buildinf.h, which now includes the mk1mfinf.h data.

1999-07-29 12:57:23 +00:00

cpt_err.c

Merge of stuff from main trunk, all conflicts resolved.

2000-06-19 14:44:57 +00:00

cryptlib.c

Things merged from the main trunk, among others some well needed Win32

2000-06-23 22:24:53 +00:00

cryptlib.h

In Message-ID: <003201bfb332$14a07520$0801a8c0@janm.transactionsite.com>,

2000-05-02 12:35:04 +00:00

crypto-lib.com

Merge of stuff from main trunk, all conflicts resolved.

2000-06-19 14:44:57 +00:00

crypto.h

Merge from main trunk, conflicts resolved

2000-08-01 12:21:46 +00:00

cversion.c

Always use buildinf.h, which now includes the mk1mfinf.h data.

1999-07-29 12:57:23 +00:00

ebcdic.c

Add new -notext option to 'ca', -pubkey option to spkac.

2000-02-03 02:56:48 +00:00

ebcdic.h

EBCDIC support.

2000-02-01 02:21:16 +00:00

ex_data.c

Merge in code from main trunk to BRANCH_engine.

2000-06-08 11:00:37 +00:00

install.com

Merge of stuff from main trunk, all conflicts resolved.

2000-06-19 14:44:57 +00:00

Makefile.ssl

- merged in the latest from the main trunk, fixed all conflicts

2000-06-13 16:21:06 +00:00

md32_common.h

Fix signed/unsigned warnings.

2000-02-16 12:09:17 +00:00

mem_dbg.c

Merge in code from main trunk to BRANCH_engine.

2000-06-08 11:00:37 +00:00

mem.c

Merge in code from main trunk to BRANCH_engine.

2000-06-08 11:00:37 +00:00

opensslconf.h.in

Cosmetic change. No, openssl.h.in is not autogenerated :-)

2000-02-18 09:06:55 +00:00

opensslv.h

Merge from main trunk, conflicts resolved

2000-08-01 12:21:46 +00:00

tmdiff.c

Merge in code from main trunk to BRANCH_engine.

2000-06-08 11:00:37 +00:00

tmdiff.h

Remove NOPROTO definitions and error code comments.

1999-04-26 16:43:10 +00:00