#
#
# patch "ChangeLog"
# from [7fbfacfd6eb7f8444712762f48501ae2b206ad6b]
# to [2d5df0e78d7078432c18bd807269c1f7f648bbef]
#
# patch "lua.cc"
# from [8284c5010bee38f15141c3e60eeeeb7c288ee20c]
# to [6583ce3385e41b5082117dfb7c7c74fd8650e403]
#
# patch "lua.hh"
# from [a682ec35ee70ef30fd080616f8f21d8ef2a1a6ea]
# to [5691c7c116dc402741a8a9ba7f5ab7d2ebe7b2e0]
#
# patch "monotone.texi"
# from [355d07f84caee318dd69f37ff6274842ca2d2c70]
# to [0d7dfe06bd5f010a0d27fe896ed945fc9c0adbfd]
#
# patch "std_hooks.lua"
# from [8f01e338e8056c62de500694210fd22dacac6122]
# to [87a925a89f17ae312390049e28296bbb9f7ee170]
#
# patch "test_hooks.lua"
# from [391ca756f0e4bd4325ffba83caf9a698b1713e23]
# to [c8ca29aac8840285176dc56724352917a3b52bf2]
#
# patch "testsuite.at"
# from [7f433b14b3bd2a67eeacc49577a64e35d97ed02f]
# to [4fb9cd7e48089507285848138527d727a364860d]
#
============================================================
--- ChangeLog 7fbfacfd6eb7f8444712762f48501ae2b206ad6b
+++ ChangeLog 2d5df0e78d7078432c18bd807269c1f7f648bbef
@@ -1,5 +1,8 @@
2006-02-17 Matthew Gregan
+ * lua.cc, lua.hh, monotone.texi, std_hooks.lua, test_hooks.lua,
+ testsuite.at: Remove unused non_blocking_rng_ok hook.
+
* sqlite/*: Import SQLite 3.3.4.
2006-02-16 Patrick Mauritz
============================================================
--- lua.cc 8284c5010bee38f15141c3e60eeeeb7c288ee20c
+++ lua.cc 6583ce3385e41b5082117dfb7c7c74fd8650e403
@@ -1049,18 +1049,6 @@
return exec_ok && ignore_it;
}
-bool
-lua_hooks::hook_non_blocking_rng_ok()
-{
- bool ok = false;
- bool exec_ok = Lua(st)
- .func("non_blocking_rng_ok")
- .call(0,1)
- .extract_bool(ok)
- .ok();
- return exec_ok && ok;
-}
-
static inline bool
shared_trust_function_body(Lua & ll,
std::set const & signers,
============================================================
--- lua.hh a682ec35ee70ef30fd080616f8f21d8ef2a1a6ea
+++ lua.hh 5691c7c116dc402741a8a9ba7f5ab7d2ebe7b2e0
@@ -49,7 +49,6 @@
std::string const & user_log_message,
std::string & result);
bool hook_persist_phrase_ok();
- bool hook_non_blocking_rng_ok();
bool hook_get_revision_cert_trust(std::set const & signers,
hexenc const & id,
cert_name const & name,
============================================================
--- monotone.texi 355d07f84caee318dd69f37ff6274842ca2d2c70
+++ monotone.texi 0d7dfe06bd5f010a0d27fe896ed945fc9c0adbfd
@@ -4435,12 +4435,7 @@
This command generates an @sc{rsa} public/private key pair, using a
system random number generator, and stores it in your keystore under
-the key name @var{keyid}. If the the hook
address@hidden()} returns @code{true}, the key
-generation will use an unlimited random number generator (such as
address@hidden/dev/urandom}), otherwise it will use a higher quality random
-number generator (such as @file{/dev/random}) but might run slightly
-slower.
+the key name @var{keyid}.
The private half of the key is stored in an encrypted form, so that anyone
who can read your keystore cannot extract your private key and use it.
@@ -6157,25 +6152,6 @@
For the default definition of this hook, see @ref{Default hooks}.
address@hidden non_blocking_rng_ok ()
-
-Returns @code{true} if you are willing to let monotone use the
-system's non-blocking random number generator, such as
address@hidden/dev/urandom}, for generating random values during cryptographic
-operations. This diminishes the cryptographic strength of such
-operations, but speeds them up. Returns @code{false} if you want to
-force monotone to always use higher quality random numbers, such as
-those from @file{/dev/random}.
-
-The default definition of this hook is:
address@hidden
address@hidden
-function non_blocking_rng_ok()
- return true
-end
address@hidden group
address@hidden smallexample
-
@item persist_phrase_ok ()
Returns @code{true} if you want monotone to remember the passphrase of
============================================================
--- std_hooks.lua 8f01e338e8056c62de500694210fd22dacac6122
+++ std_hooks.lua 87a925a89f17ae312390049e28296bbb9f7ee170
@@ -230,11 +230,6 @@
end
-function non_blocking_rng_ok()
- return true
-end
-
-
function persist_phrase_ok()
return true
end
============================================================
--- test_hooks.lua 391ca756f0e4bd4325ffba83caf9a698b1713e23
+++ test_hooks.lua c8ca29aac8840285176dc56724352917a3b52bf2
@@ -7,10 +7,6 @@
return keyid
end
-function non_blocking_rng_ok()
- return true
-end
-
function persist_phrase_ok()
return true
end
============================================================
--- testsuite.at 7f433b14b3bd2a67eeacc49577a64e35d97ed02f
+++ testsuite.at 4fb9cd7e48089507285848138527d727a364860d
@@ -68,9 +68,6 @@
function get_passphrase(keyid)
return keyid
end
-function non_blocking_rng_ok()
- return true
-end
function persist_phrase_ok()
return true
end
@@ -85,10 +82,6 @@
return keyid
end
-function non_blocking_rng_ok()
- return true
-end
-
-- Everything alice signs is trusted, nothing mallory signs is
-- trusted. For certs signed by other people, everything is
-- trusted except for one particular cert...