Skip to content

Commit 470ee47

Browse files
authored
Merge pull request #79 from contentauth/dyross/update-cp2a
chore: updates c2pa version
2 parents 7728124 + f65f97f commit 470ee47

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

Cargo.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ crate-type = ["lib", "cdylib"]
1212
normal = ["openssl-src"]
1313

1414
[dependencies]
15-
c2pa = {version = "0.38.0", features = ["unstable_api", "file_io", "openssl", "pdf", "fetch_remote_manifests"]}
16-
pem = "3.0.3"
17-
serde = { version = "1.0.197", features = ["derive"] }
18-
serde_derive = "1.0"
19-
serde_json = "1.0"
15+
c2pa = {version = "0.40.0", features = ["unstable_api", "file_io", "openssl", "pdf", "fetch_remote_manifests"]}
2016
thiserror = "1.0.49"
2117
uniffi = "0.28.2"
2218
openssl-src = "=300.3.1" # Required for openssl-sys

deny.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ yanked = "deny"
1818
ignore = [
1919
"RUSTSEC-2021-0127", # serde_cbor
2020
"RUSTSEC-2023-0071", # rsa Marvin Attack: (https://jira.corp.adobe.com/browse/CAI-5104)
21+
"RUSTSEC-2024-0384", # instant (https://github.com/contentauth/c2pa-rs/issues/663)
22+
"RUSTSEC-2024-0399", # tokio-rustls server: https://rustsec.org/advisories/RUSTSEC-2024-0399
2123
]
2224

2325
[bans]

src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
// specific language governing permissions and limitations under
1111
// each license.
1212

13+
// Uniffi is generating a clippy error in their output. This ignores that error.
14+
#![allow(clippy::empty_line_after_doc_comments)]
15+
1316
/// This module exports a C2PA library
1417
use std::env;
1518
use std::sync::RwLock;

src/streams.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl<'a> From<&'a dyn Stream> for StreamAdapter<'a> {
8080

8181
// impl<'a> c2pa::CAIReadWrite for StreamAdapter<'a> {}
8282

83-
impl<'a> Read for StreamAdapter<'a> {
83+
impl Read for StreamAdapter<'_> {
8484
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
8585
let bytes = self
8686
.stream
@@ -93,7 +93,7 @@ impl<'a> Read for StreamAdapter<'a> {
9393
}
9494
}
9595

96-
impl<'a> Seek for StreamAdapter<'a> {
96+
impl Seek for StreamAdapter<'_> {
9797
fn seek(&mut self, pos: std::io::SeekFrom) -> std::io::Result<u64> {
9898
let (pos, mode) = match pos {
9999
SeekFrom::Current(pos) => (pos, SeekMode::Current),
@@ -107,7 +107,7 @@ impl<'a> Seek for StreamAdapter<'a> {
107107
}
108108
}
109109

110-
impl<'a> Write for StreamAdapter<'a> {
110+
impl Write for StreamAdapter<'_> {
111111
fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
112112
let len = self
113113
.stream

0 commit comments

Comments
 (0)