Select updates from HEAD
This commit is contained in:
parent
d8646dab14
commit
11f35a036d
@ -1215,7 +1215,12 @@ static RAND_METHOD padlock_rand = {
|
||||
padlock_rand_status, /* rand status */
|
||||
};
|
||||
|
||||
#endif /* COMPILE_HW_PADLOCK */
|
||||
#else /* !COMPILE_HW_PADLOCK */
|
||||
#ifndef OPENSSL_NO_DYNAMIC_ENGINE
|
||||
OPENSSL_EXPORT
|
||||
int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { return 0; }
|
||||
IMPLEMENT_DYNAMIC_CHECK_FN()
|
||||
#endif
|
||||
|
||||
#endif /* !OPENSSL_NO_HW_PADLOCK */
|
||||
#endif /* !OPENSSL_NO_HW */
|
||||
|
@ -1,5 +1,5 @@
|
||||
$!
|
||||
$! MAKEAPPS.COM
|
||||
$! MAKEENGINES.COM
|
||||
$! Written By: Richard Levitte
|
||||
$! richard@levitte.org
|
||||
$!
|
||||
@ -203,6 +203,10 @@ $!
|
||||
$ FILE_DONE:
|
||||
$ CLOSE OBJECTS
|
||||
$!
|
||||
$! Do not link the support files.
|
||||
$!
|
||||
$ IF ENGINE_NAME .EQS. "" THEN GOTO ENGINE_DONE
|
||||
$!
|
||||
$! Now, there are two ways to handle this. We can either build
|
||||
$! shareable images or stick the engine object file into libcrypto.
|
||||
$! For now, the latter is NOT supported.
|
||||
|
Loading…
x
Reference in New Issue
Block a user