[med-svn] [r-cran-openssl] 02/05: New upstream version 0.9.9
Andreas Tille
tille at debian.org
Sat Nov 11 15:10:23 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-openssl.
commit e392d6bcfbbbb7aec1022629f0ecae996daa96d1
Author: Andreas Tille <tille at debian.org>
Date: Sat Nov 11 16:04:58 2017 +0100
New upstream version 0.9.9
---
DESCRIPTION | 8 +-
MD5 | 26 ++---
NEWS | 6 +
R/aes.R | 2 +-
R/cert.R | 3 +-
build/vignette.rds | Bin 355 -> 355 bytes
configure | 4 +-
inst/doc/bignum.html | 247 ++++++++++++++++++++++++++++++++++-----
inst/doc/crypto_hashing.html | 223 ++++++++++++++++++++++++++++++++---
inst/doc/keys.html | 269 +++++++++++++++++++++++++++++++++++++------
inst/doc/secure_rng.html | 233 ++++++++++++++++++++++++++++++++++---
man/aes_cbc.Rd | 2 +-
src/ssl.c | 4 +-
tests/testthat.R | 4 +
14 files changed, 911 insertions(+), 120 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index f996a20..585ee35 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: openssl
Type: Package
Title: Toolkit for Encryption, Signatures and Certificates Based on
OpenSSL
-Version: 0.9.7
+Version: 0.9.9
Authors at R: c(
person("Jeroen", "Ooms", , "jeroen at berkeley.edu", role = c("cre", "aut")),
person("Oliver", "Keyes", role = "ctb"))
@@ -21,11 +21,11 @@ BugReports: https://github.com/jeroen/openssl/issues
SystemRequirements: OpenSSL >= 1.0.1
VignetteBuilder: knitr
Suggests: testthat, digest, knitr, rmarkdown, jsonlite, jose
-RoxygenNote: 6.0.1
+RoxygenNote: 6.0.1.9000
NeedsCompilation: yes
-Packaged: 2017-09-06 15:02:37 UTC; jeroen
+Packaged: 2017-11-10 16:52:56 UTC; jeroen
Author: Jeroen Ooms [cre, aut],
Oliver Keyes [ctb]
Maintainer: Jeroen Ooms <jeroen at berkeley.edu>
Repository: CRAN
-Date/Publication: 2017-09-06 20:56:56 UTC
+Date/Publication: 2017-11-10 18:33:32 UTC
diff --git a/MD5 b/MD5
index 8e86dc5..df73a34 100644
--- a/MD5
+++ b/MD5
@@ -1,14 +1,14 @@
-367dd625cb6e7735028f5dd269055094 *DESCRIPTION
+2625bde55d8e38d4cb3a8caae51f3a4e *DESCRIPTION
1ee0683cce6d3479250337954c075d63 *LICENSE
4126ab68ba48958d9d3f1789efcc175e *NAMESPACE
-8a080dbae14a99d86ba09ab4304ab1fe *NEWS
-3db0fd878b0056ab9f4586d167ce4cea *R/aes.R
+52ff9f7c483729e1c9da19f91c63f6df *NEWS
+c0578335397b8f87a0bafc838d2b4587 *R/aes.R
59033eb1b1690ba5a682648924c0dc01 *R/askpass.R
25bb161cd43a5861b01e425133591e22 *R/base.R
cc6804a52ad350613a81e2346b817fdf *R/base64.R
673c3ac5cc58c1ef2e8743104cbbafdc *R/bignum.R
5f72eefdfed00a7bdb47aa45bf77bfab *R/build.R
-0382d233b421b0a7ffca8bca98563c7e *R/cert.R
+04ef4f1c38e972849754e3ce9dc35d7b *R/cert.R
739b40031901e870873603e24a97a4de *R/diffie.R
1e505c778f2adaa8465a51f5471da80f *R/envelope.R
6c3fb3d1dab89f2445e55705bbadd57e *R/hash.R
@@ -28,24 +28,24 @@ f9c4917446c9696e21152dec2aeadba3 *R/stopifnot.R
5ecac70bdaf1e7a02da963da3030fdda *R/stream.R
0b4d07002d68ea8bbf9cb90fae0c0841 *R/write.R
250578a5040b1769a81d0e0601efe74c *R/writessh.R
-52184593cb4c9b8b7054302578bde264 *build/vignette.rds
+193256ed19f430249acbfd7a7087c21d *build/vignette.rds
6071edd604dbeb75308cfbedc7790398 *cleanup
-fe266ec3f79256950f48d9c0b6152ca5 *configure
+4321cec4a93dffcd447720878b51b7c3 *configure
d41d8cd98f00b204e9800998ecf8427e *configure.win
8d35a5cef6ce28da07867a0712558067 *inst/cacert.pem
538ca1f45e2c482e27a792761d92f392 *inst/doc/bignum.R
745cc4ee4a0217d09448b71e583c6de2 *inst/doc/bignum.Rmd
-59ddd550453265aedc20346b4be0763c *inst/doc/bignum.html
+2d4c1257c208fcbae0c12750a8079f4e *inst/doc/bignum.html
290c8f4ed75f1b80406a241d34906256 *inst/doc/crypto_hashing.R
0b17ff80c3353c70f01e43324820eb32 *inst/doc/crypto_hashing.Rmd
-664e1b50e20ad58ee0f4a37f0de0b4b9 *inst/doc/crypto_hashing.html
+2ad1606ff083ba80b0540754f269d868 *inst/doc/crypto_hashing.html
65488f0ce9e60ae12fb2d12b87a0d81e *inst/doc/keys.R
84e4760fec6195d3851b4dc45f7857e6 *inst/doc/keys.Rmd
-41eedda881d94b7db5a19df3962a1a4a *inst/doc/keys.html
+d4d4e95ccbbf7c2c99ff5a70d91ee241 *inst/doc/keys.html
91da732f2fc44700d7816c659df5a2d3 *inst/doc/secure_rng.R
35ea87007fe89af619623a6d75c0d02d *inst/doc/secure_rng.Rmd
-5a9bd14d203ab5992dfc6963c7746f57 *inst/doc/secure_rng.html
-df6b957f2e8f9ada89d209efdb406dd9 *man/aes_cbc.Rd
+a415796a65831b1c6912bdfeee4b2a71 *inst/doc/secure_rng.html
+dc59ce8c36aa296a2602d5c21eb2f331 *man/aes_cbc.Rd
821fff86e73411e0b1e01f67c76f0855 *man/askpass.Rd
f4ea38f39d1aad5b038633a28303454d *man/base64_encode.Rd
a2642e78528fa3b9b46b1f2ec6f5ddd6 *man/bignum.Rd
@@ -88,7 +88,7 @@ e32daf32ca605f541ee1d0a1f7d73f4f *src/pkcs7.c
0a38050f3a4e6bd4a8d84d71235a40fe *src/rand.c
751b3728424ef0482e12d1b68477a62a *src/rsa.c
b28357489ff481c2eff572384a8e4c95 *src/signing.c
-5a476db6ebd0b8cdd77b81d0d95198b1 *src/ssl.c
+f85ca78c7ff79b4c586b22f011b57fa2 *src/ssl.c
47b98e462e74c32e0de8ef9df32a6c17 *src/stream.c
6527d02975f16baeece916390f03e30b *src/tests/main.c
0dd3005581d834a85d42923c60133272 *src/tests/soname.h
@@ -159,7 +159,7 @@ fd4586ee1fab5300390192ca279a83f9 *tests/keys/message.sig.rsa.sha256
a7b9d2b3e21f6a82a775a95cc47e789b *tests/keys/signatures.txt
946876a3939d38dcf016ab1a78524b18 *tests/keys/testmd5.sig
155adaa2076d9f03e96e639e35bc83ed *tests/keys/testsha1.sig
-d36c00d3573ddb09feb853bd5f9f6165 *tests/testthat.R
+65abbdbfac2641fc411e741e7990b206 *tests/testthat.R
e9149badf8f951650580efee09b494e2 *tests/testthat/test_bignum.R
eac7fe63112e5e54063c31bc6b85dc21 *tests/testthat/test_cert.R
e5bd1c312bdf61667e0f4bb4e7fa3012 *tests/testthat/test_encrypt.R
diff --git a/NEWS b/NEWS
index 0e964cb..5813ee5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+0.9.9
+ - Workaround failing test on Mavericks due to IPv6 firewall issue
+
+0.9.8
+ - Fix build on OSX Mavericks
+
0.9.7
- Configure script checks SHLIB_VERSION_NUMBER to find matching lib
- Added internal stopifnot() replacement to give more helpful error mesasges
diff --git a/R/aes.R b/R/aes.R
index 087fbc3..fe9b634 100644
--- a/R/aes.R
+++ b/R/aes.R
@@ -47,7 +47,7 @@ aes_cbc_decrypt <- function(data, key, iv = attr(data, "iv")){
#' @export
#' @rdname aes_cbc
-aes_gcm_encrypt <- function(data, key, iv = rand_bytes(16)){
+aes_gcm_encrypt <- function(data, key, iv = rand_bytes(12)){
aes_encrypt(data, key, iv, "gcm")
}
diff --git a/R/cert.R b/R/cert.R
index ef008d3..e9beeda 100644
--- a/R/cert.R
+++ b/R/cert.R
@@ -58,7 +58,8 @@ download_ssl_cert <- function(host = "localhost", port = 443){
if(grepl("https?://", host))
stop("Argument 'host' must be a hostname, not url. Take out the https:// prefix.")
stopifnot(is.character(host))
- .Call(R_download_cert, host, as.character(port))
+ ipv4_only <- isTRUE(getOption("ipv4_only"))
+ .Call(R_download_cert, host, as.character(port), ipv4_only)
}
#' @useDynLib openssl R_cert_verify_cert
diff --git a/build/vignette.rds b/build/vignette.rds
index dadb5f5..af0d453 100644
Binary files a/build/vignette.rds and b/build/vignette.rds differ
diff --git a/configure b/configure
index fc52244..099b845 100755
--- a/configure
+++ b/configure
@@ -36,8 +36,8 @@ else
if [ $? -eq 0 ]; then
BREWDIR=`brew --prefix`
else
- curl -sfL https://jeroen.github.io/autobrew/openssl > $TMPDIR/autobrew
- source $TMPDIR/autobrew
+ curl -sfL https://jeroen.github.io/autobrew/openssl > autobrew
+ source autobrew
fi
PKG_CFLAGS="-I$BREWDIR/opt/openssl at 1.1/include -I$BREWDIR/opt/openssl/include"
PKG_LIBS="-L$BREWDIR/opt/openssl at 1.1/lib -L$BREWDIR/opt/openssl/lib $PKG_LIBS"
diff --git a/inst/doc/bignum.html b/inst/doc/bignum.html
index a3156db..686b22a 100644
--- a/inst/doc/bignum.html
+++ b/inst/doc/bignum.html
@@ -10,19 +10,214 @@
-<meta name="date" content="2017-09-06" />
+<meta name="date" content="2017-11-10" />
<title>Fun with bignum: how RSA encryption works</title>
-<script src="data:application/x-javascript;base64,LyohIGpRdWVyeSB2MS4xMS4zIHwgKGMpIDIwMDUsIDIwMTUgalF1ZXJ5IEZvdW5kYXRpb24sIEluYy4gfCBqcXVlcnkub3JnL2xpY2Vuc2UgKi8KIWZ1bmN0aW9uKGEsYil7Im9iamVjdCI9PXR5cGVvZiBtb2R1bGUmJiJvYmplY3QiPT10eXBlb2YgbW9kdWxlLmV4cG9ydHM/bW9kdWxlLmV4cG9ydHM9YS5kb2N1bWVudD9iKGEsITApOmZ1bmN0aW9uKGEpe2lmKCFhLmRvY3VtZW50KXRocm93IG5ldyBFcnJvcigialF1ZXJ5IHJlcXVpcmVzIGEgd2luZG93IHdpdGggYSBkb2N1bWVudCIpO3JldHVybiBiKGEpfTpiKGEpfSgidW5kZWZpbmVkIiE9dHlwZW9mIHdpbmRvdz93aW5kb3c6dG [...]
+<script>/*! jQuery v1.11.3 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.3",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b [...]
+
+return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}fu [...]
+return new Za.prototype.init(a,b,c,d,e)}m.Tween=Za,Za.prototype={constructor:Za,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")},cur:function(){var a=Za.propHooks[this.prop];return a&&a.get?a.get(this):Za.propHooks._default.get(this)},run:function(a){var b,c=Za.propHooks[this.prop];return this.options.duration?this.pos=b=m.easing[this.easing](a,this.options.duration*a, [...]
+</script>
<meta name="viewport" content="width=device-width, initial-scale=1" />
-<link href="data:text/css;charset=utf-8,html%7Bfont%2Dfamily%3Asans%2Dserif%3B%2Dwebkit%2Dtext%2Dsize%2Dadjust%3A100%25%3B%2Dms%2Dtext%2Dsize%2Dadjust%3A100%25%7Dbody%7Bmargin%3A0%7Darticle%2Caside%2Cdetails%2Cfigcaption%2Cfigure%2Cfooter%2Cheader%2Chgroup%2Cmain%2Cmenu%2Cnav%2Csection%2Csummary%7Bdisplay%3Ablock%7Daudio%2Ccanvas%2Cprogress%2Cvideo%7Bdisplay%3Ainline%2Dblock%3Bvertical%2Dalign%3Abaseline%7Daudio%3Anot%28%5Bcontrols%5D%29%7Bdisplay%3Anone%3Bheight%3A0%7D%5Bhidden%5D%2Ctem [...]
-<script src="data:application/x-javascript;base64,LyohCiAqIEJvb3RzdHJhcCB2My4zLjUgKGh0dHA6Ly9nZXRib290c3RyYXAuY29tKQogKiBDb3B5cmlnaHQgMjAxMS0yMDE1IFR3aXR0ZXIsIEluYy4KICogTGljZW5zZWQgdW5kZXIgdGhlIE1JVCBsaWNlbnNlCiAqLwppZigidW5kZWZpbmVkIj09dHlwZW9mIGpRdWVyeSl0aHJvdyBuZXcgRXJyb3IoIkJvb3RzdHJhcCdzIEphdmFTY3JpcHQgcmVxdWlyZXMgalF1ZXJ5Iik7K2Z1bmN0aW9uKGEpeyJ1c2Ugc3RyaWN0Ijt2YXIgYj1hLmZuLmpxdWVyeS5zcGxpdCgiICIpWzBdLnNwbGl0KCIuIik7aWYoYlswXTwyJiZiWzFdPDl8fDE9PWJbMF0mJjk9PWJbMV0mJmJbMl08MSl0aHJvdy [...]
-<script src="data:application/x-javascript;base64,LyoqCiogQHByZXNlcnZlIEhUTUw1IFNoaXYgMy43LjIgfCBAYWZhcmthcyBAamRhbHRvbiBAam9uX25lYWwgQHJlbSB8IE1JVC9HUEwyIExpY2Vuc2VkCiovCi8vIE9ubHkgcnVuIHRoaXMgY29kZSBpbiBJRSA4CmlmICghIXdpbmRvdy5uYXZpZ2F0b3IudXNlckFnZW50Lm1hdGNoKCJNU0lFIDgiKSkgewohZnVuY3Rpb24oYSxiKXtmdW5jdGlvbiBjKGEsYil7dmFyIGM9YS5jcmVhdGVFbGVtZW50KCJwIiksZD1hLmdldEVsZW1lbnRzQnlUYWdOYW1lKCJoZWFkIilbMF18fGEuZG9jdW1lbnRFbGVtZW50O3JldHVybiBjLmlubmVySFRNTD0ieDxzdHlsZT4iK2IrIjwvc3R5bGU+IixkLm [...]
-<script src="data:application/x-javascript;base64,LyohIFJlc3BvbmQuanMgdjEuNC4yOiBtaW4vbWF4LXdpZHRoIG1lZGlhIHF1ZXJ5IHBvbHlmaWxsICogQ29weXJpZ2h0IDIwMTMgU2NvdHQgSmVobAogKiBMaWNlbnNlZCB1bmRlciBodHRwczovL2dpdGh1Yi5jb20vc2NvdHRqZWhsL1Jlc3BvbmQvYmxvYi9tYXN0ZXIvTElDRU5TRS1NSVQKICogICovCgovLyBPbmx5IHJ1biB0aGlzIGNvZGUgaW4gSUUgOAppZiAoISF3aW5kb3cubmF2aWdhdG9yLnVzZXJBZ2VudC5tYXRjaCgiTVNJRSA4IikpIHsKIWZ1bmN0aW9uKGEpeyJ1c2Ugc3RyaWN0IjthLm1hdGNoTWVkaWE9YS5tYXRjaE1lZGlhfHxmdW5jdGlvbihhKXt2YXIgYixjPWEuZG [...]
-<script src="data:application/x-javascript;base64,CgovKioKICogalF1ZXJ5IFBsdWdpbjogU3RpY2t5IFRhYnMKICoKICogQGF1dGhvciBBaWRhbiBMaXN0ZXIgPGFpZGFuQHBocC5uZXQ+CiAqIGFkYXB0ZWQgYnkgUnViZW4gQXJzbGFuIHRvIGFjdGl2YXRlIHBhcmVudCB0YWJzIHRvbwogKiBodHRwOi8vd3d3LmFpZGFubGlzdGVyLmNvbS8yMDE0LzAzL3BlcnNpc3RpbmctdGhlLXRhYi1zdGF0ZS1pbi1ib290c3RyYXAvCiAqLwooZnVuY3Rpb24oJCkgewogICJ1c2Ugc3RyaWN0IjsKICAkLmZuLnJtYXJrZG93blN0aWNreVRhYnMgPSBmdW5jdGlvbigpIHsKICAgIHZhciBjb250ZXh0ID0gdGhpczsKICAgIC8vIFNob3cgdGhlIHRhYi [...]
-<link href="data:text/css;charset=utf-8,pre%20%2Eoperator%2C%0Apre%20%2Eparen%20%7B%0Acolor%3A%20rgb%28104%2C%20118%2C%20135%29%0A%7D%0Apre%20%2Eliteral%20%7B%0Acolor%3A%20%23990073%0A%7D%0Apre%20%2Enumber%20%7B%0Acolor%3A%20%23099%3B%0A%7D%0Apre%20%2Ecomment%20%7B%0Acolor%3A%20%23998%3B%0Afont%2Dstyle%3A%20italic%0A%7D%0Apre%20%2Ekeyword%20%7B%0Acolor%3A%20%23900%3B%0Afont%2Dweight%3A%20bold%0A%7D%0Apre%20%2Eidentifier%20%7B%0Acolor%3A%20rgb%280%2C%200%2C%200%29%3B%0A%7D%0Apre%20%2Estri [...]
-<script src="data:application/x-javascript;base64,dmFyIGhsanM9bmV3IGZ1bmN0aW9uKCl7ZnVuY3Rpb24gbShwKXtyZXR1cm4gcC5yZXBsYWNlKC8mL2dtLCImYW1wOyIpLnJlcGxhY2UoLzwvZ20sIiZsdDsiKX1mdW5jdGlvbiBmKHIscSxwKXtyZXR1cm4gUmVnRXhwKHEsIm0iKyhyLmNJPyJpIjoiIikrKHA/ImciOiIiKSl9ZnVuY3Rpb24gYihyKXtmb3IodmFyIHA9MDtwPHIuY2hpbGROb2Rlcy5sZW5ndGg7cCsrKXt2YXIgcT1yLmNoaWxkTm9kZXNbcF07aWYocS5ub2RlTmFtZT09IkNPREUiKXtyZXR1cm4gcX1pZighKHEubm9kZVR5cGU9PTMmJnEubm9kZVZhbHVlLm1hdGNoKC9ccysvKSkpe2JyZWFrfX19ZnVuY3Rpb24gaCh0LH [...]
+<style type="text/css">html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:70 [...]
+</style>
+<script>/*!
+ * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",tra [...]
+d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){v [...]
+<script>/**
+* @preserve HTML5 Shiv 3.7.2 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+*/
+// Only run this code in IE 8
+if (!!window.navigator.userAgent.match("MSIE 8")) {
+!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l [...]
+};
+</script>
+<script>/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl
+ * Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
+ * */
+
+// Only run this code in IE 8
+if (!!window.navigator.userAgent.match("MSIE 8")) {
+!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),funct [...]
+};
+</script>
+<script>
+
+/**
+ * jQuery Plugin: Sticky Tabs
+ *
+ * @author Aidan Lister <aidan at php.net>
+ * adapted by Ruben Arslan to activate parent tabs too
+ * http://www.aidanlister.com/2014/03/persisting-the-tab-state-in-bootstrap/
+ */
+(function($) {
+ "use strict";
+ $.fn.rmarkdownStickyTabs = function() {
+ var context = this;
+ // Show the tab corresponding with the hash in the URL, or the first tab
+ var showStuffFromHash = function() {
+ var hash = window.location.hash;
+ var selector = hash ? 'a[href="' + hash + '"]' : 'li.active > a';
+ var $selector = $(selector, context);
+ if($selector.data('toggle') === "tab") {
+ $selector.tab('show');
+ // walk up the ancestors of this element, show any hidden tabs
+ $selector.parents('.section.tabset').each(function(i, elm) {
+ var link = $('a[href="#' + $(elm).attr('id') + '"]');
+ if(link.data('toggle') === "tab") {
+ link.tab("show");
+ }
+ });
+ }
+ };
+
+
+ // Set the correct tab when the page loads
+ showStuffFromHash(context);
+
+ // Set the correct tab when a user uses their back/forward button
+ $(window).on('hashchange', function() {
+ showStuffFromHash(context);
+ });
+
+ // Change the URL when tabs are clicked
+ $('a', context).on('click', function(e) {
+ history.pushState(null, null, this.href);
+ showStuffFromHash(context);
+ });
+
+ return this;
+ };
+}(jQuery));
+
+window.buildTabsets = function(tocID) {
+
+ // build a tabset from a section div with the .tabset class
+ function buildTabset(tabset) {
+
+ // check for fade and pills options
+ var fade = tabset.hasClass("tabset-fade");
+ var pills = tabset.hasClass("tabset-pills");
+ var navClass = pills ? "nav-pills" : "nav-tabs";
+
+ // determine the heading level of the tabset and tabs
+ var match = tabset.attr('class').match(/level(\d) /);
+ if (match === null)
+ return;
+ var tabsetLevel = Number(match[1]);
+ var tabLevel = tabsetLevel + 1;
+
+ // find all subheadings immediately below
+ var tabs = tabset.find("div.section.level" + tabLevel);
+ if (!tabs.length)
+ return;
+
+ // create tablist and tab-content elements
+ var tabList = $('<ul class="nav ' + navClass + '" role="tablist"></ul>');
+ $(tabs[0]).before(tabList);
+ var tabContent = $('<div class="tab-content"></div>');
+ $(tabs[0]).before(tabContent);
+
+ // build the tabset
+ var activeTab = 0;
+ tabs.each(function(i) {
+
+ // get the tab div
+ var tab = $(tabs[i]);
+
+ // get the id then sanitize it for use with bootstrap tabs
+ var id = tab.attr('id');
+
+ // see if this is marked as the active tab
+ if (tab.hasClass('active'))
+ activeTab = i;
+
+ // remove any table of contents entries associated with
+ // this ID (since we'll be removing the heading element)
+ $("div#" + tocID + " li a[href='#" + id + "']").parent().remove();
+
+ // sanitize the id for use with bootstrap tabs
+ id = id.replace(/[.\/?&!#<>]/g, '').replace(/\s/g, '_');
+ tab.attr('id', id);
+
+ // get the heading element within it, grab it's text, then remove it
+ var heading = tab.find('h' + tabLevel + ':first');
+ var headingText = heading.html();
+ heading.remove();
+
+ // build and append the tab list item
+ var a = $('<a role="tab" data-toggle="tab">' + headingText + '</a>');
+ a.attr('href', '#' + id);
+ a.attr('aria-controls', id);
+ var li = $('<li role="presentation"></li>');
+ li.append(a);
+ tabList.append(li);
+
+ // set it's attributes
+ tab.attr('role', 'tabpanel');
+ tab.addClass('tab-pane');
+ tab.addClass('tabbed-pane');
+ if (fade)
+ tab.addClass('fade');
+
+ // move it into the tab content div
+ tab.detach().appendTo(tabContent);
+ });
+
+ // set active tab
+ $(tabList.children('li')[activeTab]).addClass('active');
+ var active = $(tabContent.children('div.section')[activeTab]);
+ active.addClass('active');
+ if (fade)
+ active.addClass('in');
+
+ if (tabset.hasClass("tabset-sticky"))
+ tabset.rmarkdownStickyTabs();
+ }
+
+ // convert section divs with the .tabset class to tabsets
+ var tabsets = $("div.section.tabset");
+ tabsets.each(function(i) {
+ buildTabset($(tabsets[i]));
+ });
+};
+
+</script>
+<style type="text/css">pre .operator,
+pre .paren {
+color: rgb(104, 118, 135)
+}
+pre .literal {
+color: #990073
+}
+pre .number {
+color: #099;
+}
+pre .comment {
+color: #998;
+font-style: italic
+}
+pre .keyword {
+color: #900;
+font-weight: bold
+}
+pre .identifier {
+color: rgb(0, 0, 0);
+}
+pre .string {
+color: #d14;
+}
+</style>
+<script>var hljs=new function(){function m(p){return p.replace(/&/gm,"&").replace(/</gm,"<")}function f(r,q,p){return RegExp(q,"m"+(r.cI?"i":"")+(p?"g":""))}function b(r){for(var p=0;p<r.childNodes.length;p++){var q=r.childNodes[p];if(q.nodeName=="CODE"){return q}if(!(q.nodeType==3&&q.nodeValue.match(/\s+/))){break}}}function h(t,s){var p="";for(var r=0;r<t.childNodes.length;r++){if(t.childNodes[r].nodeType==3){var q=t.childNodes[r].nodeValue;if(s){q=q.replace(/\n/g,"")}p+=q}else{ [...]
+hljs.initHighlightingOnLoad();
+
+</script>
<style type="text/css">code{white-space: pre;}</style>
<style type="text/css">
@@ -117,7 +312,7 @@ $(document).ready(function () {
<h1 class="title toc-ignore">Fun with bignum: how RSA encryption works</h1>
-<h4 class="date"><em>2017-09-06</em></h4>
+<h4 class="date"><em>2017-11-10</em></h4>
</div>
@@ -138,7 +333,7 @@ z2 <- div * y + mod
stopifnot(z2 == z)
stopifnot(div < z)</code></pre>
<p>RSA involves a public key and a private key. The public key should be known by everyone and is used for encrypting messages. Messages encrypted with the public key can only be decrypted in a reasonable amount of time using the private key. In RSA, this asymmetry is based on the practical difficulty of factoring the product of two large prime numbers.</p>
-<div id="rsa-key-generation" class="section level3">
+<section id="rsa-key-generation" class="level3">
<h3>RSA key generation</h3>
<p>An RSA key-pair is generated as follows (adapted from <a href="https://en.wikipedia.org/wiki/RSA_(cryptosystem)">wikipedia</a>):</p>
<ul>
@@ -151,43 +346,43 @@ stopifnot(div < z)</code></pre>
<p>OpenSSL has a key generator that does these things for us.</p>
<pre class="r"><code>(key <- rsa_keygen(512))</code></pre>
<pre><code>## [512-bit rsa private key]
-## md5: f3e9e0a6ec5b2c719bf09764a513e6c9</code></pre>
+## md5: a5e38c66ad18c78516e79777050b2bce</code></pre>
<pre class="r"><code>(pubkey <- key$pubkey)</code></pre>
<pre><code>## [512-bit rsa public key]
-## md5: f3e9e0a6ec5b2c719bf09764a513e6c9</code></pre>
+## md5: a5e38c66ad18c78516e79777050b2bce</code></pre>
<p>Usually we would use <code>rsa_encrypt</code> and <code>rsa_decrypt</code> to perform the encryption:</p>
<pre class="r"><code>msg <- charToRaw("hello world")
ciphertext <- rsa_encrypt(msg, pubkey)
rawToChar(rsa_decrypt(ciphertext, key))</code></pre>
<pre><code>## [1] "hello world"</code></pre>
<p>Let’s look at how this works under the hood.</p>
-</div>
-<div id="how-rsa-encryption-works" class="section level3">
+</section>
+<section id="how-rsa-encryption-works" class="level3">
<h3>How RSA encryption works</h3>
<p>The <code>data</code> field of the private key extracts the underlying bignum integers:</p>
<pre class="r"><code>key$data</code></pre>
<pre><code>## $e
## [b] 65537
## $n
-## [b] 11506376768338105178752846727294481883562616201581937369061648167799257547871616092773250565261426119531931897418845260453439169557232181417713802699552101
+## [b] 10031635092209121498674987861649022163771061565130441373555584537047455688991931937563110507506652959265182705476941444174840580049331773111276155053075917
## $p
-## [b] 114249337979811507156446710737174305407329147065865218427468300430068102465743
+## [b] 112481050639317229656723018120659623829736571015511322021617837187076258724819
## $q
-## [b] 100712852886476645392074969523321593562788723066792728000503924696327841383307
+## [b] 89185111938335771293328323333111422985697062149139368049232365065924632677343
## $d
-## [b] 9018539992053701706165944090222861145810166874081196527710906532727229846674554249883658592279959649798538304802957511773146552053224587844967534718101205
+## [b] 6886694454027199678759881881737814611139109676622117091683160716943132564863007715345245794849719693156483947830169207322284232384798025277322134502462181
## $dp
-## [b] 20089558125629000541234598692878781383250089121977368160857907657599597369657
+## [b] 52192635456942444021864702092699683547649253468753517900993308037581656588213
## $dq
-## [b] 36864681445499309494033697665364018920270056268204079405589035957401293726355
+## [b] 45611141749503334703121678031583617867946479577226668887897236368991499663495
## $qi
-## [b] 22029586051221831378804972338158649429574626573505831131307284714314542027140</code></pre>
+## [b] 42778411805854319073840593976044429381982792060412061328990784688718929883751</code></pre>
<p>You can verify that the equations above hold for this key. The public key is simply a subset of the key which only contains <span class="math inline">\(n\)</span> and <span class="math inline">\(e\)</span>:</p>
<pre class="r"><code>pubkey$data</code></pre>
<pre><code>## $e
## [b] 65537
## $n
-## [b] 11506376768338105178752846727294481883562616201581937369061648167799257547871616092773250565261426119531931897418845260453439169557232181417713802699552101</code></pre>
+## [b] 10031635092209121498674987861649022163771061565130441373555584537047455688991931937563110507506652959265182705476941444174840580049331773111276155053075917</code></pre>
<p>In order to encrypt a message into ciphertext we have to treat the message data as an integer. The message cannot be larger than the key size. For example convert the text <code>hello world</code> into an integer:</p>
<pre class="r"><code>m <- bignum(charToRaw("hello world"))
print(m)</code></pre>
@@ -197,17 +392,17 @@ print(m)</code></pre>
n <- pubkey$data$n
c <- (m ^ e) %% n
print(c)</code></pre>
-<pre><code>## [b] 9241055974344934160718068070000374111648747760075110185628533019005269897816259320179651071168313053580748146348517105430877230612978850667781810423060370</code></pre>
+<pre><code>## [b] 4370010721699116474550336125846788313299380632320359442581524355012000986228559746077196379218623802065771428038722241551035284544273266543217347538455894</code></pre>
<p>This is number represents out encrypted message! It is usually exchanged using base64 notation for human readability:</p>
<pre class="r"><code>base64_encode(c)</code></pre>
-<pre><code>## [1] "sHFXN6kIjahykYvchlShu9lU/QTrj1aEFrg0BkH08W7ACz169J9EYXZmb8eVFPelKxdtBT5w6aLZVSGZmwPXkg=="</code></pre>
+<pre><code>## [1] "U3Aq3qtS0/JAoDfLUbHNDBDZcOhb8MbWpql2Q5xTS+QtfO2YYOb9BRjvA3VkN1pimy3EE0htPLP1aE0fQmQNVg=="</code></pre>
<p>The ciphertext can be decrypted using <span class="math inline">\(d\)</span> from the corresponding private key via <span class="math inline">\(m = c^d \pmod{n}\)</span>. Note that <code>c^d</code> is too large to calculate directly so we need to use <code>bignum_mod_exp</code> instead.</p>
<pre class="r"><code>d <- key$data$d
out <- bignum_mod_exp(c, d, n)
rawToChar(out)</code></pre>
<pre><code>## [1] "hello world"</code></pre>
<p>The only difference with the actual <code>rsa_encrypt</code> and <code>rsa_decrypt</code> functions is that these add some additional padding to the data.</p>
-</div>
+</section>
diff --git a/inst/doc/crypto_hashing.html b/inst/doc/crypto_hashing.html
index 36e9f18..c56865d 100644
--- a/inst/doc/crypto_hashing.html
+++ b/inst/doc/crypto_hashing.html
@@ -10,19 +10,214 @@
-<meta name="date" content="2017-09-06" />
+<meta name="date" content="2017-11-10" />
<title>Cryptographic Hashing in R</title>
-<script src="data:application/x-javascript;base64,LyohIGpRdWVyeSB2MS4xMS4zIHwgKGMpIDIwMDUsIDIwMTUgalF1ZXJ5IEZvdW5kYXRpb24sIEluYy4gfCBqcXVlcnkub3JnL2xpY2Vuc2UgKi8KIWZ1bmN0aW9uKGEsYil7Im9iamVjdCI9PXR5cGVvZiBtb2R1bGUmJiJvYmplY3QiPT10eXBlb2YgbW9kdWxlLmV4cG9ydHM/bW9kdWxlLmV4cG9ydHM9YS5kb2N1bWVudD9iKGEsITApOmZ1bmN0aW9uKGEpe2lmKCFhLmRvY3VtZW50KXRocm93IG5ldyBFcnJvcigialF1ZXJ5IHJlcXVpcmVzIGEgd2luZG93IHdpdGggYSBkb2N1bWVudCIpO3JldHVybiBiKGEpfTpiKGEpfSgidW5kZWZpbmVkIiE9dHlwZW9mIHdpbmRvdz93aW5kb3c6dG [...]
+<script>/*! jQuery v1.11.3 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.3",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b [...]
+
+return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}fu [...]
+return new Za.prototype.init(a,b,c,d,e)}m.Tween=Za,Za.prototype={constructor:Za,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")},cur:function(){var a=Za.propHooks[this.prop];return a&&a.get?a.get(this):Za.propHooks._default.get(this)},run:function(a){var b,c=Za.propHooks[this.prop];return this.options.duration?this.pos=b=m.easing[this.easing](a,this.options.duration*a, [...]
+</script>
<meta name="viewport" content="width=device-width, initial-scale=1" />
-<link href="data:text/css;charset=utf-8,html%7Bfont%2Dfamily%3Asans%2Dserif%3B%2Dwebkit%2Dtext%2Dsize%2Dadjust%3A100%25%3B%2Dms%2Dtext%2Dsize%2Dadjust%3A100%25%7Dbody%7Bmargin%3A0%7Darticle%2Caside%2Cdetails%2Cfigcaption%2Cfigure%2Cfooter%2Cheader%2Chgroup%2Cmain%2Cmenu%2Cnav%2Csection%2Csummary%7Bdisplay%3Ablock%7Daudio%2Ccanvas%2Cprogress%2Cvideo%7Bdisplay%3Ainline%2Dblock%3Bvertical%2Dalign%3Abaseline%7Daudio%3Anot%28%5Bcontrols%5D%29%7Bdisplay%3Anone%3Bheight%3A0%7D%5Bhidden%5D%2Ctem [...]
-<script src="data:application/x-javascript;base64,LyohCiAqIEJvb3RzdHJhcCB2My4zLjUgKGh0dHA6Ly9nZXRib290c3RyYXAuY29tKQogKiBDb3B5cmlnaHQgMjAxMS0yMDE1IFR3aXR0ZXIsIEluYy4KICogTGljZW5zZWQgdW5kZXIgdGhlIE1JVCBsaWNlbnNlCiAqLwppZigidW5kZWZpbmVkIj09dHlwZW9mIGpRdWVyeSl0aHJvdyBuZXcgRXJyb3IoIkJvb3RzdHJhcCdzIEphdmFTY3JpcHQgcmVxdWlyZXMgalF1ZXJ5Iik7K2Z1bmN0aW9uKGEpeyJ1c2Ugc3RyaWN0Ijt2YXIgYj1hLmZuLmpxdWVyeS5zcGxpdCgiICIpWzBdLnNwbGl0KCIuIik7aWYoYlswXTwyJiZiWzFdPDl8fDE9PWJbMF0mJjk9PWJbMV0mJmJbMl08MSl0aHJvdy [...]
-<script src="data:application/x-javascript;base64,LyoqCiogQHByZXNlcnZlIEhUTUw1IFNoaXYgMy43LjIgfCBAYWZhcmthcyBAamRhbHRvbiBAam9uX25lYWwgQHJlbSB8IE1JVC9HUEwyIExpY2Vuc2VkCiovCi8vIE9ubHkgcnVuIHRoaXMgY29kZSBpbiBJRSA4CmlmICghIXdpbmRvdy5uYXZpZ2F0b3IudXNlckFnZW50Lm1hdGNoKCJNU0lFIDgiKSkgewohZnVuY3Rpb24oYSxiKXtmdW5jdGlvbiBjKGEsYil7dmFyIGM9YS5jcmVhdGVFbGVtZW50KCJwIiksZD1hLmdldEVsZW1lbnRzQnlUYWdOYW1lKCJoZWFkIilbMF18fGEuZG9jdW1lbnRFbGVtZW50O3JldHVybiBjLmlubmVySFRNTD0ieDxzdHlsZT4iK2IrIjwvc3R5bGU+IixkLm [...]
-<script src="data:application/x-javascript;base64,LyohIFJlc3BvbmQuanMgdjEuNC4yOiBtaW4vbWF4LXdpZHRoIG1lZGlhIHF1ZXJ5IHBvbHlmaWxsICogQ29weXJpZ2h0IDIwMTMgU2NvdHQgSmVobAogKiBMaWNlbnNlZCB1bmRlciBodHRwczovL2dpdGh1Yi5jb20vc2NvdHRqZWhsL1Jlc3BvbmQvYmxvYi9tYXN0ZXIvTElDRU5TRS1NSVQKICogICovCgovLyBPbmx5IHJ1biB0aGlzIGNvZGUgaW4gSUUgOAppZiAoISF3aW5kb3cubmF2aWdhdG9yLnVzZXJBZ2VudC5tYXRjaCgiTVNJRSA4IikpIHsKIWZ1bmN0aW9uKGEpeyJ1c2Ugc3RyaWN0IjthLm1hdGNoTWVkaWE9YS5tYXRjaE1lZGlhfHxmdW5jdGlvbihhKXt2YXIgYixjPWEuZG [...]
-<script src="data:application/x-javascript;base64,CgovKioKICogalF1ZXJ5IFBsdWdpbjogU3RpY2t5IFRhYnMKICoKICogQGF1dGhvciBBaWRhbiBMaXN0ZXIgPGFpZGFuQHBocC5uZXQ+CiAqIGFkYXB0ZWQgYnkgUnViZW4gQXJzbGFuIHRvIGFjdGl2YXRlIHBhcmVudCB0YWJzIHRvbwogKiBodHRwOi8vd3d3LmFpZGFubGlzdGVyLmNvbS8yMDE0LzAzL3BlcnNpc3RpbmctdGhlLXRhYi1zdGF0ZS1pbi1ib290c3RyYXAvCiAqLwooZnVuY3Rpb24oJCkgewogICJ1c2Ugc3RyaWN0IjsKICAkLmZuLnJtYXJrZG93blN0aWNreVRhYnMgPSBmdW5jdGlvbigpIHsKICAgIHZhciBjb250ZXh0ID0gdGhpczsKICAgIC8vIFNob3cgdGhlIHRhYi [...]
-<link href="data:text/css;charset=utf-8,pre%20%2Eoperator%2C%0Apre%20%2Eparen%20%7B%0Acolor%3A%20rgb%28104%2C%20118%2C%20135%29%0A%7D%0Apre%20%2Eliteral%20%7B%0Acolor%3A%20%23990073%0A%7D%0Apre%20%2Enumber%20%7B%0Acolor%3A%20%23099%3B%0A%7D%0Apre%20%2Ecomment%20%7B%0Acolor%3A%20%23998%3B%0Afont%2Dstyle%3A%20italic%0A%7D%0Apre%20%2Ekeyword%20%7B%0Acolor%3A%20%23900%3B%0Afont%2Dweight%3A%20bold%0A%7D%0Apre%20%2Eidentifier%20%7B%0Acolor%3A%20rgb%280%2C%200%2C%200%29%3B%0A%7D%0Apre%20%2Estri [...]
-<script src="data:application/x-javascript;base64,dmFyIGhsanM9bmV3IGZ1bmN0aW9uKCl7ZnVuY3Rpb24gbShwKXtyZXR1cm4gcC5yZXBsYWNlKC8mL2dtLCImYW1wOyIpLnJlcGxhY2UoLzwvZ20sIiZsdDsiKX1mdW5jdGlvbiBmKHIscSxwKXtyZXR1cm4gUmVnRXhwKHEsIm0iKyhyLmNJPyJpIjoiIikrKHA/ImciOiIiKSl9ZnVuY3Rpb24gYihyKXtmb3IodmFyIHA9MDtwPHIuY2hpbGROb2Rlcy5sZW5ndGg7cCsrKXt2YXIgcT1yLmNoaWxkTm9kZXNbcF07aWYocS5ub2RlTmFtZT09IkNPREUiKXtyZXR1cm4gcX1pZighKHEubm9kZVR5cGU9PTMmJnEubm9kZVZhbHVlLm1hdGNoKC9ccysvKSkpe2JyZWFrfX19ZnVuY3Rpb24gaCh0LH [...]
+<style type="text/css">html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:70 [...]
+</style>
+<script>/*!
+ * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",tra [...]
+d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){v [...]
+<script>/**
+* @preserve HTML5 Shiv 3.7.2 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+*/
+// Only run this code in IE 8
+if (!!window.navigator.userAgent.match("MSIE 8")) {
+!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l [...]
+};
+</script>
+<script>/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl
+ * Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
+ * */
+
+// Only run this code in IE 8
+if (!!window.navigator.userAgent.match("MSIE 8")) {
+!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),funct [...]
+};
+</script>
+<script>
+
+/**
+ * jQuery Plugin: Sticky Tabs
+ *
+ * @author Aidan Lister <aidan at php.net>
+ * adapted by Ruben Arslan to activate parent tabs too
+ * http://www.aidanlister.com/2014/03/persisting-the-tab-state-in-bootstrap/
+ */
+(function($) {
+ "use strict";
+ $.fn.rmarkdownStickyTabs = function() {
+ var context = this;
+ // Show the tab corresponding with the hash in the URL, or the first tab
+ var showStuffFromHash = function() {
+ var hash = window.location.hash;
+ var selector = hash ? 'a[href="' + hash + '"]' : 'li.active > a';
+ var $selector = $(selector, context);
+ if($selector.data('toggle') === "tab") {
+ $selector.tab('show');
+ // walk up the ancestors of this element, show any hidden tabs
+ $selector.parents('.section.tabset').each(function(i, elm) {
+ var link = $('a[href="#' + $(elm).attr('id') + '"]');
+ if(link.data('toggle') === "tab") {
+ link.tab("show");
+ }
+ });
+ }
+ };
+
+
+ // Set the correct tab when the page loads
+ showStuffFromHash(context);
+
+ // Set the correct tab when a user uses their back/forward button
+ $(window).on('hashchange', function() {
+ showStuffFromHash(context);
+ });
+
+ // Change the URL when tabs are clicked
+ $('a', context).on('click', function(e) {
+ history.pushState(null, null, this.href);
+ showStuffFromHash(context);
+ });
+
+ return this;
+ };
+}(jQuery));
+
+window.buildTabsets = function(tocID) {
+
+ // build a tabset from a section div with the .tabset class
+ function buildTabset(tabset) {
+
+ // check for fade and pills options
+ var fade = tabset.hasClass("tabset-fade");
+ var pills = tabset.hasClass("tabset-pills");
+ var navClass = pills ? "nav-pills" : "nav-tabs";
+
+ // determine the heading level of the tabset and tabs
+ var match = tabset.attr('class').match(/level(\d) /);
+ if (match === null)
+ return;
+ var tabsetLevel = Number(match[1]);
+ var tabLevel = tabsetLevel + 1;
+
+ // find all subheadings immediately below
+ var tabs = tabset.find("div.section.level" + tabLevel);
+ if (!tabs.length)
+ return;
+
+ // create tablist and tab-content elements
+ var tabList = $('<ul class="nav ' + navClass + '" role="tablist"></ul>');
+ $(tabs[0]).before(tabList);
+ var tabContent = $('<div class="tab-content"></div>');
+ $(tabs[0]).before(tabContent);
+
+ // build the tabset
+ var activeTab = 0;
+ tabs.each(function(i) {
+
+ // get the tab div
+ var tab = $(tabs[i]);
+
+ // get the id then sanitize it for use with bootstrap tabs
+ var id = tab.attr('id');
+
+ // see if this is marked as the active tab
+ if (tab.hasClass('active'))
+ activeTab = i;
+
+ // remove any table of contents entries associated with
+ // this ID (since we'll be removing the heading element)
+ $("div#" + tocID + " li a[href='#" + id + "']").parent().remove();
+
+ // sanitize the id for use with bootstrap tabs
+ id = id.replace(/[.\/?&!#<>]/g, '').replace(/\s/g, '_');
+ tab.attr('id', id);
+
+ // get the heading element within it, grab it's text, then remove it
+ var heading = tab.find('h' + tabLevel + ':first');
+ var headingText = heading.html();
+ heading.remove();
+
+ // build and append the tab list item
+ var a = $('<a role="tab" data-toggle="tab">' + headingText + '</a>');
+ a.attr('href', '#' + id);
+ a.attr('aria-controls', id);
+ var li = $('<li role="presentation"></li>');
+ li.append(a);
+ tabList.append(li);
+
+ // set it's attributes
+ tab.attr('role', 'tabpanel');
+ tab.addClass('tab-pane');
+ tab.addClass('tabbed-pane');
+ if (fade)
+ tab.addClass('fade');
+
+ // move it into the tab content div
+ tab.detach().appendTo(tabContent);
+ });
+
+ // set active tab
+ $(tabList.children('li')[activeTab]).addClass('active');
+ var active = $(tabContent.children('div.section')[activeTab]);
+ active.addClass('active');
+ if (fade)
+ active.addClass('in');
+
+ if (tabset.hasClass("tabset-sticky"))
+ tabset.rmarkdownStickyTabs();
+ }
+
+ // convert section divs with the .tabset class to tabsets
+ var tabsets = $("div.section.tabset");
+ tabsets.each(function(i) {
+ buildTabset($(tabsets[i]));
+ });
+};
+
+</script>
+<style type="text/css">pre .operator,
+pre .paren {
+color: rgb(104, 118, 135)
+}
+pre .literal {
+color: #990073
+}
+pre .number {
+color: #099;
+}
+pre .comment {
+color: #998;
+font-style: italic
+}
+pre .keyword {
+color: #900;
+font-weight: bold
+}
+pre .identifier {
+color: rgb(0, 0, 0);
+}
+pre .string {
+color: #d14;
+}
+</style>
+<script>var hljs=new function(){function m(p){return p.replace(/&/gm,"&").replace(/</gm,"<")}function f(r,q,p){return RegExp(q,"m"+(r.cI?"i":"")+(p?"g":""))}function b(r){for(var p=0;p<r.childNodes.length;p++){var q=r.childNodes[p];if(q.nodeName=="CODE"){return q}if(!(q.nodeType==3&&q.nodeValue.match(/\s+/))){break}}}function h(t,s){var p="";for(var r=0;r<t.childNodes.length;r++){if(t.childNodes[r].nodeType==3){var q=t.childNodes[r].nodeValue;if(s){q=q.replace(/\n/g,"")}p+=q}else{ [...]
+hljs.initHighlightingOnLoad();
+
+</script>
<style type="text/css">code{white-space: pre;}</style>
<style type="text/css">
@@ -117,7 +312,7 @@ $(document).ready(function () {
<h1 class="title toc-ignore">Cryptographic Hashing in R</h1>
-<h4 class="date"><em>2017-09-06</em></h4>
+<h4 class="date"><em>2017-11-10</em></h4>
</div>
@@ -140,7 +335,7 @@ md5(file(myfile))</code></pre>
<p>Same for URLs. The hash of the <a href="http://cran.us.r-project.org/bin/windows/base/old/3.1.1/R-3.1.1-win.exe"><code>R-3.1.1-win.exe</code></a> below should match the one in <a href="http://cran.us.r-project.org/bin/windows/base/old/3.1.1/md5sum.txt"><code>md5sum.txt</code></a></p>
<pre class="r"><code># Stream-hash from a network connection
md5(url("http://cran.us.r-project.org/bin/windows/base/old/3.1.1/R-3.1.1-win.exe"))</code></pre>
-<div id="compare-to-digest" class="section level2">
+<section id="compare-to-digest" class="level2">
<h2>Compare to digest</h2>
<p>Similar functionality is also available in the <strong>digest</strong> package, but with a slightly different interface:</p>
<pre class="r"><code># Compare to digest
@@ -154,10 +349,10 @@ Attaching package: 'digest'</code></pre>
<pre><code>[1] "acbd18db4cc2f85cedef654fccc4a4d8"</code></pre>
<pre class="r"><code># Other way around
digest(cars, skip = 0)</code></pre>
-<pre><code>[1] "1952fbc796e1b9e8a634006f5c6e5770"</code></pre>
+<pre><code>[1] "a99e685b19eeb83fad8393d25c7741d4"</code></pre>
<pre class="r"><code>md5(serialize(cars, NULL))</code></pre>
-<pre><code>md5 19:52:fb:c7:96:e1:b9:e8:a6:34:00:6f:5c:6e:57:70 </code></pre>
-</div>
+<pre><code>md5 a9:9e:68:5b:19:ee:b8:3f:ad:83:93:d2:5c:77:41:d4 </code></pre>
+</section>
diff --git a/inst/doc/keys.html b/inst/doc/keys.html
index 7888050..e698731 100644
--- a/inst/doc/keys.html
+++ b/inst/doc/keys.html
@@ -10,19 +10,214 @@
-<meta name="date" content="2017-09-06" />
+<meta name="date" content="2017-11-10" />
<title>Importing and exporting RSA/DSA/EC keys</title>
-<script src="data:application/x-javascript;base64,LyohIGpRdWVyeSB2MS4xMS4zIHwgKGMpIDIwMDUsIDIwMTUgalF1ZXJ5IEZvdW5kYXRpb24sIEluYy4gfCBqcXVlcnkub3JnL2xpY2Vuc2UgKi8KIWZ1bmN0aW9uKGEsYil7Im9iamVjdCI9PXR5cGVvZiBtb2R1bGUmJiJvYmplY3QiPT10eXBlb2YgbW9kdWxlLmV4cG9ydHM/bW9kdWxlLmV4cG9ydHM9YS5kb2N1bWVudD9iKGEsITApOmZ1bmN0aW9uKGEpe2lmKCFhLmRvY3VtZW50KXRocm93IG5ldyBFcnJvcigialF1ZXJ5IHJlcXVpcmVzIGEgd2luZG93IHdpdGggYSBkb2N1bWVudCIpO3JldHVybiBiKGEpfTpiKGEpfSgidW5kZWZpbmVkIiE9dHlwZW9mIHdpbmRvdz93aW5kb3c6dG [...]
+<script>/*! jQuery v1.11.3 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.3",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b [...]
+
+return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}fu [...]
+return new Za.prototype.init(a,b,c,d,e)}m.Tween=Za,Za.prototype={constructor:Za,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")},cur:function(){var a=Za.propHooks[this.prop];return a&&a.get?a.get(this):Za.propHooks._default.get(this)},run:function(a){var b,c=Za.propHooks[this.prop];return this.options.duration?this.pos=b=m.easing[this.easing](a,this.options.duration*a, [...]
+</script>
<meta name="viewport" content="width=device-width, initial-scale=1" />
-<link href="data:text/css;charset=utf-8,html%7Bfont%2Dfamily%3Asans%2Dserif%3B%2Dwebkit%2Dtext%2Dsize%2Dadjust%3A100%25%3B%2Dms%2Dtext%2Dsize%2Dadjust%3A100%25%7Dbody%7Bmargin%3A0%7Darticle%2Caside%2Cdetails%2Cfigcaption%2Cfigure%2Cfooter%2Cheader%2Chgroup%2Cmain%2Cmenu%2Cnav%2Csection%2Csummary%7Bdisplay%3Ablock%7Daudio%2Ccanvas%2Cprogress%2Cvideo%7Bdisplay%3Ainline%2Dblock%3Bvertical%2Dalign%3Abaseline%7Daudio%3Anot%28%5Bcontrols%5D%29%7Bdisplay%3Anone%3Bheight%3A0%7D%5Bhidden%5D%2Ctem [...]
-<script src="data:application/x-javascript;base64,LyohCiAqIEJvb3RzdHJhcCB2My4zLjUgKGh0dHA6Ly9nZXRib290c3RyYXAuY29tKQogKiBDb3B5cmlnaHQgMjAxMS0yMDE1IFR3aXR0ZXIsIEluYy4KICogTGljZW5zZWQgdW5kZXIgdGhlIE1JVCBsaWNlbnNlCiAqLwppZigidW5kZWZpbmVkIj09dHlwZW9mIGpRdWVyeSl0aHJvdyBuZXcgRXJyb3IoIkJvb3RzdHJhcCdzIEphdmFTY3JpcHQgcmVxdWlyZXMgalF1ZXJ5Iik7K2Z1bmN0aW9uKGEpeyJ1c2Ugc3RyaWN0Ijt2YXIgYj1hLmZuLmpxdWVyeS5zcGxpdCgiICIpWzBdLnNwbGl0KCIuIik7aWYoYlswXTwyJiZiWzFdPDl8fDE9PWJbMF0mJjk9PWJbMV0mJmJbMl08MSl0aHJvdy [...]
-<script src="data:application/x-javascript;base64,LyoqCiogQHByZXNlcnZlIEhUTUw1IFNoaXYgMy43LjIgfCBAYWZhcmthcyBAamRhbHRvbiBAam9uX25lYWwgQHJlbSB8IE1JVC9HUEwyIExpY2Vuc2VkCiovCi8vIE9ubHkgcnVuIHRoaXMgY29kZSBpbiBJRSA4CmlmICghIXdpbmRvdy5uYXZpZ2F0b3IudXNlckFnZW50Lm1hdGNoKCJNU0lFIDgiKSkgewohZnVuY3Rpb24oYSxiKXtmdW5jdGlvbiBjKGEsYil7dmFyIGM9YS5jcmVhdGVFbGVtZW50KCJwIiksZD1hLmdldEVsZW1lbnRzQnlUYWdOYW1lKCJoZWFkIilbMF18fGEuZG9jdW1lbnRFbGVtZW50O3JldHVybiBjLmlubmVySFRNTD0ieDxzdHlsZT4iK2IrIjwvc3R5bGU+IixkLm [...]
-<script src="data:application/x-javascript;base64,LyohIFJlc3BvbmQuanMgdjEuNC4yOiBtaW4vbWF4LXdpZHRoIG1lZGlhIHF1ZXJ5IHBvbHlmaWxsICogQ29weXJpZ2h0IDIwMTMgU2NvdHQgSmVobAogKiBMaWNlbnNlZCB1bmRlciBodHRwczovL2dpdGh1Yi5jb20vc2NvdHRqZWhsL1Jlc3BvbmQvYmxvYi9tYXN0ZXIvTElDRU5TRS1NSVQKICogICovCgovLyBPbmx5IHJ1biB0aGlzIGNvZGUgaW4gSUUgOAppZiAoISF3aW5kb3cubmF2aWdhdG9yLnVzZXJBZ2VudC5tYXRjaCgiTVNJRSA4IikpIHsKIWZ1bmN0aW9uKGEpeyJ1c2Ugc3RyaWN0IjthLm1hdGNoTWVkaWE9YS5tYXRjaE1lZGlhfHxmdW5jdGlvbihhKXt2YXIgYixjPWEuZG [...]
-<script src="data:application/x-javascript;base64,CgovKioKICogalF1ZXJ5IFBsdWdpbjogU3RpY2t5IFRhYnMKICoKICogQGF1dGhvciBBaWRhbiBMaXN0ZXIgPGFpZGFuQHBocC5uZXQ+CiAqIGFkYXB0ZWQgYnkgUnViZW4gQXJzbGFuIHRvIGFjdGl2YXRlIHBhcmVudCB0YWJzIHRvbwogKiBodHRwOi8vd3d3LmFpZGFubGlzdGVyLmNvbS8yMDE0LzAzL3BlcnNpc3RpbmctdGhlLXRhYi1zdGF0ZS1pbi1ib290c3RyYXAvCiAqLwooZnVuY3Rpb24oJCkgewogICJ1c2Ugc3RyaWN0IjsKICAkLmZuLnJtYXJrZG93blN0aWNreVRhYnMgPSBmdW5jdGlvbigpIHsKICAgIHZhciBjb250ZXh0ID0gdGhpczsKICAgIC8vIFNob3cgdGhlIHRhYi [...]
-<link href="data:text/css;charset=utf-8,pre%20%2Eoperator%2C%0Apre%20%2Eparen%20%7B%0Acolor%3A%20rgb%28104%2C%20118%2C%20135%29%0A%7D%0Apre%20%2Eliteral%20%7B%0Acolor%3A%20%23990073%0A%7D%0Apre%20%2Enumber%20%7B%0Acolor%3A%20%23099%3B%0A%7D%0Apre%20%2Ecomment%20%7B%0Acolor%3A%20%23998%3B%0Afont%2Dstyle%3A%20italic%0A%7D%0Apre%20%2Ekeyword%20%7B%0Acolor%3A%20%23900%3B%0Afont%2Dweight%3A%20bold%0A%7D%0Apre%20%2Eidentifier%20%7B%0Acolor%3A%20rgb%280%2C%200%2C%200%29%3B%0A%7D%0Apre%20%2Estri [...]
-<script src="data:application/x-javascript;base64,dmFyIGhsanM9bmV3IGZ1bmN0aW9uKCl7ZnVuY3Rpb24gbShwKXtyZXR1cm4gcC5yZXBsYWNlKC8mL2dtLCImYW1wOyIpLnJlcGxhY2UoLzwvZ20sIiZsdDsiKX1mdW5jdGlvbiBmKHIscSxwKXtyZXR1cm4gUmVnRXhwKHEsIm0iKyhyLmNJPyJpIjoiIikrKHA/ImciOiIiKSl9ZnVuY3Rpb24gYihyKXtmb3IodmFyIHA9MDtwPHIuY2hpbGROb2Rlcy5sZW5ndGg7cCsrKXt2YXIgcT1yLmNoaWxkTm9kZXNbcF07aWYocS5ub2RlTmFtZT09IkNPREUiKXtyZXR1cm4gcX1pZighKHEubm9kZVR5cGU9PTMmJnEubm9kZVZhbHVlLm1hdGNoKC9ccysvKSkpe2JyZWFrfX19ZnVuY3Rpb24gaCh0LH [...]
+<style type="text/css">html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:70 [...]
+</style>
+<script>/*!
+ * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",tra [...]
+d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){v [...]
+<script>/**
+* @preserve HTML5 Shiv 3.7.2 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+*/
+// Only run this code in IE 8
+if (!!window.navigator.userAgent.match("MSIE 8")) {
+!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l [...]
+};
+</script>
+<script>/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl
+ * Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
+ * */
+
+// Only run this code in IE 8
+if (!!window.navigator.userAgent.match("MSIE 8")) {
+!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),funct [...]
+};
+</script>
+<script>
+
+/**
+ * jQuery Plugin: Sticky Tabs
+ *
+ * @author Aidan Lister <aidan at php.net>
+ * adapted by Ruben Arslan to activate parent tabs too
+ * http://www.aidanlister.com/2014/03/persisting-the-tab-state-in-bootstrap/
+ */
+(function($) {
+ "use strict";
+ $.fn.rmarkdownStickyTabs = function() {
+ var context = this;
+ // Show the tab corresponding with the hash in the URL, or the first tab
+ var showStuffFromHash = function() {
+ var hash = window.location.hash;
+ var selector = hash ? 'a[href="' + hash + '"]' : 'li.active > a';
+ var $selector = $(selector, context);
+ if($selector.data('toggle') === "tab") {
+ $selector.tab('show');
+ // walk up the ancestors of this element, show any hidden tabs
+ $selector.parents('.section.tabset').each(function(i, elm) {
+ var link = $('a[href="#' + $(elm).attr('id') + '"]');
+ if(link.data('toggle') === "tab") {
+ link.tab("show");
+ }
+ });
+ }
+ };
+
+
+ // Set the correct tab when the page loads
+ showStuffFromHash(context);
+
+ // Set the correct tab when a user uses their back/forward button
+ $(window).on('hashchange', function() {
+ showStuffFromHash(context);
+ });
+
+ // Change the URL when tabs are clicked
+ $('a', context).on('click', function(e) {
+ history.pushState(null, null, this.href);
+ showStuffFromHash(context);
+ });
+
+ return this;
+ };
+}(jQuery));
+
+window.buildTabsets = function(tocID) {
+
+ // build a tabset from a section div with the .tabset class
+ function buildTabset(tabset) {
+
+ // check for fade and pills options
+ var fade = tabset.hasClass("tabset-fade");
+ var pills = tabset.hasClass("tabset-pills");
+ var navClass = pills ? "nav-pills" : "nav-tabs";
+
+ // determine the heading level of the tabset and tabs
+ var match = tabset.attr('class').match(/level(\d) /);
+ if (match === null)
+ return;
+ var tabsetLevel = Number(match[1]);
+ var tabLevel = tabsetLevel + 1;
+
+ // find all subheadings immediately below
+ var tabs = tabset.find("div.section.level" + tabLevel);
+ if (!tabs.length)
+ return;
+
+ // create tablist and tab-content elements
+ var tabList = $('<ul class="nav ' + navClass + '" role="tablist"></ul>');
+ $(tabs[0]).before(tabList);
+ var tabContent = $('<div class="tab-content"></div>');
+ $(tabs[0]).before(tabContent);
+
+ // build the tabset
+ var activeTab = 0;
+ tabs.each(function(i) {
+
+ // get the tab div
+ var tab = $(tabs[i]);
+
+ // get the id then sanitize it for use with bootstrap tabs
+ var id = tab.attr('id');
+
+ // see if this is marked as the active tab
+ if (tab.hasClass('active'))
+ activeTab = i;
+
+ // remove any table of contents entries associated with
+ // this ID (since we'll be removing the heading element)
+ $("div#" + tocID + " li a[href='#" + id + "']").parent().remove();
+
+ // sanitize the id for use with bootstrap tabs
+ id = id.replace(/[.\/?&!#<>]/g, '').replace(/\s/g, '_');
+ tab.attr('id', id);
+
+ // get the heading element within it, grab it's text, then remove it
+ var heading = tab.find('h' + tabLevel + ':first');
+ var headingText = heading.html();
+ heading.remove();
+
+ // build and append the tab list item
+ var a = $('<a role="tab" data-toggle="tab">' + headingText + '</a>');
+ a.attr('href', '#' + id);
+ a.attr('aria-controls', id);
+ var li = $('<li role="presentation"></li>');
+ li.append(a);
+ tabList.append(li);
+
+ // set it's attributes
+ tab.attr('role', 'tabpanel');
+ tab.addClass('tab-pane');
+ tab.addClass('tabbed-pane');
+ if (fade)
+ tab.addClass('fade');
+
+ // move it into the tab content div
+ tab.detach().appendTo(tabContent);
+ });
+
+ // set active tab
+ $(tabList.children('li')[activeTab]).addClass('active');
+ var active = $(tabContent.children('div.section')[activeTab]);
+ active.addClass('active');
+ if (fade)
+ active.addClass('in');
+
+ if (tabset.hasClass("tabset-sticky"))
+ tabset.rmarkdownStickyTabs();
+ }
+
+ // convert section divs with the .tabset class to tabsets
+ var tabsets = $("div.section.tabset");
+ tabsets.each(function(i) {
+ buildTabset($(tabsets[i]));
+ });
+};
+
+</script>
+<style type="text/css">pre .operator,
+pre .paren {
+color: rgb(104, 118, 135)
+}
+pre .literal {
+color: #990073
+}
+pre .number {
+color: #099;
+}
+pre .comment {
+color: #998;
+font-style: italic
+}
+pre .keyword {
+color: #900;
+font-weight: bold
+}
+pre .identifier {
+color: rgb(0, 0, 0);
+}
+pre .string {
+color: #d14;
+}
+</style>
+<script>var hljs=new function(){function m(p){return p.replace(/&/gm,"&").replace(/</gm,"<")}function f(r,q,p){return RegExp(q,"m"+(r.cI?"i":"")+(p?"g":""))}function b(r){for(var p=0;p<r.childNodes.length;p++){var q=r.childNodes[p];if(q.nodeName=="CODE"){return q}if(!(q.nodeType==3&&q.nodeValue.match(/\s+/))){break}}}function h(t,s){var p="";for(var r=0;r<t.childNodes.length;r++){if(t.childNodes[r].nodeType==3){var q=t.childNodes[r].nodeValue;if(s){q=q.replace(/\n/g,"")}p+=q}else{ [...]
+hljs.initHighlightingOnLoad();
+
+</script>
<style type="text/css">code{white-space: pre;}</style>
<style type="text/css">
@@ -117,7 +312,7 @@ $(document).ready(function () {
<h1 class="title toc-ignore">Importing and exporting RSA/DSA/EC keys</h1>
-<h4 class="date"><em>2017-09-06</em></h4>
+<h4 class="date"><em>2017-11-10</em></h4>
</div>
@@ -136,7 +331,7 @@ $(document).ready(function () {
<li><a href="#the-json-web-key-jwk-format"><strong>JWK</strong></a>: JSON Web key. Stores key data in a JSON object</li>
</ul>
<p>The openssl package automatically detects the format when possible. However being able to recognize the various formats can be useful.</p>
-<div id="the-der-format" class="section level3">
+<section id="the-der-format" class="level3">
<h3>The DER format</h3>
<p>DER is the standard <strong>binary</strong> format using by protocols for storing and exchanging keys and certificates. It consists of a <a href="https://en.wikipedia.org/wiki/Abstract_Syntax_Notation_One#Example_encoded_in_DER">serialized ASN.1</a> structure which hold the key’s (very large) prime numbers.</p>
<pre class="r"><code>key <- ec_keygen()
@@ -144,51 +339,51 @@ pubkey <- key$pubkey
bin <- write_der(pubkey)
print(bin)</code></pre>
<pre><code> [1] 30 59 30 13 06 07 2a 86 48 ce 3d 02 01 06 08 2a 86 48 ce 3d 03 01 07
-[24] 03 42 00 04 48 6a e8 ff 74 9b ad 96 fa 14 d8 f8 cd 9b 51 71 5c 46 f6
-[47] 3f 6a b7 b2 98 02 7d df 3a 94 4f 68 f2 2d f8 ef 4b 46 48 80 fb 29 2a
-[70] 5e f5 b3 71 fa 21 48 24 59 01 90 57 57 c4 6b 00 0c f8 f5 09 f0 cc</code></pre>
+[24] 03 42 00 04 80 a1 a2 91 98 0d ed 37 22 2a 70 aa c5 26 56 b8 9c 7a 31
+[47] 11 f9 d9 bb a8 df 18 29 7e 92 96 76 94 5c 8b e7 dc 51 97 b5 61 8a 41
+[70] 28 e0 be 42 f7 68 84 8b 71 30 d7 17 fc 23 3f 36 c2 56 7e d8 60 a5</code></pre>
<p>To read a DER key use <code>read_key</code> or <code>read_pubkey</code> with <code>der = TRUE</code>.</p>
<pre class="r"><code>read_pubkey(bin, der = TRUE)</code></pre>
<pre><code>[256-bit ecdsa public key]
-md5: 71367a50d9dd7bba67ca617f12f8c74b</code></pre>
+md5: 7d141513060fc1ba53ed97aa96147c8f</code></pre>
<p>Users typically don’t need to worry about the key’s underlying primes, but have a look at <code>key$data</code> if you are curious.</p>
-</div>
-<div id="the-pem-format" class="section level3">
+</section>
+<section id="the-pem-format" class="level3">
<h3>The PEM format</h3>
<p>In practice the user rarely encounters DER because it is mainly for internal use. When humans exchange keys and certificates they typically use the PEM format. PEM is simply <strong>base64 encoded DER data, plus a header</strong>. The header identifies the key (and possibly encryption) type.</p>
<pre class="r"><code>cat(write_pem(pubkey))</code></pre>
<pre><code>-----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAESGro/3SbrZb6FNj4zZtRcVxG9j9q
-t7KYAn3fOpRPaPIt+O9LRkiA+ykqXvWzcfohSCRZAZBXV8RrAAz49QnwzA==
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEgKGikZgN7TciKnCqxSZWuJx6MRH5
+2buo3xgpfpKWdpRci+fcUZe1YYpBKOC+QvdohItxMNcX/CM/NsJWfthgpQ==
-----END PUBLIC KEY-----</code></pre>
<pre class="r"><code>cat(write_pem(key, password = NULL))</code></pre>
<pre><code>-----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg7qsPzcAJo4JPPFyh
-bUivYE3NEQ0Jfo5roK6klNdPdjqhRANCAARIauj/dJutlvoU2PjNm1FxXEb2P2q3
-spgCfd86lE9o8i3470tGSID7KSpe9bNx+iFIJFkBkFdXxGsADPj1CfDM
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgSDlEDqfNewQI8IqC
+vtePqHariTqhD8kscUij4gKzqb2hRANCAASAoaKRmA3tNyIqcKrFJla4nHoxEfnZ
+u6jfGCl+kpZ2lFyL59xRl7VhikEo4L5C92iEi3Ew1xf8Iz82wlZ+2GCl
-----END PRIVATE KEY-----</code></pre>
<p>The PEM format allows for protecting private keys with a password. R will prompt you for the password when reading such a protected key.</p>
<pre class="r"><code>cat(write_pem(key, password = "supersecret"))</code></pre>
<pre><code>-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIHjME4GCSqGSIb3DQEFDTBBMCkGCSqGSIb3DQEFDDAcBAhF9/pDLyI5ZwICCAAw
-DAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIRyZAzghjgmAEgZCm1EoHoWP3wgT9
-3Kw3aVvGd9ZlXukkE6c0UFYCKby+Rg9THEJmXXu+hYzTouxKHxFrXM2pLEAuG1rt
-Os3RVgMiz8NLJhfFN/QrMpubL1bzPNZcHUOTqbeTcFVf+IbCZvQixgEqulFCQzWv
-Hem5Eg9CTVta+FDEbt2o/hcKmTWRv2QITdtfuvRcCHG891Vm46c=
+MIHjME4GCSqGSIb3DQEFDTBBMCkGCSqGSIb3DQEFDDAcBAhBX0RSABCq2wICCAAw
+DAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIiD310h0RFa4EgZA35GVgClIqy9s8
+yRaol4KKRiOh79bhQZLqKgI0hVBVCwKuZ2sUy3ADXLXMYWWNVQThHmggKu7I2PJw
+rDwZgGS8W2F7kq+gzsZXaL9kAu3N/iIj1gFTAJxzq+0LYkI4DKyWmeMAUUfG5wJF
+4gO3YMlWEL7W/SrN7qi/BYDKX4SOHqAqxnbUcsu8hy2aZwDx/Dw=
-----END ENCRYPTED PRIVATE KEY-----</code></pre>
-</div>
-<div id="the-openssh-format" class="section level3">
+</section>
+<section id="the-openssh-format" class="level3">
<h3>The OpenSSH format</h3>
<p>For better or worse, OpenSSH uses a custom format for <strong>public keys</strong>. The advantage of this format is that it fits on a single line which is nice for e.g. your <code>~/.ssh/known_hosts</code> file. There is no special format for private keys, OpenSSH uses PEM as well.</p>
<pre class="r"><code>str <- write_ssh(pubkey)
print(str)</code></pre>
-<pre><code>[1] "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEhq6P90m62W+hTY+M2bUXFcRvY/areymAJ93zqUT2jyLfjvS0ZIgPspKl71s3H6IUgkWQGQV1fEawAM+PUJ8Mw="</code></pre>
+<pre><code>[1] "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIChopGYDe03IipwqsUmVricejER+dm7qN8YKX6SlnaUXIvn3FGXtWGKQSjgvkL3aISLcTDXF/wjPzbCVn7YYKU="</code></pre>
<p>The <code>read_pubkey</code> function will automatically detect if a file contains a <code>PEM</code> or <code>SSH</code> key.</p>
<pre class="r"><code>read_pubkey(str)</code></pre>
<pre><code>[256-bit ecdsa public key]
-md5: 71367a50d9dd7bba67ca617f12f8c74b</code></pre>
-</div>
-<div id="the-json-web-key-jwk-format" class="section level3">
+md5: 7d141513060fc1ba53ed97aa96147c8f</code></pre>
+</section>
+<section id="the-json-web-key-jwk-format" class="level3">
<h3>The JSON Web Key (JWK) format</h3>
<p>Yet another recent format to store RSA or EC keys are JSON Web Keys (JWK). JWK is part of the <strong>Javascript Object Signing and Encryption (JOSE)</strong> specification. The <code>write_jwk</code> and <code>read_jwk</code> functions are implemented in a separate package which uses the <code>openssl</code> package.</p>
<pre class="r"><code>library(jose)
@@ -197,8 +392,8 @@ jsonlite::prettify(json)</code></pre>
<pre><code>{
"kty": "EC",
"crv": "P-256",
- "x": "SGro_3SbrZb6FNj4zZtRcVxG9j9qt7KYAn3fOpRPaPI",
- "y": "LfjvS0ZIgPspKl71s3H6IUgkWQGQV1fEawAM-PUJ8Mw"
+ "x": "gKGikZgN7TciKnCqxSZWuJx6MRH52buo3xgpfpKWdpQ",
+ "y": "XIvn3FGXtWGKQSjgvkL3aISLcTDXF_wjPzbCVn7YYKU"
}
</code></pre>
<p>Keys from <code>jose</code> and <code>openssl</code> are the same.</p>
@@ -207,8 +402,8 @@ identical(mykey, pubkey)</code></pre>
<pre><code>[1] TRUE</code></pre>
<pre class="r"><code>print(mykey)</code></pre>
<pre><code>[256-bit ecdsa public key]
-md5: 71367a50d9dd7bba67ca617f12f8c74b</code></pre>
-</div>
+md5: 7d141513060fc1ba53ed97aa96147c8f</code></pre>
+</section>
diff --git a/inst/doc/secure_rng.html b/inst/doc/secure_rng.html
index 5c359c4..3755bb6 100644
--- a/inst/doc/secure_rng.html
+++ b/inst/doc/secure_rng.html
@@ -10,19 +10,214 @@
-<meta name="date" content="2017-09-06" />
+<meta name="date" content="2017-11-10" />
<title>Generating Secure Random Numbers in R</title>
-<script src="data:application/x-javascript;base64,LyohIGpRdWVyeSB2MS4xMS4zIHwgKGMpIDIwMDUsIDIwMTUgalF1ZXJ5IEZvdW5kYXRpb24sIEluYy4gfCBqcXVlcnkub3JnL2xpY2Vuc2UgKi8KIWZ1bmN0aW9uKGEsYil7Im9iamVjdCI9PXR5cGVvZiBtb2R1bGUmJiJvYmplY3QiPT10eXBlb2YgbW9kdWxlLmV4cG9ydHM/bW9kdWxlLmV4cG9ydHM9YS5kb2N1bWVudD9iKGEsITApOmZ1bmN0aW9uKGEpe2lmKCFhLmRvY3VtZW50KXRocm93IG5ldyBFcnJvcigialF1ZXJ5IHJlcXVpcmVzIGEgd2luZG93IHdpdGggYSBkb2N1bWVudCIpO3JldHVybiBiKGEpfTpiKGEpfSgidW5kZWZpbmVkIiE9dHlwZW9mIHdpbmRvdz93aW5kb3c6dG [...]
+<script>/*! jQuery v1.11.3 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.3",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b [...]
+
+return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}fu [...]
+return new Za.prototype.init(a,b,c,d,e)}m.Tween=Za,Za.prototype={constructor:Za,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")},cur:function(){var a=Za.propHooks[this.prop];return a&&a.get?a.get(this):Za.propHooks._default.get(this)},run:function(a){var b,c=Za.propHooks[this.prop];return this.options.duration?this.pos=b=m.easing[this.easing](a,this.options.duration*a, [...]
+</script>
<meta name="viewport" content="width=device-width, initial-scale=1" />
-<link href="data:text/css;charset=utf-8,html%7Bfont%2Dfamily%3Asans%2Dserif%3B%2Dwebkit%2Dtext%2Dsize%2Dadjust%3A100%25%3B%2Dms%2Dtext%2Dsize%2Dadjust%3A100%25%7Dbody%7Bmargin%3A0%7Darticle%2Caside%2Cdetails%2Cfigcaption%2Cfigure%2Cfooter%2Cheader%2Chgroup%2Cmain%2Cmenu%2Cnav%2Csection%2Csummary%7Bdisplay%3Ablock%7Daudio%2Ccanvas%2Cprogress%2Cvideo%7Bdisplay%3Ainline%2Dblock%3Bvertical%2Dalign%3Abaseline%7Daudio%3Anot%28%5Bcontrols%5D%29%7Bdisplay%3Anone%3Bheight%3A0%7D%5Bhidden%5D%2Ctem [...]
-<script src="data:application/x-javascript;base64,LyohCiAqIEJvb3RzdHJhcCB2My4zLjUgKGh0dHA6Ly9nZXRib290c3RyYXAuY29tKQogKiBDb3B5cmlnaHQgMjAxMS0yMDE1IFR3aXR0ZXIsIEluYy4KICogTGljZW5zZWQgdW5kZXIgdGhlIE1JVCBsaWNlbnNlCiAqLwppZigidW5kZWZpbmVkIj09dHlwZW9mIGpRdWVyeSl0aHJvdyBuZXcgRXJyb3IoIkJvb3RzdHJhcCdzIEphdmFTY3JpcHQgcmVxdWlyZXMgalF1ZXJ5Iik7K2Z1bmN0aW9uKGEpeyJ1c2Ugc3RyaWN0Ijt2YXIgYj1hLmZuLmpxdWVyeS5zcGxpdCgiICIpWzBdLnNwbGl0KCIuIik7aWYoYlswXTwyJiZiWzFdPDl8fDE9PWJbMF0mJjk9PWJbMV0mJmJbMl08MSl0aHJvdy [...]
-<script src="data:application/x-javascript;base64,LyoqCiogQHByZXNlcnZlIEhUTUw1IFNoaXYgMy43LjIgfCBAYWZhcmthcyBAamRhbHRvbiBAam9uX25lYWwgQHJlbSB8IE1JVC9HUEwyIExpY2Vuc2VkCiovCi8vIE9ubHkgcnVuIHRoaXMgY29kZSBpbiBJRSA4CmlmICghIXdpbmRvdy5uYXZpZ2F0b3IudXNlckFnZW50Lm1hdGNoKCJNU0lFIDgiKSkgewohZnVuY3Rpb24oYSxiKXtmdW5jdGlvbiBjKGEsYil7dmFyIGM9YS5jcmVhdGVFbGVtZW50KCJwIiksZD1hLmdldEVsZW1lbnRzQnlUYWdOYW1lKCJoZWFkIilbMF18fGEuZG9jdW1lbnRFbGVtZW50O3JldHVybiBjLmlubmVySFRNTD0ieDxzdHlsZT4iK2IrIjwvc3R5bGU+IixkLm [...]
-<script src="data:application/x-javascript;base64,LyohIFJlc3BvbmQuanMgdjEuNC4yOiBtaW4vbWF4LXdpZHRoIG1lZGlhIHF1ZXJ5IHBvbHlmaWxsICogQ29weXJpZ2h0IDIwMTMgU2NvdHQgSmVobAogKiBMaWNlbnNlZCB1bmRlciBodHRwczovL2dpdGh1Yi5jb20vc2NvdHRqZWhsL1Jlc3BvbmQvYmxvYi9tYXN0ZXIvTElDRU5TRS1NSVQKICogICovCgovLyBPbmx5IHJ1biB0aGlzIGNvZGUgaW4gSUUgOAppZiAoISF3aW5kb3cubmF2aWdhdG9yLnVzZXJBZ2VudC5tYXRjaCgiTVNJRSA4IikpIHsKIWZ1bmN0aW9uKGEpeyJ1c2Ugc3RyaWN0IjthLm1hdGNoTWVkaWE9YS5tYXRjaE1lZGlhfHxmdW5jdGlvbihhKXt2YXIgYixjPWEuZG [...]
-<script src="data:application/x-javascript;base64,CgovKioKICogalF1ZXJ5IFBsdWdpbjogU3RpY2t5IFRhYnMKICoKICogQGF1dGhvciBBaWRhbiBMaXN0ZXIgPGFpZGFuQHBocC5uZXQ+CiAqIGFkYXB0ZWQgYnkgUnViZW4gQXJzbGFuIHRvIGFjdGl2YXRlIHBhcmVudCB0YWJzIHRvbwogKiBodHRwOi8vd3d3LmFpZGFubGlzdGVyLmNvbS8yMDE0LzAzL3BlcnNpc3RpbmctdGhlLXRhYi1zdGF0ZS1pbi1ib290c3RyYXAvCiAqLwooZnVuY3Rpb24oJCkgewogICJ1c2Ugc3RyaWN0IjsKICAkLmZuLnJtYXJrZG93blN0aWNreVRhYnMgPSBmdW5jdGlvbigpIHsKICAgIHZhciBjb250ZXh0ID0gdGhpczsKICAgIC8vIFNob3cgdGhlIHRhYi [...]
-<link href="data:text/css;charset=utf-8,pre%20%2Eoperator%2C%0Apre%20%2Eparen%20%7B%0Acolor%3A%20rgb%28104%2C%20118%2C%20135%29%0A%7D%0Apre%20%2Eliteral%20%7B%0Acolor%3A%20%23990073%0A%7D%0Apre%20%2Enumber%20%7B%0Acolor%3A%20%23099%3B%0A%7D%0Apre%20%2Ecomment%20%7B%0Acolor%3A%20%23998%3B%0Afont%2Dstyle%3A%20italic%0A%7D%0Apre%20%2Ekeyword%20%7B%0Acolor%3A%20%23900%3B%0Afont%2Dweight%3A%20bold%0A%7D%0Apre%20%2Eidentifier%20%7B%0Acolor%3A%20rgb%280%2C%200%2C%200%29%3B%0A%7D%0Apre%20%2Estri [...]
-<script src="data:application/x-javascript;base64,dmFyIGhsanM9bmV3IGZ1bmN0aW9uKCl7ZnVuY3Rpb24gbShwKXtyZXR1cm4gcC5yZXBsYWNlKC8mL2dtLCImYW1wOyIpLnJlcGxhY2UoLzwvZ20sIiZsdDsiKX1mdW5jdGlvbiBmKHIscSxwKXtyZXR1cm4gUmVnRXhwKHEsIm0iKyhyLmNJPyJpIjoiIikrKHA/ImciOiIiKSl9ZnVuY3Rpb24gYihyKXtmb3IodmFyIHA9MDtwPHIuY2hpbGROb2Rlcy5sZW5ndGg7cCsrKXt2YXIgcT1yLmNoaWxkTm9kZXNbcF07aWYocS5ub2RlTmFtZT09IkNPREUiKXtyZXR1cm4gcX1pZighKHEubm9kZVR5cGU9PTMmJnEubm9kZVZhbHVlLm1hdGNoKC9ccysvKSkpe2JyZWFrfX19ZnVuY3Rpb24gaCh0LH [...]
+<style type="text/css">html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:70 [...]
+</style>
+<script>/*!
+ * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",tra [...]
+d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){v [...]
+<script>/**
+* @preserve HTML5 Shiv 3.7.2 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+*/
+// Only run this code in IE 8
+if (!!window.navigator.userAgent.match("MSIE 8")) {
+!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l [...]
+};
+</script>
+<script>/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl
+ * Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
+ * */
+
+// Only run this code in IE 8
+if (!!window.navigator.userAgent.match("MSIE 8")) {
+!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),funct [...]
+};
+</script>
+<script>
+
+/**
+ * jQuery Plugin: Sticky Tabs
+ *
+ * @author Aidan Lister <aidan at php.net>
+ * adapted by Ruben Arslan to activate parent tabs too
+ * http://www.aidanlister.com/2014/03/persisting-the-tab-state-in-bootstrap/
+ */
+(function($) {
+ "use strict";
+ $.fn.rmarkdownStickyTabs = function() {
+ var context = this;
+ // Show the tab corresponding with the hash in the URL, or the first tab
+ var showStuffFromHash = function() {
+ var hash = window.location.hash;
+ var selector = hash ? 'a[href="' + hash + '"]' : 'li.active > a';
+ var $selector = $(selector, context);
+ if($selector.data('toggle') === "tab") {
+ $selector.tab('show');
+ // walk up the ancestors of this element, show any hidden tabs
+ $selector.parents('.section.tabset').each(function(i, elm) {
+ var link = $('a[href="#' + $(elm).attr('id') + '"]');
+ if(link.data('toggle') === "tab") {
+ link.tab("show");
+ }
+ });
+ }
+ };
+
+
+ // Set the correct tab when the page loads
+ showStuffFromHash(context);
+
+ // Set the correct tab when a user uses their back/forward button
+ $(window).on('hashchange', function() {
+ showStuffFromHash(context);
+ });
+
+ // Change the URL when tabs are clicked
+ $('a', context).on('click', function(e) {
+ history.pushState(null, null, this.href);
+ showStuffFromHash(context);
+ });
+
+ return this;
+ };
+}(jQuery));
+
+window.buildTabsets = function(tocID) {
+
+ // build a tabset from a section div with the .tabset class
+ function buildTabset(tabset) {
+
+ // check for fade and pills options
+ var fade = tabset.hasClass("tabset-fade");
+ var pills = tabset.hasClass("tabset-pills");
+ var navClass = pills ? "nav-pills" : "nav-tabs";
+
+ // determine the heading level of the tabset and tabs
+ var match = tabset.attr('class').match(/level(\d) /);
+ if (match === null)
+ return;
+ var tabsetLevel = Number(match[1]);
+ var tabLevel = tabsetLevel + 1;
+
+ // find all subheadings immediately below
+ var tabs = tabset.find("div.section.level" + tabLevel);
+ if (!tabs.length)
+ return;
+
+ // create tablist and tab-content elements
+ var tabList = $('<ul class="nav ' + navClass + '" role="tablist"></ul>');
+ $(tabs[0]).before(tabList);
+ var tabContent = $('<div class="tab-content"></div>');
+ $(tabs[0]).before(tabContent);
+
+ // build the tabset
+ var activeTab = 0;
+ tabs.each(function(i) {
+
+ // get the tab div
+ var tab = $(tabs[i]);
+
+ // get the id then sanitize it for use with bootstrap tabs
+ var id = tab.attr('id');
+
+ // see if this is marked as the active tab
+ if (tab.hasClass('active'))
+ activeTab = i;
+
+ // remove any table of contents entries associated with
+ // this ID (since we'll be removing the heading element)
+ $("div#" + tocID + " li a[href='#" + id + "']").parent().remove();
+
+ // sanitize the id for use with bootstrap tabs
+ id = id.replace(/[.\/?&!#<>]/g, '').replace(/\s/g, '_');
+ tab.attr('id', id);
+
+ // get the heading element within it, grab it's text, then remove it
+ var heading = tab.find('h' + tabLevel + ':first');
+ var headingText = heading.html();
+ heading.remove();
+
+ // build and append the tab list item
+ var a = $('<a role="tab" data-toggle="tab">' + headingText + '</a>');
+ a.attr('href', '#' + id);
+ a.attr('aria-controls', id);
+ var li = $('<li role="presentation"></li>');
+ li.append(a);
+ tabList.append(li);
+
+ // set it's attributes
+ tab.attr('role', 'tabpanel');
+ tab.addClass('tab-pane');
+ tab.addClass('tabbed-pane');
+ if (fade)
+ tab.addClass('fade');
+
+ // move it into the tab content div
+ tab.detach().appendTo(tabContent);
+ });
+
+ // set active tab
+ $(tabList.children('li')[activeTab]).addClass('active');
+ var active = $(tabContent.children('div.section')[activeTab]);
+ active.addClass('active');
+ if (fade)
+ active.addClass('in');
+
+ if (tabset.hasClass("tabset-sticky"))
+ tabset.rmarkdownStickyTabs();
+ }
+
+ // convert section divs with the .tabset class to tabsets
+ var tabsets = $("div.section.tabset");
+ tabsets.each(function(i) {
+ buildTabset($(tabsets[i]));
+ });
+};
+
+</script>
+<style type="text/css">pre .operator,
+pre .paren {
+color: rgb(104, 118, 135)
+}
+pre .literal {
+color: #990073
+}
+pre .number {
+color: #099;
+}
+pre .comment {
+color: #998;
+font-style: italic
+}
+pre .keyword {
+color: #900;
+font-weight: bold
+}
+pre .identifier {
+color: rgb(0, 0, 0);
+}
+pre .string {
+color: #d14;
+}
+</style>
+<script>var hljs=new function(){function m(p){return p.replace(/&/gm,"&").replace(/</gm,"<")}function f(r,q,p){return RegExp(q,"m"+(r.cI?"i":"")+(p?"g":""))}function b(r){for(var p=0;p<r.childNodes.length;p++){var q=r.childNodes[p];if(q.nodeName=="CODE"){return q}if(!(q.nodeType==3&&q.nodeValue.match(/\s+/))){break}}}function h(t,s){var p="";for(var r=0;r<t.childNodes.length;r++){if(t.childNodes[r].nodeType==3){var q=t.childNodes[r].nodeValue;if(s){q=q.replace(/\n/g,"")}p+=q}else{ [...]
+hljs.initHighlightingOnLoad();
+
+</script>
<style type="text/css">code{white-space: pre;}</style>
<style type="text/css">
@@ -117,7 +312,7 @@ $(document).ready(function () {
<h1 class="title toc-ignore">Generating Secure Random Numbers in R</h1>
-<h4 class="date"><em>2017-09-06</em></h4>
+<h4 class="date"><em>2017-11-10</em></h4>
</div>
@@ -125,31 +320,31 @@ $(document).ready(function () {
<p>The <code>rand_bytes</code> function binds to <a href="https://www.openssl.org/docs/manmaster/man3/RAND_bytes.html">RAND_bytes</a> in OpenSSL to generate cryptographically strong pseudo-random bytes. See the OpenSSL documentation for what this means.</p>
<pre class="r"><code>rnd <- rand_bytes(10)
print(rnd)</code></pre>
-<pre><code> [1] 67 79 cc 0d a1 c7 10 4c d7 cb</code></pre>
+<pre><code> [1] d2 c7 da c0 6b d8 7a 26 3b 63</code></pre>
<p>Bytes are 8 bit and hence can have <code>2^8 = 256</code> possible values.</p>
<pre class="r"><code>as.numeric(rnd)</code></pre>
-<pre><code> [1] 103 121 204 13 161 199 16 76 215 203</code></pre>
+<pre><code> [1] 210 199 218 192 107 216 122 38 59 99</code></pre>
<p>Each random byte can be decomposed into 8 random bits (booleans)</p>
<pre class="r"><code>x <- rand_bytes(1)
as.logical(rawToBits(x))</code></pre>
-<pre><code>[1] FALSE TRUE FALSE FALSE TRUE FALSE TRUE FALSE</code></pre>
-<div id="secure-random-numbers" class="section level2">
+<pre><code>[1] TRUE TRUE FALSE FALSE FALSE FALSE FALSE FALSE</code></pre>
+<section id="secure-random-numbers" class="level2">
<h2>Secure Random Numbers</h2>
<p><code>rand_num</code> is a simple (2 lines) wrapper to <code>rand_bytes</code> to generate random numbers (doubles) between 0 and 1.</p>
<pre class="r"><code>rand_num(10)</code></pre>
-<pre><code> [1] 0.1434106 0.2961425 0.3155963 0.9416567 0.5237373 0.6298659 0.5982151
- [8] 0.2486845 0.5146982 0.9181494</code></pre>
+<pre><code> [1] 0.433929278 0.952635483 0.672968739 0.566640710 0.826769979
+ [6] 0.052534899 0.103171438 0.516337189 0.009947374 0.905955708</code></pre>
<p>To map random draws from [0,1] into a probability density, we can use a <a href="http://en.wikipedia.org/wiki/Cumulative_distribution_function">Cumulative Distribution Function</a>. For example we can combine <code>qnorm</code> and <code>rand_num</code> to simulate <code>rnorm</code>:</p>
<pre class="r"><code># Secure rnorm
x <- qnorm(rand_num(1000), mean = 100, sd = 15)
hist(x)</code></pre>
-<p><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABUAAAAPACAYAAAD0ZtPZAAAEDWlDQ1BJQ0MgUHJvZmlsZQAAOI2NVV1oHFUUPrtzZyMkzlNsNIV0qD8NJQ2TVjShtLp/3d02bpZJNtoi6GT27s6Yyc44M7v9oU9FUHwx6psUxL+3gCAo9Q/bPrQvlQol2tQgKD60+INQ6Ium65k7M5lpurHeZe58853vnnvuuWfvBei5qliWkRQBFpquLRcy4nOHj4g9K5CEh6AXBqFXUR0rXalMAjZPC3e1W99Dwntf2dXd/p+tt0YdFSBxH2Kz5qgLiI8B8KdVy3YBevqRHz/qWh72Yui3MUDEL3q44WPXw3M+fo1pZuQs4tOIBVVTaoiXEI/MxfhGDPsxsNZfoE1q66ro5aJim3XdoLFw72H+n23BaIXzbcOnz5mfPoTvYVz7KzUl5+FRxEuqkp9G/Ajia [...]
+<p><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABUAAAAPACAYAAAD0ZtPZAAAEDWlDQ1BJQ0MgUHJvZmlsZQAAOI2NVV1oHFUUPrtzZyMkzlNsNIV0qD8NJQ2TVjShtLp/3d02bpZJNtoi6GT27s6Yyc44M7v9oU9FUHwx6psUxL+3gCAo9Q/bPrQvlQol2tQgKD60+INQ6Ium65k7M5lpurHeZe58853vnnvuuWfvBei5qliWkRQBFpquLRcy4nOHj4g9K5CEh6AXBqFXUR0rXalMAjZPC3e1W99Dwntf2dXd/p+tt0YdFSBxH2Kz5qgLiI8B8KdVy3YBevqRHz/qWh72Yui3MUDEL3q44WPXw3M+fo1pZuQs4tOIBVVTaoiXEI/MxfhGDPsxsNZfoE1q66ro5aJim3XdoLFw72H+n23BaIXzbcOnz5mfPoTvYVz7KzUl5+FRxEuqkp9G/Ajia [...]
<p>Same for discrete distributions:</p>
<pre class="r"><code># Secure rbinom
y <- qbinom(rand_num(1000), size = 20, prob = 0.1)
hist(y, breaks = -.5:(max(y)+1))</code></pre>
-<p><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABUAAAAPACAYAAAD0ZtPZAAAEDWlDQ1BJQ0MgUHJvZmlsZQAAOI2NVV1oHFUUPrtzZyMkzlNsNIV0qD8NJQ2TVjShtLp/3d02bpZJNtoi6GT27s6Yyc44M7v9oU9FUHwx6psUxL+3gCAo9Q/bPrQvlQol2tQgKD60+INQ6Ium65k7M5lpurHeZe58853vnnvuuWfvBei5qliWkRQBFpquLRcy4nOHj4g9K5CEh6AXBqFXUR0rXalMAjZPC3e1W99Dwntf2dXd/p+tt0YdFSBxH2Kz5qgLiI8B8KdVy3YBevqRHz/qWh72Yui3MUDEL3q44WPXw3M+fo1pZuQs4tOIBVVTaoiXEI/MxfhGDPsxsNZfoE1q66ro5aJim3XdoLFw72H+n23BaIXzbcOnz5mfPoTvYVz7KzUl5+FRxEuqkp9G/Ajia [...]
-</div>
+<p><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABUAAAAPACAYAAAD0ZtPZAAAEDWlDQ1BJQ0MgUHJvZmlsZQAAOI2NVV1oHFUUPrtzZyMkzlNsNIV0qD8NJQ2TVjShtLp/3d02bpZJNtoi6GT27s6Yyc44M7v9oU9FUHwx6psUxL+3gCAo9Q/bPrQvlQol2tQgKD60+INQ6Ium65k7M5lpurHeZe58853vnnvuuWfvBei5qliWkRQBFpquLRcy4nOHj4g9K5CEh6AXBqFXUR0rXalMAjZPC3e1W99Dwntf2dXd/p+tt0YdFSBxH2Kz5qgLiI8B8KdVy3YBevqRHz/qWh72Yui3MUDEL3q44WPXw3M+fo1pZuQs4tOIBVVTaoiXEI/MxfhGDPsxsNZfoE1q66ro5aJim3XdoLFw72H+n23BaIXzbcOnz5mfPoTvYVz7KzUl5+FRxEuqkp9G/Ajia [...]
+</section>
diff --git a/man/aes_cbc.Rd b/man/aes_cbc.Rd
index 56b3eed..1b32db3 100644
--- a/man/aes_cbc.Rd
+++ b/man/aes_cbc.Rd
@@ -19,7 +19,7 @@ aes_cbc_encrypt(data, key, iv = rand_bytes(16))
aes_cbc_decrypt(data, key, iv = attr(data, "iv"))
-aes_gcm_encrypt(data, key, iv = rand_bytes(16))
+aes_gcm_encrypt(data, key, iv = rand_bytes(12))
aes_gcm_decrypt(data, key, iv = attr(data, "iv"))
diff --git a/src/ssl.c b/src/ssl.c
index 6d217dc..5670bf7 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -40,12 +40,12 @@ int pending_interrupt() {
return !(R_ToplevelExec(check_interrupt_fn, NULL));
}
-SEXP R_download_cert(SEXP hostname, SEXP service) {
+SEXP R_download_cert(SEXP hostname, SEXP service, SEXP ipv4_only) {
/* The 'hints' arg is only needed for solaris */
struct addrinfo hints;
memset(&hints,0,sizeof(hints));
hints.ai_socktype = SOCK_STREAM;
- hints.ai_family = PF_UNSPEC;
+ hints.ai_family = asLogical(ipv4_only) ? AF_INET : PF_UNSPEC;
/* Because gethostbyname() is deprecated */
struct addrinfo *addr;
diff --git a/tests/testthat.R b/tests/testthat.R
index f9c859d..f27bb8c 100644
--- a/tests/testthat.R
+++ b/tests/testthat.R
@@ -1,4 +1,8 @@
library(testthat)
library(openssl)
+# The CRAN OSX Mavericks server has a firewall that blocks IPv6
+if(isTRUE(grepl("Mavericks", sessionInfo()$running)))
+ options(ipv4_only = TRUE)
+
test_check("openssl")
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-openssl.git
More information about the debian-med-commit
mailing list