[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libeufin] 01/02: fix signature type
From: |
gnunet |
Subject: |
[libeufin] 01/02: fix signature type |
Date: |
Fri, 15 Nov 2019 20:42:05 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository libeufin.
commit f6e7b7c1f314f4783f213e65dd23856f5a8a68ad
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Nov 15 19:46:50 2019 +0100
fix signature type
---
.../tech/libeufin/sandbox/EbicsProtocolBackend.kt | 2 +-
.../tech/libeufin/schema/ebics_h004/EbicsRequest.kt | 18 ++++++++++++++++--
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git
a/sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt
b/sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt
index 69fbfb7..f17f1ec 100644
--- a/sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/sandbox/EbicsProtocolBackend.kt
@@ -594,7 +594,7 @@ suspend fun ApplicationCall.ebicsweb() {
requestObject.body.dataTransfer?.dataEncryptionInfo?.encryptionPubKeyDigest?.value
if (encPubKeyDigest == null)
throw EbicsInvalidRequestError()
- val encSigData =
requestObject.body.dataTransfer?.signatureData
+ val encSigData =
requestObject.body.dataTransfer?.signatureData?.value
if (encSigData == null)
throw EbicsInvalidRequestError()
val decryptedSignatureData =
CryptoUtil.decryptEbicsE002(
diff --git
a/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_h004/EbicsRequest.kt
b/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_h004/EbicsRequest.kt
index 786fa98..e5b2051 100644
--- a/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_h004/EbicsRequest.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_h004/EbicsRequest.kt
@@ -200,16 +200,30 @@ class EbicsRequest {
}
@XmlAccessorType(XmlAccessType.NONE)
- @XmlType(propOrder = ["dataEncryptionInfo", "signatureData", "orderData"])
+ class SignatureDataType {
+ @get:XmlAttribute(name = "authenticate", required = true)
+ var authenticate: Boolean = false
+
+ @get:XmlValue
+ var value: ByteArray? = null
+ }
+
+
+ @XmlAccessorType(XmlAccessType.NONE)
+ @XmlType(propOrder = ["dataEncryptionInfo", "signatureData", "orderData",
"hostId"])
class DataTransfer {
+
@get:XmlElement(name = "DataEncryptionInfo")
var dataEncryptionInfo: EbicsTypes.DataEncryptionInfo? = null
@get:XmlElement(name = "SignatureData")
- var signatureData: ByteArray? = null
+ var signatureData: SignatureDataType? = null
@get:XmlElement(name = "OrderData")
var orderData: ByteArray? = null
+
+ @get:XmlElement(name = "HostID")
+ var hostId: String? = null
}
@XmlAccessorType(XmlAccessType.NONE)
--
To stop receiving notification emails like this one, please contact
address@hidden.