Merge of stuff from main trunk, all conflicts resolved, and addition
authorRichard Levitte <levitte@openssl.org>
Mon, 19 Jun 2000 17:28:22 +0000 (17:28 +0000)
committerRichard Levitte <levitte@openssl.org>
Mon, 19 Jun 2000 17:28:22 +0000 (17:28 +0000)
commitb215f70a0ee3081b99d0b45241c0b12cdcb4a97c
tree1a5d467190451627814c8bf9433149db66b524b9
parent7ed20a21587bf02890c4db6b8b5482b823bb9aa6
Merge ... stuff from main trunk, all conflicts resolved, and addition
of dynamic lock support in the nCipher code.
crypto/engine/hw_ncipher.c