aboutsummaryrefslogtreecommitdiffstats
path: root/cmso-service
diff options
context:
space:
mode:
authormalarvizhi <malarvizhi.44@wipro.com>2021-03-18 00:40:11 -0700
committerkrishna moorthy <krishna.moorthy6@wipro.com>2021-03-18 08:25:55 +0000
commitee02cbcfb07c7322b93399c80e50acd2b975ccbd (patch)
tree0f064bc04583c6a2f582897da4ce709e907c8b6f /cmso-service
parentfa9a888eb79c4632b3a1afd97641b0554d086828 (diff)
Fix weak cryptography issues
Issue-ID: OPTFRA-927 Signed-off-by: Malarvizhi Paramasivam <malarvizhi.44@wipro.com> Change-Id: I9e48f7313a7f76bd431e17cebfc3c52bc7f91bda
Diffstat (limited to 'cmso-service')
-rw-r--r--cmso-service/src/main/java/org/onap/optf/cmso/common/PropertiesManagement.java8
-rw-r--r--cmso-service/src/main/resources/META-INF/resources/swagger/swagger.json30
2 files changed, 13 insertions, 25 deletions
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/common/PropertiesManagement.java b/cmso-service/src/main/java/org/onap/optf/cmso/common/PropertiesManagement.java
index 3f7a808..1b6488f 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/common/PropertiesManagement.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/common/PropertiesManagement.java
@@ -99,8 +99,8 @@ public class PropertiesManagement {
}
private static final String encrypt(String key, String value) {
- try {
- byte[] bytesIV = new byte[16];
+ try{
+ byte[] bytesIV = new byte[12];
random.nextBytes(bytesIV);
IvParameterSpec iv = new IvParameterSpec(bytesIV);
SecretKeySpec skeySpec = new SecretKeySpec(key.getBytes("UTF-8"), "AES");
@@ -118,8 +118,8 @@ public class PropertiesManagement {
private static final String decrypt(String key, String encrypted) {
try {
- byte[] bytesIV = new byte[16];
- random.nextBytes(bytesIV);
+ byte[] bytesIV = new byte[12];
+ random.nextBytes(bytesIV);
IvParameterSpec iv = new IvParameterSpec(bytesIV);
SecretKeySpec skeySpec = new SecretKeySpec(key.getBytes("UTF-8"), "AES");
Cipher cipher = Cipher.getInstance(transformation);
diff --git a/cmso-service/src/main/resources/META-INF/resources/swagger/swagger.json b/cmso-service/src/main/resources/META-INF/resources/swagger/swagger.json
index eb563ad..16b69b8 100644
--- a/cmso-service/src/main/resources/META-INF/resources/swagger/swagger.json
+++ b/cmso-service/src/main/resources/META-INF/resources/swagger/swagger.json
@@ -1,7 +1,7 @@
{
"swagger" : "2.0",
"info" : {
- "version" : "2.3.1-SNAPSHOT",
+ "version" : "2.3.2-SNAPSHOT",
"title" : "cmso-service"
},
"basePath" : "/cmso",
@@ -774,25 +774,15 @@
"format" : "int32",
"description" : "Maximum number of VNF changes to schedule concurrently"
},
- "changeWindows" : {
- "type" : "array",
- "description" : "Lists of desired change windows to schedule the elements.",
- "items" : {
- "$ref" : "#/definitions/Change Window"
- }
- },
- "policies" : {
- "type" : "array",
- "description" : "List of the policies to control optimization.",
- "items" : {
- "$ref" : "#/definitions/Supported Policy Information"
- }
+ "policyId" : {
+ "type" : "string",
+ "description" : "Name of schedule optimization policy used by the change management cmso optimizer to determine available time slot"
},
- "elements" : {
+ "vnfDetails" : {
"type" : "array",
"description" : "Lists of the VNFs to be changed and the desired change windows",
"items" : {
- "$ref" : "#/definitions/Optimizer Element"
+ "$ref" : "#/definitions/VNF Details"
}
}
},
@@ -803,16 +793,14 @@
"properties" : {
"startTime" : {
"type" : "string",
- "format" : "date-time",
- "description" : "Earliest time for which changes may begin."
+ "description" : "Earliest time that a set of changes may begin."
},
"endTime" : {
"type" : "string",
- "format" : "date-time",
- "description" : "Latest time by which all changes must be completed."
+ "description" : "Latest time by which all changes must be completed"
}
},
- "description" : "Time window for which tickets are to returned"
+ "description" : "Time window within which the scheduler optimizer can schedule the changes for the group of NVFs"
},
"CmDetailsMessage" : {
"type" : "object",