X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=android%2Fandroid_api%2Fbase%2Fsrc%2Fmain%2Fjava%2Forg%2Fiotivity%2Fca%2FOicCipher.java;h=030217fc4dc8fad835e69937ad73132431d8f627;hb=refs%2Ftags%2Faccepted%2Ftizen%2Funified%2F20171010.063815;hp=60f9f164ad20c846b972e1d91b6b68d422b20cc7;hpb=edcfc3d2329da7b914771c0dcff5f42c9b74fd93;p=platform%2Fupstream%2Fiotivity.git

diff --git a/android/android_api/base/src/main/java/org/iotivity/ca/OicCipher.java b/android/android_api/base/src/main/java/org/iotivity/ca/OicCipher.java
index 60f9f16..030217f 100644
--- a/android/android_api/base/src/main/java/org/iotivity/ca/OicCipher.java
+++ b/android/android_api/base/src/main/java/org/iotivity/ca/OicCipher.java
@@ -1,38 +1,45 @@
-/* ****************************************************************
- *
- * Copyright 2016 Samsung Electronics All Rights Reserved.
- *
- *
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ******************************************************************/
-
-package org.iotivity.ca;
-
-public enum OicCipher {
-    TLS_ECDH_anon_WITH_AES_128_CBC_SHA(0xC018),
-    TLS_PSK_WITH_AES_128_CCM_8(0xC0A8),
-    TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8(0xC0AE),
-    TLS_RSA_WITH_AES_256_CBC_SHA(0x35);
-
-    private int cipher;
-
-    private OicCipher(int cipher) {
-        this.cipher = cipher;
-    }
-
-    public int getValue(){
-        return cipher;
-    }
-}
+/* ****************************************************************
+ *
+ * Copyright 2016 Samsung Electronics All Rights Reserved.
+ *
+ *
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ******************************************************************/
+
+package org.iotivity.ca;
+
+public enum OicCipher {
+    TLS_RSA_WITH_AES_256_CBC_SHA256(0x3D),
+    TLS_RSA_WITH_AES_128_GCM_SHA256(0x009C),
+    TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256(0xC02B),
+    TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8(0xC0AE),
+    TLS_ECDHE_ECDSA_WITH_AES_128_CCM(0xC0AC),
+    TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256(0xC023),
+    TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384(0xC024),
+    TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384(0xC02C),
+    TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256(0xC037),
+    TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256(0xC027),
+    TLS_ECDH_anon_WITH_AES_128_CBC_SHA(0xC018);
+
+    private int cipher;
+
+    private OicCipher(int cipher) {
+        this.cipher = cipher;
+    }
+
+    public int getValue(){
+        return cipher;
+    }
+}