File tree Expand file tree Collapse file tree 3 files changed +9
-1
lines changed Expand file tree Collapse file tree 3 files changed +9
-1
lines changed Original file line number Diff line number Diff line change 1
1
Package: openssl
2
2
Type: Package
3
3
Title: Toolkit for Encryption, Signatures and Certificates Based on OpenSSL
4
- Version: 2.3.3
4
+ Version: 2.3.4
5
5
Authors@R: c(person("Jeroen", "Ooms", role = c("aut", "cre"), email = "
[email protected] ",
6
6
comment = c(ORCID = "0000-0002-4035-0289")),
7
7
person("Oliver", "Keyes", role = "ctb"))
Original file line number Diff line number Diff line change
1
+ 2.3.4
2
+ - Fix build on legacy openssl 1.0.2
3
+
1
4
2.3.3
2
5
- Fix a unit test for CRAN Fedora builds
3
6
Original file line number Diff line number Diff line change 1
1
#include <Rinternals.h>
2
2
#include <openssl/opensslconf.h>
3
3
#include <openssl/opensslv.h>
4
+ #include "compatibility.h"
4
5
5
6
#include <openssl/evp.h>
6
7
#ifdef EVP_PKEY_ED25519
@@ -25,7 +26,11 @@ SEXP R_openssl_config(void) {
25
26
has_fips = 1 ;
26
27
#endif
27
28
SEXP res = PROTECT (Rf_allocVector (VECSXP , 4 ));
29
+ #ifdef HAS_OPENSSL11_API
28
30
SET_VECTOR_ELT (res , 0 , Rf_mkString (OpenSSL_version (OPENSSL_VERSION )));
31
+ #else
32
+ SET_VECTOR_ELT (res , 0 , Rf_mkString (OPENSSL_VERSION_TEXT ));
33
+ #endif
29
34
SET_VECTOR_ELT (res , 1 , Rf_ScalarLogical (has_ec ));
30
35
SET_VECTOR_ELT (res , 2 , Rf_ScalarLogical (has_x25519 ));
31
36
SET_VECTOR_ELT (res , 3 , Rf_ScalarLogical (has_fips ));
You can’t perform that action at this time.
0 commit comments