New upstream version 18.11-rc1

[deb_dpdk.git] / drivers / crypto / dpaa2_sec / hw / rta / protocol_cmd.h

diff --git a/drivers/crypto/dpaa2_sec/hw/rta/protocol_cmd.h b/drivers/crypto/dpaa2_sec/hw/rta/protocol_cmd.h
index d9a5b0e..cf8dfb9 100644 (file)
--- a/drivers/crypto/dpaa2_sec/hw/rta/protocol_cmd.h
+++ b/drivers/crypto/dpaa2_sec/hw/rta/protocol_cmd.h
@@ -14,178 +14,176 @@ static inline int
 __rta_ssl_proto(uint16_t protoinfo)
 {
        switch (protoinfo) {
-       case OP_PCL_SSL30_RC4_40_MD5_2:
-       case OP_PCL_SSL30_RC4_128_MD5_2:
-       case OP_PCL_SSL30_RC4_128_SHA_5:
-       case OP_PCL_SSL30_RC4_40_MD5_3:
-       case OP_PCL_SSL30_RC4_128_MD5_3:
-       case OP_PCL_SSL30_RC4_128_SHA:
-       case OP_PCL_SSL30_RC4_128_MD5:
-       case OP_PCL_SSL30_RC4_40_SHA:
-       case OP_PCL_SSL30_RC4_40_MD5:
-       case OP_PCL_SSL30_RC4_128_SHA_2:
-       case OP_PCL_SSL30_RC4_128_SHA_3:
-       case OP_PCL_SSL30_RC4_128_SHA_4:
-       case OP_PCL_SSL30_RC4_128_SHA_6:
-       case OP_PCL_SSL30_RC4_128_SHA_7:
-       case OP_PCL_SSL30_RC4_128_SHA_8:
-       case OP_PCL_SSL30_RC4_128_SHA_9:
-       case OP_PCL_SSL30_RC4_128_SHA_10:
-       case OP_PCL_TLS_ECDHE_PSK_RC4_128_SHA:
+       case OP_PCL_TLS_RSA_EXPORT_WITH_RC4_40_MD5:
+       case OP_PCL_TLS_RSA_WITH_RC4_128_MD5:
+       case OP_PCL_TLS_RSA_WITH_RC4_128_SHA:
+       case OP_PCL_TLS_DH_anon_EXPORT_WITH_RC4_40_MD5:
+       case OP_PCL_TLS_DH_anon_WITH_RC4_128_MD5:
+       case OP_PCL_TLS_KRB5_WITH_RC4_128_SHA:
+       case OP_PCL_TLS_KRB5_WITH_RC4_128_MD5:
+       case OP_PCL_TLS_KRB5_EXPORT_WITH_RC4_40_SHA:
+       case OP_PCL_TLS_KRB5_EXPORT_WITH_RC4_40_MD5:
+       case OP_PCL_TLS_PSK_WITH_RC4_128_SHA:
+       case OP_PCL_TLS_DHE_PSK_WITH_RC4_128_SHA:
+       case OP_PCL_TLS_RSA_PSK_WITH_RC4_128_SHA:
+       case OP_PCL_TLS_ECDH_ECDSA_WITH_RC4_128_SHA:
+       case OP_PCL_TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:
+       case OP_PCL_TLS_ECDH_RSA_WITH_RC4_128_SHA:
+       case OP_PCL_TLS_ECDHE_RSA_WITH_RC4_128_SHA:
+       case OP_PCL_TLS_ECDH_anon_WITH_RC4_128_SHA:
+       case OP_PCL_TLS_ECDHE_PSK_WITH_RC4_128_SHA:
                if (rta_sec_era == RTA_SEC_ERA_7)
                        return -EINVAL;
                /* fall through if not Era 7 */
-       case OP_PCL_SSL30_DES40_CBC_SHA:
-       case OP_PCL_SSL30_DES_CBC_SHA_2:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_5:
-       case OP_PCL_SSL30_DES40_CBC_SHA_2:
-       case OP_PCL_SSL30_DES_CBC_SHA_3:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_6:
-       case OP_PCL_SSL30_DES40_CBC_SHA_3:
-       case OP_PCL_SSL30_DES_CBC_SHA_4:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_7:
-       case OP_PCL_SSL30_DES40_CBC_SHA_4:
-       case OP_PCL_SSL30_DES_CBC_SHA_5:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_8:
-       case OP_PCL_SSL30_DES40_CBC_SHA_5:
-       case OP_PCL_SSL30_DES_CBC_SHA_6:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_9:
-       case OP_PCL_SSL30_DES40_CBC_SHA_6:
-       case OP_PCL_SSL30_DES_CBC_SHA_7:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_10:
-       case OP_PCL_SSL30_DES_CBC_SHA:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA:
-       case OP_PCL_SSL30_DES_CBC_MD5:
-       case OP_PCL_SSL30_3DES_EDE_CBC_MD5:
-       case OP_PCL_SSL30_DES40_CBC_SHA_7:
-       case OP_PCL_SSL30_DES40_CBC_MD5:
-       case OP_PCL_SSL30_AES_128_CBC_SHA:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_2:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_3:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_4:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_5:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_6:
-       case OP_PCL_SSL30_AES_256_CBC_SHA:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_2:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_3:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_4:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_5:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_6:
-       case OP_PCL_TLS12_AES_128_CBC_SHA256_2:
-       case OP_PCL_TLS12_AES_128_CBC_SHA256_3:
-       case OP_PCL_TLS12_AES_128_CBC_SHA256_4:
-       case OP_PCL_TLS12_AES_128_CBC_SHA256_5:
-       case OP_PCL_TLS12_AES_256_CBC_SHA256_2:
-       case OP_PCL_TLS12_AES_256_CBC_SHA256_3:
-       case OP_PCL_TLS12_AES_256_CBC_SHA256_4:
-       case OP_PCL_TLS12_AES_256_CBC_SHA256_5:
-       case OP_PCL_TLS12_AES_128_CBC_SHA256_6:
-       case OP_PCL_TLS12_AES_256_CBC_SHA256_6:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_2:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_7:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_7:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_3:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_8:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_8:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_4:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_9:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_9:
-       case OP_PCL_SSL30_AES_128_GCM_SHA256_1:
-       case OP_PCL_SSL30_AES_256_GCM_SHA384_1:
-       case OP_PCL_SSL30_AES_128_GCM_SHA256_2:
-       case OP_PCL_SSL30_AES_256_GCM_SHA384_2:
-       case OP_PCL_SSL30_AES_128_GCM_SHA256_3:
-       case OP_PCL_SSL30_AES_256_GCM_SHA384_3:
-       case OP_PCL_SSL30_AES_128_GCM_SHA256_4:
-       case OP_PCL_SSL30_AES_256_GCM_SHA384_4:
-       case OP_PCL_SSL30_AES_128_GCM_SHA256_5:
-       case OP_PCL_SSL30_AES_256_GCM_SHA384_5:
-       case OP_PCL_SSL30_AES_128_GCM_SHA256_6:
-       case OP_PCL_TLS_DH_ANON_AES_256_GCM_SHA384:
-       case OP_PCL_TLS_PSK_AES_128_GCM_SHA256:
-       case OP_PCL_TLS_PSK_AES_256_GCM_SHA384:
-       case OP_PCL_TLS_DHE_PSK_AES_128_GCM_SHA256:
-       case OP_PCL_TLS_DHE_PSK_AES_256_GCM_SHA384:
-       case OP_PCL_TLS_RSA_PSK_AES_128_GCM_SHA256:
-       case OP_PCL_TLS_RSA_PSK_AES_256_GCM_SHA384:
-       case OP_PCL_TLS_PSK_AES_128_CBC_SHA256:
-       case OP_PCL_TLS_PSK_AES_256_CBC_SHA384:
-       case OP_PCL_TLS_DHE_PSK_AES_128_CBC_SHA256:
-       case OP_PCL_TLS_DHE_PSK_AES_256_CBC_SHA384:
-       case OP_PCL_TLS_RSA_PSK_AES_128_CBC_SHA256:
-       case OP_PCL_TLS_RSA_PSK_AES_256_CBC_SHA384:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_11:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_10:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_10:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_12:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_11:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_11:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_12:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_13:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_12:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_14:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_13:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_13:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_15:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_14:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_14:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_16:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_17:
-       case OP_PCL_SSL30_3DES_EDE_CBC_SHA_18:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_15:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_16:
-       case OP_PCL_SSL30_AES_128_CBC_SHA_17:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_15:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_16:
-       case OP_PCL_SSL30_AES_256_CBC_SHA_17:
-       case OP_PCL_TLS_ECDHE_ECDSA_AES_128_CBC_SHA256:
-       case OP_PCL_TLS_ECDHE_ECDSA_AES_256_CBC_SHA384:
-       case OP_PCL_TLS_ECDH_ECDSA_AES_128_CBC_SHA256:
-       case OP_PCL_TLS_ECDH_ECDSA_AES_256_CBC_SHA384:
-       case OP_PCL_TLS_ECDHE_RSA_AES_128_CBC_SHA256:
-       case OP_PCL_TLS_ECDHE_RSA_AES_256_CBC_SHA384:
-       case OP_PCL_TLS_ECDH_RSA_AES_128_CBC_SHA256:
-       case OP_PCL_TLS_ECDH_RSA_AES_256_CBC_SHA384:
-       case OP_PCL_TLS_ECDHE_ECDSA_AES_128_GCM_SHA256:
-       case OP_PCL_TLS_ECDHE_ECDSA_AES_256_GCM_SHA384:
-       case OP_PCL_TLS_ECDH_ECDSA_AES_128_GCM_SHA256:
-       case OP_PCL_TLS_ECDH_ECDSA_AES_256_GCM_SHA384:
-       case OP_PCL_TLS_ECDHE_RSA_AES_128_GCM_SHA256:
-       case OP_PCL_TLS_ECDHE_RSA_AES_256_GCM_SHA384:
-       case OP_PCL_TLS_ECDH_RSA_AES_128_GCM_SHA256:
-       case OP_PCL_TLS_ECDH_RSA_AES_256_GCM_SHA384:
-       case OP_PCL_TLS_ECDHE_PSK_3DES_EDE_CBC_SHA:
-       case OP_PCL_TLS_ECDHE_PSK_AES_128_CBC_SHA:
-       case OP_PCL_TLS_ECDHE_PSK_AES_256_CBC_SHA:
-       case OP_PCL_TLS_ECDHE_PSK_AES_128_CBC_SHA256:
-       case OP_PCL_TLS_ECDHE_PSK_AES_256_CBC_SHA384:
-       case OP_PCL_TLS12_3DES_EDE_CBC_MD5:
-       case OP_PCL_TLS12_3DES_EDE_CBC_SHA160:
-       case OP_PCL_TLS12_3DES_EDE_CBC_SHA224:
-       case OP_PCL_TLS12_3DES_EDE_CBC_SHA256:
-       case OP_PCL_TLS12_3DES_EDE_CBC_SHA384:
-       case OP_PCL_TLS12_3DES_EDE_CBC_SHA512:
-       case OP_PCL_TLS12_AES_128_CBC_SHA160:
-       case OP_PCL_TLS12_AES_128_CBC_SHA224:
-       case OP_PCL_TLS12_AES_128_CBC_SHA256:
-       case OP_PCL_TLS12_AES_128_CBC_SHA384:
-       case OP_PCL_TLS12_AES_128_CBC_SHA512:
-       case OP_PCL_TLS12_AES_192_CBC_SHA160:
-       case OP_PCL_TLS12_AES_192_CBC_SHA224:
-       case OP_PCL_TLS12_AES_192_CBC_SHA256:
-       case OP_PCL_TLS12_AES_192_CBC_SHA512:
-       case OP_PCL_TLS12_AES_256_CBC_SHA160:
-       case OP_PCL_TLS12_AES_256_CBC_SHA224:
-       case OP_PCL_TLS12_AES_256_CBC_SHA256:
-       case OP_PCL_TLS12_AES_256_CBC_SHA384:
-       case OP_PCL_TLS12_AES_256_CBC_SHA512:
-       case OP_PCL_TLS_PVT_AES_192_CBC_SHA160:
-       case OP_PCL_TLS_PVT_AES_192_CBC_SHA384:
-       case OP_PCL_TLS_PVT_AES_192_CBC_SHA224:
-       case OP_PCL_TLS_PVT_AES_192_CBC_SHA512:
-       case OP_PCL_TLS_PVT_AES_192_CBC_SHA256:
-       case OP_PCL_TLS_PVT_MASTER_SECRET_PRF_FE:
-       case OP_PCL_TLS_PVT_MASTER_SECRET_PRF_FF:
+       case OP_PCL_TLS_RSA_EXPORT_WITH_DES40_CBC_SHA:
+       case OP_PCL_TLS_RSA_WITH_DES_CBC_SHA:
+       case OP_PCL_TLS_RSA_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA:
+       case OP_PCL_TLS_DH_DSS_WITH_DES_CBC_SHA:
+       case OP_PCL_TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA:
+       case OP_PCL_TLS_DH_RSA_WITH_DES_CBC_SHA:
+       case OP_PCL_TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA:
+       case OP_PCL_TLS_DHE_DSS_WITH_DES_CBC_SHA:
+       case OP_PCL_TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA:
+       case OP_PCL_TLS_DHE_RSA_WITH_DES_CBC_SHA:
+       case OP_PCL_TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA:
+       case OP_PCL_TLS_DH_anon_WITH_DES_CBC_SHA:
+       case OP_PCL_TLS_DH_anon_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_KRB5_WITH_DES_CBC_SHA:
+       case OP_PCL_TLS_KRB5_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_KRB5_WITH_DES_CBC_MD5:
+       case OP_PCL_TLS_KRB5_WITH_3DES_EDE_CBC_MD5:
+       case OP_PCL_TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA:
+       case OP_PCL_TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5:
+       case OP_PCL_TLS_RSA_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_DH_DSS_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_DH_RSA_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_DHE_DSS_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_DHE_RSA_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_DH_anon_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_RSA_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_DH_DSS_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_DH_RSA_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_DHE_DSS_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_DHE_RSA_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_DH_anon_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_DH_DSS_WITH_AES_128_CBC_SHA256:
+       case OP_PCL_TLS_DH_RSA_WITH_AES_128_CBC_SHA256:
+       case OP_PCL_TLS_DHE_DSS_WITH_AES_128_CBC_SHA256:
+       case OP_PCL_TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:
+       case OP_PCL_TLS_DH_DSS_WITH_AES_256_CBC_SHA256:
+       case OP_PCL_TLS_DH_RSA_WITH_AES_256_CBC_SHA256:
+       case OP_PCL_TLS_DHE_DSS_WITH_AES_256_CBC_SHA256:
+       case OP_PCL_TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:
+       case OP_PCL_TLS_DH_anon_WITH_AES_128_CBC_SHA256:
+       case OP_PCL_TLS_DH_anon_WITH_AES_256_CBC_SHA256:
+       case OP_PCL_TLS_PSK_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_PSK_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_PSK_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_DHE_PSK_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_DHE_PSK_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_RSA_PSK_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_RSA_PSK_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_RSA_WITH_AES_128_GCM_SHA256:
+       case OP_PCL_TLS_RSA_WITH_AES_256_GCM_SHA384:
+       case OP_PCL_TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:
+       case OP_PCL_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:
+       case OP_PCL_TLS_DH_RSA_WITH_AES_128_GCM_SHA256:
+       case OP_PCL_TLS_DH_RSA_WITH_AES_256_GCM_SHA384:
+       case OP_PCL_TLS_DHE_DSS_WITH_AES_128_GCM_SHA256:
+       case OP_PCL_TLS_DHE_DSS_WITH_AES_256_GCM_SHA384:
+       case OP_PCL_TLS_DH_DSS_WITH_AES_128_GCM_SHA256:
+       case OP_PCL_TLS_DH_DSS_WITH_AES_256_GCM_SHA384:
+       case OP_PCL_TLS_DH_anon_WITH_AES_128_GCM_SHA256:
+       case OP_PCL_TLS_DH_anon_WITH_AES_256_GCM_SHA384:
+       case OP_PCL_TLS_PSK_WITH_AES_128_GCM_SHA256:
+       case OP_PCL_TLS_PSK_WITH_AES_256_GCM_SHA384:
+       case OP_PCL_TLS_DHE_PSK_WITH_AES_128_GCM_SHA256:
+       case OP_PCL_TLS_DHE_PSK_WITH_AES_256_GCM_SHA384:
+       case OP_PCL_TLS_RSA_PSK_WITH_AES_128_GCM_SHA256:
+       case OP_PCL_TLS_RSA_PSK_WITH_AES_256_GCM_SHA384:
+       case OP_PCL_TLS_PSK_WITH_AES_128_CBC_SHA256:
+       case OP_PCL_TLS_PSK_WITH_AES_256_CBC_SHA384:
+       case OP_PCL_TLS_DHE_PSK_WITH_AES_128_CBC_SHA256:
+       case OP_PCL_TLS_DHE_PSK_WITH_AES_256_CBC_SHA384:
+       case OP_PCL_TLS_RSA_PSK_WITH_AES_128_CBC_SHA256:
+       case OP_PCL_TLS_RSA_PSK_WITH_AES_256_CBC_SHA384:
+       case OP_PCL_TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_ECDH_RSA_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_ECDH_RSA_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_ECDH_anon_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_ECDH_anon_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_SRP_SHA_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_SRP_SHA_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:
+       case OP_PCL_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:
+       case OP_PCL_TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:
+       case OP_PCL_TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:
+       case OP_PCL_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
+       case OP_PCL_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:
+       case OP_PCL_TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256:
+       case OP_PCL_TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384:
+       case OP_PCL_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:
+       case OP_PCL_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:
+       case OP_PCL_TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:
+       case OP_PCL_TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:
+       case OP_PCL_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:
+       case OP_PCL_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
+       case OP_PCL_TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256:
+       case OP_PCL_TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384:
+       case OP_PCL_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA:
+       case OP_PCL_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA:
+       case OP_PCL_TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA:
+       case OP_PCL_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256:
+       case OP_PCL_TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384:
+       case OP_PCL_TLS_RSA_WITH_AES_128_CBC_SHA256:
+       case OP_PCL_TLS_RSA_WITH_AES_256_CBC_SHA256:
+       case OP_PCL_PVT_TLS_3DES_EDE_CBC_MD5:
+       case OP_PCL_PVT_TLS_3DES_EDE_CBC_SHA160:
+       case OP_PCL_PVT_TLS_3DES_EDE_CBC_SHA224:
+       case OP_PCL_PVT_TLS_3DES_EDE_CBC_SHA256:
+       case OP_PCL_PVT_TLS_3DES_EDE_CBC_SHA384:
+       case OP_PCL_PVT_TLS_3DES_EDE_CBC_SHA512:
+       case OP_PCL_PVT_TLS_AES_128_CBC_SHA160:
+       case OP_PCL_PVT_TLS_AES_128_CBC_SHA224:
+       case OP_PCL_PVT_TLS_AES_128_CBC_SHA256:
+       case OP_PCL_PVT_TLS_AES_128_CBC_SHA384:
+       case OP_PCL_PVT_TLS_AES_128_CBC_SHA512:
+       case OP_PCL_PVT_TLS_AES_192_CBC_SHA160:
+       case OP_PCL_PVT_TLS_AES_192_CBC_SHA224:
+       case OP_PCL_PVT_TLS_AES_192_CBC_SHA256:
+       case OP_PCL_PVT_TLS_AES_192_CBC_SHA512:
+       case OP_PCL_PVT_TLS_AES_256_CBC_SHA160:
+       case OP_PCL_PVT_TLS_AES_256_CBC_SHA224:
+       case OP_PCL_PVT_TLS_AES_256_CBC_SHA384:
+       case OP_PCL_PVT_TLS_AES_256_CBC_SHA512:
+       case OP_PCL_PVT_TLS_AES_256_CBC_SHA256:
+       case OP_PCL_PVT_TLS_AES_192_CBC_SHA384:
+       case OP_PCL_PVT_TLS_MASTER_SECRET_PRF_FE:
+       case OP_PCL_PVT_TLS_MASTER_SECRET_PRF_FF:
                return 0;
        }
 
@@ -322,6 +320,12 @@ static const uint32_t proto_blob_flags[] = {
                OP_PCL_BLOB_EKT | OP_PCL_BLOB_REG_MASK,
        OP_PCL_BLOB_FORMAT_MASK | OP_PCL_BLOB_BLACK | OP_PCL_BLOB_TKEK |
                OP_PCL_BLOB_EKT | OP_PCL_BLOB_REG_MASK | OP_PCL_BLOB_SEC_MEM,
+       OP_PCL_BLOB_FORMAT_MASK | OP_PCL_BLOB_BLACK | OP_PCL_BLOB_TKEK |
+               OP_PCL_BLOB_EKT | OP_PCL_BLOB_REG_MASK | OP_PCL_BLOB_SEC_MEM,
+       OP_PCL_BLOB_FORMAT_MASK | OP_PCL_BLOB_BLACK | OP_PCL_BLOB_TKEK |
+               OP_PCL_BLOB_EKT | OP_PCL_BLOB_REG_MASK | OP_PCL_BLOB_SEC_MEM,
+       OP_PCL_BLOB_FORMAT_MASK | OP_PCL_BLOB_BLACK | OP_PCL_BLOB_TKEK |
+               OP_PCL_BLOB_EKT | OP_PCL_BLOB_REG_MASK | OP_PCL_BLOB_SEC_MEM,
        OP_PCL_BLOB_FORMAT_MASK | OP_PCL_BLOB_BLACK | OP_PCL_BLOB_TKEK |
                OP_PCL_BLOB_EKT | OP_PCL_BLOB_REG_MASK | OP_PCL_BLOB_SEC_MEM
 };
@@ -556,7 +560,7 @@ static const struct proto_map proto_table[] = {
        {OP_TYPE_UNI_PROTOCOL,   OP_PCLID_TLS10_PRF,     __rta_ssl_proto},
        {OP_TYPE_UNI_PROTOCOL,   OP_PCLID_TLS11_PRF,     __rta_ssl_proto},
        {OP_TYPE_UNI_PROTOCOL,   OP_PCLID_TLS12_PRF,     __rta_ssl_proto},
-       {OP_TYPE_UNI_PROTOCOL,   OP_PCLID_DTLS10_PRF,    __rta_ssl_proto},
+       {OP_TYPE_UNI_PROTOCOL,   OP_PCLID_DTLS_PRF,      __rta_ssl_proto},
        {OP_TYPE_UNI_PROTOCOL,   OP_PCLID_IKEV1_PRF,     __rta_ike_proto},
        {OP_TYPE_UNI_PROTOCOL,   OP_PCLID_IKEV2_PRF,     __rta_ike_proto},
        {OP_TYPE_UNI_PROTOCOL,   OP_PCLID_PUBLICKEYPAIR, __rta_dlc_proto},
@@ -568,7 +572,7 @@ static const struct proto_map proto_table[] = {
        {OP_TYPE_DECAP_PROTOCOL, OP_PCLID_TLS10,         __rta_ssl_proto},
        {OP_TYPE_DECAP_PROTOCOL, OP_PCLID_TLS11,         __rta_ssl_proto},
        {OP_TYPE_DECAP_PROTOCOL, OP_PCLID_TLS12,         __rta_ssl_proto},
-       {OP_TYPE_DECAP_PROTOCOL, OP_PCLID_DTLS10,        __rta_ssl_proto},
+       {OP_TYPE_DECAP_PROTOCOL, OP_PCLID_DTLS,          __rta_ssl_proto},
        {OP_TYPE_DECAP_PROTOCOL, OP_PCLID_MACSEC,        __rta_macsec_proto},
        {OP_TYPE_DECAP_PROTOCOL, OP_PCLID_WIFI,          __rta_wifi_proto},
        {OP_TYPE_DECAP_PROTOCOL, OP_PCLID_WIMAX,         __rta_wimax_proto},