Merge branch 'release/os/5.2' into dependabot/gradle/com.gradle.commo…

…n-custom-user-data-gradle-plugin-1.12.1
corda · Dec 19, 2023 · 70a2256 · 70a2256
2 parents 824dbcd + 01782d0
commit 70a2256
Show file tree

Hide file tree

Showing 8 changed files with 117 additions and 1 deletion.
diff --git a/...n/resources/avro/net/corda/data/crypto/wire/ops/encryption/request/DecryptRpcCommand.avsc b/...n/resources/avro/net/corda/data/crypto/wire/ops/encryption/request/DecryptRpcCommand.avsc
@@ -0,0 +1,23 @@
+{
+  "type": "record",
+  "name": "DecryptRpcCommand",
+  "namespace": "net.corda.data.crypto.wire.ops.encryption.request",
+  "doc": "Request to decrypt the given byte array",
+  "fields": [
+    {
+      "name": "category",
+      "type": "string",
+      "doc": "The category of HSM e.g. ENCRYPTION_SECRET, TLS, etc."
+    },
+    {
+      "name": "alias",
+      "type": ["null", "string"],
+      "doc": "The symmetric key alias."
+    },
+    {
+      "name": "cipherBytes",
+      "type": "bytes",
+      "doc": "The data to decrypt."
+    }
+  ]
+}
diff --git a/...n/resources/avro/net/corda/data/crypto/wire/ops/encryption/request/EncryptRpcCommand.avsc b/...n/resources/avro/net/corda/data/crypto/wire/ops/encryption/request/EncryptRpcCommand.avsc
@@ -0,0 +1,23 @@
+{
+  "type": "record",
+  "name": "EncryptRpcCommand",
+  "namespace": "net.corda.data.crypto.wire.ops.encryption.request",
+  "doc": "Request to encrypt the given byte array",
+  "fields": [
+    {
+      "name": "category",
+      "type": "string",
+      "doc": "The category of HSM e.g. ENCRYPTION_SECRET, TLS, etc."
+    },
+    {
+      "name": "alias",
+      "type": ["null", "string"],
+      "doc": "The symmetric key alias."
+    },
+    {
+      "name": "plainBytes",
+      "type": "bytes",
+      "doc": "The data to encrypt."
+    }
+  ]
+}
diff --git a/...urces/avro/net/corda/data/crypto/wire/ops/encryption/response/CryptoDecryptionResult.avsc b/...urces/avro/net/corda/data/crypto/wire/ops/encryption/response/CryptoDecryptionResult.avsc
@@ -0,0 +1,13 @@
+{
+  "type": "record",
+  "name": "CryptoDecryptionResult",
+  "namespace": "net.corda.data.crypto.wire.ops.encryption.response",
+  "doc": "Decryption operation response",
+  "fields": [
+    {
+      "name": "plainBytes",
+      "type": "bytes",
+      "doc": "Decrypted byte array"
+    }
+  ]
+}
diff --git a/...urces/avro/net/corda/data/crypto/wire/ops/encryption/response/CryptoEncryptionResult.avsc b/...urces/avro/net/corda/data/crypto/wire/ops/encryption/response/CryptoEncryptionResult.avsc
@@ -0,0 +1,13 @@
+{
+  "type": "record",
+  "name": "CryptoEncryptionResult",
+  "namespace": "net.corda.data.crypto.wire.ops.encryption.response",
+  "doc": "Encryption operation response",
+  "fields": [
+    {
+      "name": "cipherBytes",
+      "type": "bytes",
+      "doc": "Encrypted byte array"
+    }
+  ]
+}
diff --git a/...ources/avro/net/corda/data/crypto/wire/ops/encryption/response/DecryptionOpsResponse.avsc b/...ources/avro/net/corda/data/crypto/wire/ops/encryption/response/DecryptionOpsResponse.avsc
@@ -0,0 +1,16 @@
+{
+  "type": "record",
+  "name": "DecryptionOpsResponse",
+  "namespace": "net.corda.data.crypto.wire.ops.encryption.response",
+  "doc": "Response for crypto's decryption operations envelope",
+  "fields": [
+    {
+      "name": "response",
+      "type": [
+        "net.corda.data.crypto.wire.ops.encryption.response.CryptoDecryptionResult",
+        "net.corda.data.crypto.wire.ops.encryption.response.EncryptionOpsError"
+      ],
+      "doc": "Response's payload, depends on the requested operation"
+    }
+  ]
+}
diff --git a/...resources/avro/net/corda/data/crypto/wire/ops/encryption/response/EncryptionOpsError.avsc b/...resources/avro/net/corda/data/crypto/wire/ops/encryption/response/EncryptionOpsError.avsc
@@ -0,0 +1,12 @@
+{
+  "type": "record",
+  "name": "EncryptionOpsError",
+  "namespace": "net.corda.data.crypto.wire.ops.encryption.response",
+  "doc": "Error result while performing encryption or decryption operation.",
+  "fields": [
+    {
+      "name": "errorMessage",
+      "type": "net.corda.data.ExceptionEnvelope"
+    }
+  ]
+}
diff --git a/...ources/avro/net/corda/data/crypto/wire/ops/encryption/response/EncryptionOpsResponse.avsc b/...ources/avro/net/corda/data/crypto/wire/ops/encryption/response/EncryptionOpsResponse.avsc
@@ -0,0 +1,16 @@
+{
+  "type": "record",
+  "name": "EncryptionOpsResponse",
+  "namespace": "net.corda.data.crypto.wire.ops.encryption.response",
+  "doc": "Response for crypto's encryption operations envelope",
+  "fields": [
+    {
+      "name": "response",
+      "type": [
+        "net.corda.data.crypto.wire.ops.encryption.response.CryptoEncryptionResult",
+        "net.corda.data.crypto.wire.ops.encryption.response.EncryptionOpsError"
+      ],
+      "doc": "Response's payload, depends on the requested operation"
+    }
+  ]
+}
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ cordaProductVersion = 5.2.0
 # NOTE: update this each time this module contains a breaking change
 ## NOTE: currently this is a top level revision, so all API versions will line up, but this could be moved to
 ##   a per module property in which case module versions can change independently.
-cordaApiRevision = 17
+cordaApiRevision = 18
 
 # Main
 kotlin.stdlib.default.dependency = false