Skip to content
This repository has been archived by the owner on Jan 8, 2025. It is now read-only.

Replace underscores in ciphersuite names with hyphens #18

Merged
merged 1 commit into from
Feb 22, 2018
Merged

Replace underscores in ciphersuite names with hyphens #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions ssl/tls1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,38 +852,38 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
# define TLS1_TXT_OQSKEX_SIDH_MSR_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX-SIDH-MSR-ECDHE-ECDSA-AES128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_SIDH_MSR_ECDHE_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX-SIDH-MSR-ECDHE-RSA-AES256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_SIDH_MSR_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX-SIDH-MSR-ECDHE-ECDSA-AES256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX_SIDH_IQC_REF_RSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX_SIDH_IQC_REF_ECDSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX_SIDH_IQC_REF_RSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX_SIDH_IQC_REF_ECDSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_ECDHE_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX_SIDH_IQC_REF_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX_SIDH_IQC_REF_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_ECDHE_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX_SIDH_IQC_REF_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX_SIDH_IQC_REF_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX_CODE_MCBITS_RSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX_CODE_MCBITS_ECDSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX_CODE_MCBITS_RSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX_CODE_MCBITS_ECDSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX_CODE_MCBITS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX_CODE_MCBITS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX_CODE_MCBITS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX_CODE_MCBITS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_NTRU_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX_NTRU_RSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_NTRU_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX_NTRU_ECDSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_NTRU_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX_NTRU_RSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_NTRU_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX_NTRU_ECDSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_NTRU_ECDHE_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX_NTRU_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_NTRU_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX_NTRU_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_NTRU_ECDHE_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX_NTRU_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_NTRU_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX_NTRU_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX_MLWE_KYBER_RSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX_MLWE_KYBER_ECDSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX_MLWE_KYBER_RSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX_MLWE_KYBER_ECDSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_ECDHE_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX_MLWE_KYBER_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX_MLWE_KYBER_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_ECDHE_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX_MLWE_KYBER_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX_MLWE_KYBER_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX-SIDH-IQC-REF-RSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX-SIDH-IQC-REF-ECDSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX-SIDH-IQC-REF-RSA-WITH-AES-256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX-SIDH-IQC-REF-ECDSA-WITH-AES-256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_ECDHE_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX-SIDH-IQC-REF-ECDHE-RSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX-SIDH-IQC-REF-ECDHE-ECDSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_ECDHE_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX-SIDH-IQC-REF-ECDHE-RSA-WITH-AES-256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_SIDH_IQC_REF_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX-SIDH-IQC-REF-ECDHE-ECDSA-WITH-AES-256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX-CODE-MCBITS-RSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX-CODE-MCBITS-ECDSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX-CODE-MCBITS-RSA-WITH-AES-256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX-CODE-MCBITS-ECDSA-WITH-AES-256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX-CODE-MCBITS-ECDHE-RSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX-CODE-MCBITS-ECDHE-ECDSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX-CODE-MCBITS-ECDHE-RSA-WITH-AES-256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_CODE_MCBITS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX-CODE-MCBITS-ECDHE-ECDSA-WITH-AES-256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_NTRU_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX-NTRU-RSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_NTRU_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX-NTRU-ECDSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_NTRU_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX-NTRU-RSA-WITH-AES-256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_NTRU_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX-NTRU-ECDSA-WITH-AES-256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_NTRU_ECDHE_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX-NTRU-ECDHE-RSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_NTRU_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX-NTRU-ECDHE-ECDSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_NTRU_ECDHE_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX-NTRU-ECDHE-RSA-WITH-AES-256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_NTRU_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX-NTRU-ECDHE-ECDSA-WITH-AES-256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX-MLWE-KYBER-RSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX-MLWE-KYBER-ECDSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX-MLWE-KYBER-RSA-WITH-AES-256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX-MLWE-KYBER-ECDSA-WITH-AES-256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_ECDHE_RSA_WITH_AES_128_GCM_SHA256 "OQSKEX-MLWE-KYBER-ECDHE-RSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 "OQSKEX-MLWE-KYBER-ECDHE-ECDSA-WITH-AES-128-GCM-SHA256"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_ECDHE_RSA_WITH_AES_256_GCM_SHA384 "OQSKEX-MLWE-KYBER-ECDHE-RSA-WITH-AES-256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_MLWE_KYBER_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 "OQSKEX-MLWE-KYBER-ECDHE-ECDSA-WITH-AES-256-GCM-SHA384"
/* OQS sig */
# define TLS1_TXT_OQSKEX_LWE_FRODO_RECOMMENDED_PICNIC_WITH_AES_256_GCM_SHA384 "OQSKEX-LWE-FRODO-RECOMMENDED-PICNIC-AES256-GCM-SHA384"
# define TLS1_TXT_OQSKEX_RLWE_MSRLN16_PICNIC_WITH_AES_256_GCM_SHA384 "OQSKEX-RLWE-MSRLN16-PICNIC-AES256-GCM-SHA384"
Expand Down