New Upstream Release - r-cran-openssl
Ready changes
Summary
Merged new upstream version: 2.1.0+dfsg (was: 2.0.6+dfsg).
Resulting package
Built on 2023-07-31T18:15 (took 6m34s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases r-cran-openssl-dbgsymapt install -t fresh-releases r-cran-openssl
Lintian Result
Diff
diff --git a/DESCRIPTION b/DESCRIPTION
index ecf2a48..c75dd48 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: openssl
Type: Package
Title: Toolkit for Encryption, Signatures and Certificates Based on
OpenSSL
-Version: 2.0.6
+Version: 2.1.0
Authors@R: c(person("Jeroen", "Ooms", role = c("aut", "cre"), email = "jeroen@berkeley.edu",
comment = c(ORCID = "0000-0002-4035-0289")),
person("Oliver", "Keyes", role = "ctb"))
@@ -16,7 +16,7 @@ Description: Bindings to OpenSSL libssl and libcrypto, plus custom SSH key parse
number generator, and 'bignum' math methods for manually performing crypto
calculations on large multibyte integers.
License: MIT + file LICENSE
-URL: https://github.com/jeroen/openssl
+URL: https://jeroen.r-universe.dev/openssl
BugReports: https://github.com/jeroen/openssl/issues
SystemRequirements: OpenSSL >= 1.0.2
VignetteBuilder: knitr
@@ -26,9 +26,9 @@ Suggests: curl, testthat (>= 2.1.0), digest, knitr, rmarkdown,
RoxygenNote: 7.2.3
Encoding: UTF-8
NeedsCompilation: yes
-Packaged: 2023-03-09 22:32:32 UTC; jeroen
+Packaged: 2023-07-15 16:46:31 UTC; jeroen
Author: Jeroen Ooms [aut, cre] (<https://orcid.org/0000-0002-4035-0289>),
Oliver Keyes [ctb]
Maintainer: Jeroen Ooms <jeroen@berkeley.edu>
Repository: CRAN
-Date/Publication: 2023-03-09 23:10:02 UTC
+Date/Publication: 2023-07-15 19:50:02 UTC
diff --git a/MD5 b/MD5
index 829bc64..9f15c6b 100644
--- a/MD5
+++ b/MD5
@@ -1,7 +1,7 @@
-f3f37e03fbb0b5407c3698e27c9a2310 *DESCRIPTION
+39c8e43f5b7602668911be8647dce402 *DESCRIPTION
5acd18f82cf3f814c4455a6f785249f2 *LICENSE
-c867fa8aa270496fa0478ed84298e08c *NAMESPACE
-81c12a0a0d2091e3e4ffd10182565f03 *NEWS
+033a86110cf3f4f864bbc94885a9d748 *NAMESPACE
+e9ff0b19e48dc8ab700f8690a40683f7 *NEWS
20afc683e7878f000cfc863b531872e7 *R/aes.R
86c2f782ce3e423fbeb62dec6c6f760e *R/askpass.R
b2cbc7dabe3c2c601336632cfbc9b7a0 *R/base.R
@@ -12,13 +12,13 @@ cc6804a52ad350613a81e2346b817fdf *R/base64.R
ab46b1ce00b55630bc8fd0cfb9729fb1 *R/cert.R
31ffe34c98e35c0c42cc38d54bb227c8 *R/diffie.R
35b88239b5a3b1d664eba6f2841ef1a2 *R/envelope.R
-a4be3d833e4abc8091386307072c8fae *R/hash.R
+782239bd009bcc3ed9dce22d2980966b *R/hash.R
44cd0b99632fdb0972861ae16e98e9a6 *R/info.R
2d68e4880dcf522d74a6322f7870b4b3 *R/init.R
f1191d15de9734e0298a1b55a649b7f3 *R/keygen.R
5c0c4f3ed6f529c8d52f28dcf0affe6a *R/list.R
b35c6769381e576abaf54f73e36a28f4 *R/mykey.R
-e0f1a7a7333846ff7955db186fb9e419 *R/openssh.R
+1f4d9ad6e2f5cbfc1389ea7ce400aacf *R/openssh.R
21829a88c17902a0166db50961a61b67 *R/openssl.R
3167c8754de75bbf2a9c0143158cbc23 *R/pkcs12.R
ccf70547bf26a2e32e92cd01ea0bd95e *R/pkcs7.R
@@ -33,23 +33,23 @@ f9c4917446c9696e21152dec2aeadba3 *R/stopifnot.R
68c1f11228a6d6e07d167f06b72b0745 *R/write.R
9a99d904cb4aa21058934322504c008b *R/writessh.R
2105130a5ced7f86dcb1a738635c4cb6 *R/x25519.R
-0265a9cf0f7aaeaf942ec10c46d5d2c6 *build/vignette.rds
+74d38363b833b46459bf744f8f016d4f *build/vignette.rds
4ce1fcf8d4a4b68aac58e1c00c2db6d0 *cleanup
-e5d12c8ce2a26c1c61b9ceb86bcd0332 *configure
+3c4a81e6ddbb215792d392aa311642dd *configure
d41d8cd98f00b204e9800998ecf8427e *configure.win
f4a13fcdd32ca18c3e62c7a728ebb378 *inst/cacert.pem
677836262ec13d90fd6b2721d701508b *inst/doc/bignum.R
6c2533ea075c226a5ad8b86595e2977a *inst/doc/bignum.Rmd
-13747d84f2a7459c2a1700237885336f *inst/doc/bignum.html
+7f4e20bae32079e2428169bd6e51c4f2 *inst/doc/bignum.html
7d435efd264bdb90456178d1d8021be5 *inst/doc/crypto_hashing.R
d87ce2839fef44896e72e58683620467 *inst/doc/crypto_hashing.Rmd
-ca3c40b2c099b7e90d82d042b285236c *inst/doc/crypto_hashing.html
+0fc8e42bd3088cb8cca0413ae9aadb0c *inst/doc/crypto_hashing.html
283593a47a4fe6d0e2980d57f15d467c *inst/doc/keys.R
84e4760fec6195d3851b4dc45f7857e6 *inst/doc/keys.Rmd
-25d1271cd467f16cafad3b1f00419fba *inst/doc/keys.html
+d97c5f3a5688c206889b085407e3f17d *inst/doc/keys.html
0830aed25c70f365a19114ef8d00f9ed *inst/doc/secure_rng.R
7c76b5463aa510fe41b9578b603554a1 *inst/doc/secure_rng.Rmd
-24ea10b6c9552544dc44ae30cd21d386 *inst/doc/secure_rng.html
+1e2a5d8227f72e570df7aa4a2e1bac41 *inst/doc/secure_rng.html
caa2a79c5ebd3988b9b2807069137cf7 *man/aes_cbc.Rd
f4ea38f39d1aad5b038633a28303454d *man/base64_encode.Rd
a4cb033c86e0129811687f08584597b8 *man/bignum.Rd
@@ -58,7 +58,7 @@ a4cb033c86e0129811687f08584597b8 *man/bignum.Rd
02c9b936168bec8eac5bde6e81ed1c3d *man/ec_dh.Rd
414569f27877086320ae28f708b48d6e *man/encrypt_envelope.Rd
8385671b28d11fb161789104dc7c3c62 *man/fingerprint.Rd
-ce77f133b63e74d2152e3f4e63d0ae5d *man/hash.Rd
+98832b1aa2a836db1066658f146f2783 *man/hash.Rd
26af13c8250758687994e76b49775fbc *man/keygen.Rd
9bb9704ed4c986e0964340be0fbae51d *man/my_key.Rd
80a356231b3cdc2ab9e81610bb52073b *man/openssl.Rd
@@ -74,8 +74,7 @@ a0a3b058faf5a2795629eafe29119dd9 *man/reexports.Rd
a38546fb2726f7b97fe34b4ed82ab70f *man/ssl_ctx.Rd
e9480b29e97c566460b173b56e35c0e2 *man/write_pem.Rd
f6cebf56b29be9f1ff6517fda3d23ecb *src/Makevars.in
-2cec33791efd347cbcb051402d7cf9c4 *src/Makevars.ucrt
-de5142ee97e509c60e427ed5af032152 *src/Makevars.win
+57eaa6ddf6e7056668681aca8d54b6e3 *src/Makevars.win
0eae18ebae65f2ad655b4eb71d0bebcb *src/aes.c
30500347bd564c2e24036b2d919ec920 *src/base64.c
7cacb1f31e3cdc89ebaf18acc78c10bc *src/bcrypt/bcrypt_pbkdf.c
@@ -219,7 +218,7 @@ abaef67471acc9bb53f51428ed395855 *tests/testthat/test_pkcs.R
41db695299df32c13b94f7e373e4f90d *tests/testthat/test_rand_error.R
f7373138be85ee6413c3ee0bcff274c5 *tests/testthat/test_salting.R
70a30839e51f16b1ec5f356955932b13 *tests/testthat/test_sodium.R
-1d40f7976206cdd5e4001c645b657cda *tests/testthat/test_ssl_ctx.R
+f0d7148d6fea49b69901b53b1ce05c5b *tests/testthat/test_ssl_ctx.R
0ec27c181a66ce5b72bc8c3940e9e00e *tools/version.c
497dfd3cbf113981c70269ce4b31c496 *tools/winlibs.R
6c2533ea075c226a5ad8b86595e2977a *vignettes/bignum.Rmd
diff --git a/NAMESPACE b/NAMESPACE
index 71ec2f5..c88e843 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -118,6 +118,7 @@ export(sha1)
export(sha2)
export(sha224)
export(sha256)
+export(sha3)
export(sha384)
export(sha512)
export(signature_create)
diff --git a/NEWS b/NEWS
index 72174a5..665b9bd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+2.1.0
+ - Windows and autobrew binaries have been bumped to libssl 3.1.1. (MacOS CRAN
+ binaries use libssl from CRAN 'recipes' which is currently libssl 1.1.1)
+ - Added sha3() function
+
2.0.6
- Add new functions pkcs7_encrypt and pkcs7_decrypt
- Fix snprintf bug in hash functions
diff --git a/R/hash.R b/R/hash.R
index f489b1a..6933b97 100644
--- a/R/hash.R
+++ b/R/hash.R
@@ -103,6 +103,12 @@ sha2 <- function(x, size = 256, key = NULL){
rawstringhash(x, paste0("sha", size), key)
}
+#' @rdname hash
+#' @export
+sha3 <- function(x, size = 256, key = NULL){
+ rawstringhash(x, paste0("sha3-", size), key)
+}
+
#' @rdname hash
#' @export
md4 <- function(x, key = NULL){
diff --git a/R/openssh.R b/R/openssh.R
index f9ad6d7..d1fa06c 100644
--- a/R/openssh.R
+++ b/R/openssh.R
@@ -35,7 +35,7 @@ fingerprint.pubkey <- function(key, hashfun = sha256){
hashfun(unlist(unname(hashdata)))
}
-fpdata <- function(x, ...){
+fpdata <- function(pubkey){
UseMethod("fpdata")
}
diff --git a/build/vignette.rds b/build/vignette.rds
index f294daf..2847f25 100644
Binary files a/build/vignette.rds and b/build/vignette.rds differ
diff --git a/configure b/configure
index 362d8a9..f21879a 100755
--- a/configure
+++ b/configure
@@ -37,8 +37,8 @@ elif [ `uname` = "Darwin" ]; then
test ! "$CI" && brew --version 2>/dev/null
if [ $? -eq 0 ]; then
BREWDIR=`brew --prefix`
- PKG_CFLAGS="-I$BREWDIR/opt/openssl/include -I$BREWDIR/opt/openssl@1.1/include"
- PKG_LIBS="-L$BREWDIR/opt/openssl/lib -L$BREWDIR/opt/openssl@1.1/lib $PKG_LIBS"
+ PKG_CFLAGS="-I$BREWDIR/opt/openssl/include"
+ PKG_LIBS="-L$BREWDIR/opt/openssl/lib $PKG_LIBS"
else
curl -sfL "https://autobrew.github.io/scripts/$PKG_BREW_NAME" > autobrew
. ./autobrew
diff --git a/debian/changelog b/debian/changelog
index 35a2b30..656867b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+r-cran-openssl (2.1.0+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Mon, 31 Jul 2023 18:09:53 -0000
+
r-cran-openssl (2.0.6+dfsg-1) unstable; urgency=medium
* New upstream version
diff --git a/man/hash.Rd b/man/hash.Rd
index 4c2c736..eca87e6 100644
--- a/man/hash.Rd
+++ b/man/hash.Rd
@@ -11,6 +11,7 @@
\alias{sha384}
\alias{sha512}
\alias{sha2}
+\alias{sha3}
\alias{md4}
\alias{md5}
\alias{blake2b}
@@ -31,6 +32,8 @@ sha512(x, key = NULL)
sha2(x, size = 256, key = NULL)
+sha3(x, size = 256, key = NULL)
+
md4(x, key = NULL)
md5(x, key = NULL)
diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt
deleted file mode 100644
index 1a2e101..0000000
--- a/src/Makevars.ucrt
+++ /dev/null
@@ -1,2 +0,0 @@
-CRT=-ucrt
-include Makevars.win
diff --git a/src/Makevars.win b/src/Makevars.win
index a17fb08..abc49dc 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -1,10 +1,17 @@
-VERSION = 1.1.1k
-PKG_CPPFLAGS = -I../windows/openssl-$(VERSION)/include
-PKG_LIBS = -Lbcrypt -lstatbcrypt -L../windows/openssl-$(VERSION)/lib${R_ARCH}${CRT} \
- -lssl -lcrypto -lws2_32 -lgdi32 -lcrypt32
+VERSION = 3.1.1
+RWINLIB = ../windows/openssl-$(VERSION)
+TARGET = lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH)
+PKG_CPPFLAGS = -I$(RWINLIB)/include -DOPENSSL_SUPPRESS_DEPRECATED
+
STATLIB = bcrypt/libstatbcrypt.a
LIBBCRYPT = bcrypt/bcrypt_pbkdf.o bcrypt/blowfish.o
+PKG_LIBS = \
+ -Lbcrypt -lstatbcrypt \
+ -L$(RWINLIB)/$(TARGET) \
+ -L$(RWINLIB)/lib$(R_ARCH) \
+ -lssl -lcrypto -lz -lws2_32 -lgdi32 -lcrypt32
+
#all: clean
all: $(SHLIB)
diff --git a/tests/testthat/test_ssl_ctx.R b/tests/testthat/test_ssl_ctx.R
index 5ad219a..1c49778 100644
--- a/tests/testthat/test_ssl_ctx.R
+++ b/tests/testthat/test_ssl_ctx.R
@@ -2,6 +2,7 @@ test_that("ssl-ctx integration works", {
skip_if_not_installed('curl')
skip_if(packageVersion('curl') < '4.3.3')
skip_if_not(ssl_ctx_curl_version_match())
+ skip_if_offline()
test <- download_ssl_cert('cran.r-project.org')[[1]]
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/debug/.build-id/c9/8d89e3ee953958135ab99014c2be0ec6cb6df8.debug
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/66/fef7f9c546d406f1d58f297401a37f7dd96c0d.debug
No differences were encountered between the control files of package r-cran-openssl
Control files of package r-cran-openssl-dbgsym: lines which differ (wdiff format)
Build-Ids: 66fef7f9c546d406f1d58f297401a37f7dd96c0d c98d89e3ee953958135ab99014c2be0ec6cb6df8