Skip to content

Commit 9c067fd

Browse files
committed
Set openssl version req
1 parent e2fe002 commit 9c067fd

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ BugReports: https://github.com/r-lib/gert/issues
1818
Imports:
1919
askpass,
2020
credentials (>= 1.2.1),
21-
openssl (>= 1.4.1),
21+
openssl (>= 2.0.3),
2222
rstudioapi (>= 0.11),
2323
sys,
2424
zip (>= 2.1.0)

NAMESPACE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ importFrom(credentials,git_credential_ask)
8484
importFrom(credentials,git_credential_forget)
8585
importFrom(credentials,ssh_key_info)
8686
importFrom(credentials,ssh_read_key)
87+
importFrom(openssl,write_openssh_pem)
8788
importFrom(openssl,write_pem)
8889
importFrom(openssl,write_pkcs1)
8990
importFrom(openssl,write_ssh)

R/credentials.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#' @importFrom openssl write_ssh write_pem write_pkcs1
1+
#' @importFrom openssl write_ssh write_pem write_pkcs1 write_openssh_pem
22
#' @importFrom credentials ssh_key_info git_credential_forget ssh_read_key
33
#' @importFrom askpass askpass
44
make_key_cb <- function(ssh_key = NULL, host = NULL, password = askpass){
@@ -18,7 +18,7 @@ make_key_cb <- function(ssh_key = NULL, host = NULL, password = askpass){
1818
tmp_key <- if(inherits(key, c("rsa", "dsa", "ecdsa"))){
1919
write_pkcs1(key, tempfile())
2020
} else {
21-
openssl:::write_openssh_key(key, tempfile())
21+
write_openssh_pem(key, tempfile())
2222
}
2323
if(.Platform$OS.type == "unix"){
2424
Sys.chmod(tmp_pub, '0644')

man/gert-package.Rd

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)