Update Encryption/Decryption payloads to reflect KMIP 1.4 structure.

smira · Aug 8, 2019 · 76b04f5 · 76b04f5
1 parent f14292f
commit 76b04f5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/operations.go b/operations.go
@@ -132,15 +132,38 @@ type QueryResponse struct {
 	VendorIdentification string `kmip:"VENDOR_IDENTIFICATION"`
 }
 
+// EncryptRequest is an Encrypt Request Payload
+type EncryptRequest struct {
+	UniqueIdentifier string       `kmip:"UNIQUE_IDENTIFIER"`
+	CryptoParams     CryptoParams `kmip:"CRYPTOGRAPHIC_PARAMETERS"`
+	Data             []byte       `kmip:"DATA"`
+	IVCounterNonce   []byte       `kmip:"IV_COUNTER_NONCE"`
+	CorrelationValue []byte       `kmip:"CORRELATION_VALUE"`
+	InitIndicator    bool         `kmip:"INIT_INDICATOR"`
+	FinalIndicator   bool         `kmip:"FINAL_INDICATOR"`
+	AdditionalData   []byte       `kmip:"AUTHENTICATED_ENCRYPTION_ADDITIONAL_DATA"`
+}
+
+// EncryptResponse is a Encrypt Response Payload
+type EncryptResponse struct {
+	UniqueIdentifier string `kmip:"UNIQUE_IDENTIFIER,required"`
+	Data             []byte `kmip:"DATA"`
+	IVCounterNonce   []byte `kmip:"IV_COUNTER_NONCE"`
+	CorrelationValue []byte `kmip:"CORRELATION_VALUE"`
+	AuthTag          []byte `kmip:"AUTHENTICATED_ENCRYPTION_TAG"`
+}
+
 // DecryptRequest is a Decrypt Request Payload
 type DecryptRequest struct {
 	UniqueIdentifier string       `kmip:"UNIQUE_IDENTIFIER"`
 	CryptoParams     CryptoParams `kmip:"CRYPTOGRAPHIC_PARAMETERS"`
 	Data             []byte       `kmip:"DATA"`
-	IVCounterNone    []byte       `kmip:"IV_COUNTER_NONCE"`
+	IVCounterNonce   []byte       `kmip:"IV_COUNTER_NONCE"`
 	CorrelationValue []byte       `kmip:"CORRELATION_VALUE"`
 	InitIndicator    bool         `kmip:"INIT_INDICATOR"`
 	FinalIndicator   bool         `kmip:"FINAL_INDICATOR"`
+	AdditionalData   []byte       `kmip:"AUTHENTICATED_ENCRYPTION_ADDITIONAL_DATA"`
+	AuthTag          []byte       `kmip:"AUTHENTICATED_ENCRYPTION_TAG"`
 }
 
 // DecryptResponse is a Decrypt Response Payload

diff --git a/response.go b/response.go
@@ -64,6 +64,8 @@ func (bi *ResponseBatchItem) BuildFieldValue(name string) (v interface{}, err er
 		v = &DestroyResponse{}
 	case OPERATION_DISCOVER_VERSIONS:
 		v = &DiscoverVersionsResponse{}
+	case OPERATION_ENCRYPT:
+		v = &EncryptResponse{}
 	case OPERATION_DECRYPT:
 		v = &DecryptResponse{}
 	case OPERATION_SIGN: