tttls1.3 0.3.4 → 0.3.5

data/interop/server_spec.rb

@@ -18,158 +18,186 @@ RSpec.describe Server do
   testcases = [
     [
       true,
-      '-groups P-256:P-384:P-521 -ciphersuites TLS_AES_256_GCM_SHA384',
+      '-groups X25519:P-256:P-384:P-521 -ciphersuites TLS_AES_256_GCM_SHA384',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      cipher_suites: [CipherSuite::TLS_AES_256_GCM_SHA384]
+      { cipher_suites: [CipherSuite::TLS_AES_256_GCM_SHA384] }
     ],
     [
       true,
-      '-groups P-256:P-384:P-521 -ciphersuites TLS_CHACHA20_POLY1305_SHA256',
+      '-groups X25519:P-256:P-384:P-521 -ciphersuites TLS_CHACHA20_POLY1305_SHA256',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      cipher_suites: [CipherSuite::TLS_CHACHA20_POLY1305_SHA256]
+      { cipher_suites: [CipherSuite::TLS_CHACHA20_POLY1305_SHA256] }
     ],
     [
       true,
-      '-groups P-256:P-384:P-521 -ciphersuites TLS_AES_128_GCM_SHA256',
+      '-groups X25519:P-256:P-384:P-521 -ciphersuites TLS_AES_128_GCM_SHA256',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      cipher_suites: [CipherSuite::TLS_AES_128_GCM_SHA256]
+      { cipher_suites: [CipherSuite::TLS_AES_128_GCM_SHA256] }
+    ],
+    [
+      true,
+      '-groups X25519:P-256:P-384:P-521 -ciphersuites TLS_AES_128_CCM_SHA256',
+      FIXTURES_DIR + '/rsa_rsa.crt',
+      FIXTURES_DIR + '/rsa_rsa.key',
+      { cipher_suites: [CipherSuite::TLS_AES_128_CCM_SHA256] }
+    ],
+    [
+      true,
+      "-groups X25519:P-256:P-384:P-521 -ciphersuites TLS_AES_128_CCM_8_SHA256 -cipher 'DEFAULT:@SECLEVEL=0'",
+      FIXTURES_DIR + '/rsa_rsa.crt',
+      FIXTURES_DIR + '/rsa_rsa.key',
+      { cipher_suites: [CipherSuite::TLS_AES_128_CCM_8_SHA256] }
     ],
     [
       false,
-      '-groups P-256:P-384:P-521 -ciphersuites TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256',
+      '-groups X25519:P-256:P-384:P-521 -ciphersuites TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256',
+      FIXTURES_DIR + '/rsa_rsa.crt',
+      FIXTURES_DIR + '/rsa_rsa.key',
+      { cipher_suites: [CipherSuite::TLS_AES_128_GCM_SHA256] }
+    ],
+    [
+      true,
+      '-groups X25519',
+      FIXTURES_DIR + '/rsa_rsa.crt',
+      FIXTURES_DIR + '/rsa_rsa.key',
+      { supported_groups: [NamedGroup::X25519] }
+    ],
+    [
+      true,
+      '-groups X448',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      cipher_suites: [CipherSuite::TLS_AES_128_GCM_SHA256]
+      { supported_groups: [NamedGroup::X448] }
     ],
     [
       true,
       '-groups P-256',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      supported_groups: [NamedGroup::SECP256R1]
+      { supported_groups: [NamedGroup::SECP256R1] }
     ],
     [
       true,
       '-groups P-384',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      supported_groups: [NamedGroup::SECP384R1]
+      { supported_groups: [NamedGroup::SECP384R1] }
     ],
     [
       true,
       '-groups P-521',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      supported_groups: [NamedGroup::SECP521R1]
+      { supported_groups: [NamedGroup::SECP521R1] }
     ],
     [
       false,
-      '-groups P-256:P-384',
+      '-groups X25519:P-256:P-384',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      supported_groups: [NamedGroup::SECP521R1]
+      { supported_groups: [NamedGroup::SECP521R1] }
     ],
     [
       true,
-      '-groups P-256:P-384:P-521 -sigalgs RSA-PSS+SHA256',
+      '-groups X25519:P-256:P-384:P-521 -sigalgs RSA-PSS+SHA256',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      signature_algorithms_cert: [SignatureScheme::RSA_PKCS1_SHA256],
-      signature_algorithms: [SignatureScheme::RSA_PSS_RSAE_SHA256]
+      { signature_algorithms_cert: [SignatureScheme::RSA_PKCS1_SHA256],
+        signature_algorithms: [SignatureScheme::RSA_PSS_RSAE_SHA256] }
     ],
     [
       true,
-      '-groups P-256:P-384:P-521 -sigalgs RSA-PSS+SHA384',
+      '-groups X25519:P-256:P-384:P-521 -sigalgs RSA-PSS+SHA384',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      signature_algorithms_cert: [SignatureScheme::RSA_PKCS1_SHA256],
-      signature_algorithms: [SignatureScheme::RSA_PSS_RSAE_SHA384]
+      { signature_algorithms_cert: [SignatureScheme::RSA_PKCS1_SHA256],
+        signature_algorithms: [SignatureScheme::RSA_PSS_RSAE_SHA384] }
     ],
     [
       true,
-      '-groups P-256:P-384:P-521 -sigalgs RSA-PSS+SHA512',
+      '-groups X25519:P-256:P-384:P-521 -sigalgs RSA-PSS+SHA512',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      signature_algorithms_cert: [SignatureScheme::RSA_PKCS1_SHA256],
-      signature_algorithms: [SignatureScheme::RSA_PSS_RSAE_SHA512]
+      { signature_algorithms_cert: [SignatureScheme::RSA_PKCS1_SHA256],
+        signature_algorithms: [SignatureScheme::RSA_PSS_RSAE_SHA512] }
     ],
     [
       true,
-      '-groups P-256:P-384:P-521 -sigalgs ECDSA+SHA256',
+      '-groups X25519:P-256:P-384:P-521 -sigalgs ECDSA+SHA256',
       FIXTURES_DIR + '/rsa_secp256r1.crt',
       FIXTURES_DIR + '/rsa_secp256r1.key',
-      signature_algorithms_cert: [SignatureScheme::RSA_PKCS1_SHA256],
-      signature_algorithms: [SignatureScheme::ECDSA_SECP256R1_SHA256]
+      { signature_algorithms_cert: [SignatureScheme::RSA_PKCS1_SHA256],
+        signature_algorithms: [SignatureScheme::ECDSA_SECP256R1_SHA256] }
     ],
     [
       true,
-      '-groups P-256:P-384:P-521 -sigalgs ECDSA+SHA384',
+      '-groups X25519:P-256:P-384:P-521 -sigalgs ECDSA+SHA384',
       FIXTURES_DIR + '/rsa_secp384r1.crt',
       FIXTURES_DIR + '/rsa_secp384r1.key',
-      signature_algorithms_cert: [SignatureScheme::RSA_PKCS1_SHA256],
-      signature_algorithms: [SignatureScheme::ECDSA_SECP384R1_SHA384]
+      { signature_algorithms_cert: [SignatureScheme::RSA_PKCS1_SHA256],
+        signature_algorithms: [SignatureScheme::ECDSA_SECP384R1_SHA384] }
     ],
     [
       true,
-      '-groups P-256:P-384:P-521 -sigalgs ECDSA+SHA512',
+      '-groups X25519:P-256:P-384:P-521 -sigalgs ECDSA+SHA512',
       FIXTURES_DIR + '/rsa_secp521r1.crt',
       FIXTURES_DIR + '/rsa_secp521r1.key',
-      signature_algorithms_cert: [SignatureScheme::RSA_PKCS1_SHA256],
-      signature_algorithms: [SignatureScheme::ECDSA_SECP521R1_SHA512]
+      { signature_algorithms_cert: [SignatureScheme::RSA_PKCS1_SHA256],
+        signature_algorithms: [SignatureScheme::ECDSA_SECP521R1_SHA512] }
     ],
     [
       true,
-      '-groups P-256:P-384:P-521 -sigalgs RSA-PSS+SHA256',
+      '-groups X25519:P-256:P-384:P-521 -sigalgs RSA-PSS+SHA256',
       FIXTURES_DIR + '/rsa_rsassaPss.crt',
       FIXTURES_DIR + '/rsa_rsassaPss.key',
-      signature_algorithms_cert: [SignatureScheme::RSA_PSS_RSAE_SHA256],
-      signature_algorithms: [SignatureScheme::RSA_PSS_RSAE_SHA256]
+      { signature_algorithms_cert: [SignatureScheme::RSA_PSS_RSAE_SHA256],
+        signature_algorithms: [SignatureScheme::RSA_PSS_RSAE_SHA256] }
     ],
     [
       false,
-      '-groups P-256:P-384:P-521 -sigalgs ECDSA+SHA256:ECDSA+SHA384:RSA-PSS+SHA256:RSA-PSS+SHA384:RSA-PSS+SHA512:RSA+SHA256',
+      '-groups X25519:P-256:P-384:P-521 -sigalgs ECDSA+SHA256:ECDSA+SHA384:RSA-PSS+SHA256:RSA-PSS+SHA384:RSA-PSS+SHA512:RSA+SHA256',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      signature_algorithms_cert: [SignatureScheme::RSA_PKCS1_SHA256],
-      signature_algorithms: [SignatureScheme::ECDSA_SECP521R1_SHA512]
+      { signature_algorithms_cert: [SignatureScheme::RSA_PKCS1_SHA256],
+        signature_algorithms: [SignatureScheme::ECDSA_SECP521R1_SHA512] }
     ],
     [
       true,
-      '-groups P-256:P-384:P-521 -record_padding 8446',
+      '-groups X25519:P-256:P-384:P-521 -record_padding 8446',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
       {}
     ],
     [
       true,
-      '-groups P-256:P-384:P-521 -alpn pingpong',
+      '-groups X25519:P-256:P-384:P-521 -alpn pingpong',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      alpn: ['pingpong']
+      { alpn: ['pingpong'] }
     ],
     [
       true,
-      '-groups P-256:P-384:P-521',
+      '-groups X25519:P-256:P-384:P-521',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      alpn: ['pingpong']
+      { alpn: ['pingpong'] }
     ],
     [
       false,
-      '-groups P-256:P-384:P-521 -alpn foo',
+      '-groups X25519:P-256:P-384:P-521 -alpn foo',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      alpn: ['pingpong']
+      { alpn: ['pingpong'] }
     ],
     [
       true,
-      '-groups P-256:P-384:P-521',
+      '-groups X25519:P-256:P-384:P-521',
       FIXTURES_DIR + '/rsa_rsa.crt',
       FIXTURES_DIR + '/rsa_rsa.key',
-      compatibility_mode: false
+      { compatibility_mode: false }
     ]
   ]
   # rubocop: enable Layout/LineLength

data/interop/spec_helper.rb

@@ -12,7 +12,7 @@ include TTTLS13::Message::Extension
 include TTTLS13::Error
 # rubocop: enable Style/MixinUsage
 
-def wait_to_listen(host, port)
+def wait_to_listen(host, port, verbose)
   10.times do
     soc = TCPSocket.open(host, port)
     ctx = OpenSSL::SSL::SSLContext.new
@@ -21,7 +21,7 @@ def wait_to_listen(host, port)
     ssl.sync_close = true
     ssl.connect
   rescue => e # rubocop: disable Style/RescueStandardError
-    p e
+    p e if verbose
     soc&.close
     sleep(0.5)
     next

data/lib/tttls1.3/cipher_suites.rb

@@ -7,14 +7,14 @@ module TTTLS13
     TLS_AES_128_GCM_SHA256       = "\x13\x01"
     TLS_AES_256_GCM_SHA384       = "\x13\x02"
     TLS_CHACHA20_POLY1305_SHA256 = "\x13\x03"
-    # TLS_AES_128_CCM_SHA256       = "\x13\x04" # UNSUPPORTED
-    # TLS_AES_128_CCM_8_SHA256     = "\x13\x05" # UNSUPPORTED
+    TLS_AES_128_CCM_SHA256       = "\x13\x04"
+    TLS_AES_128_CCM_8_SHA256     = "\x13\x05"
 
     class << self
       def digest(cipher_suite)
         case cipher_suite
-        when TLS_AES_128_GCM_SHA256, TLS_CHACHA20_POLY1305_SHA256
-          # , TLS_AES_128_CCM_SHA256, TLS_AES_128_CCM_8_SHA256
+        when TLS_AES_128_GCM_SHA256, TLS_CHACHA20_POLY1305_SHA256,
+             TLS_AES_128_CCM_SHA256, TLS_AES_128_CCM_8_SHA256
           'SHA256'
         when TLS_AES_256_GCM_SHA384
           'SHA384'
@@ -25,8 +25,8 @@ module TTTLS13
 
       def hash_len(cipher_suite)
         case cipher_suite
-        when TLS_AES_128_GCM_SHA256, TLS_CHACHA20_POLY1305_SHA256
-          # , TLS_AES_128_CCM_SHA256, TLS_AES_128_CCM_8_SHA256
+        when TLS_AES_128_GCM_SHA256, TLS_CHACHA20_POLY1305_SHA256,
+             TLS_AES_128_CCM_SHA256, TLS_AES_128_CCM_8_SHA256
           32
         when TLS_AES_256_GCM_SHA384
           48
@@ -37,8 +37,8 @@ module TTTLS13
 
       def key_len(cipher_suite)
         case cipher_suite
-        when TLS_AES_128_GCM_SHA256
-          # , TLS_AES_128_CCM_SHA256, TLS_AES_128_CCM_8_SHA256
+        when TLS_AES_128_GCM_SHA256, TLS_AES_128_CCM_SHA256,
+             TLS_AES_128_CCM_8_SHA256
           16
         when TLS_AES_256_GCM_SHA384, TLS_CHACHA20_POLY1305_SHA256
           32
@@ -50,8 +50,8 @@ module TTTLS13
       def iv_len(cipher_suite)
         case cipher_suite
         when TLS_AES_128_GCM_SHA256, TLS_AES_256_GCM_SHA384,
-             TLS_CHACHA20_POLY1305_SHA256
-          # , TLS_AES_128_CCM_SHA256, TLS_AES_128_CCM_8_SHA256
+             TLS_CHACHA20_POLY1305_SHA256, TLS_AES_128_CCM_SHA256,
+             TLS_AES_128_CCM_8_SHA256
           12
         else
           raise Error::ErrorAlerts, :internal_error
@@ -61,14 +61,22 @@ module TTTLS13
       def auth_tag_len(cipher_suite)
         case cipher_suite
         when TLS_AES_128_GCM_SHA256, TLS_AES_256_GCM_SHA384,
-             TLS_CHACHA20_POLY1305_SHA256 # , TLS_AES_128_CCM_SHA256
+             TLS_CHACHA20_POLY1305_SHA256, TLS_AES_128_CCM_SHA256
           16
-        # when TLS_AES_128_CCM_8_SHA256
-        #   8
+        when TLS_AES_128_CCM_8_SHA256
+          # https://datatracker.ietf.org/doc/html/rfc6655#section-6.2
+          8
         else
           raise Error::ErrorAlerts, :internal_error
         end
       end
+
+      def ccm?(cipher_suite)
+        [
+          TLS_AES_128_CCM_SHA256,
+          TLS_AES_128_CCM_8_SHA256
+        ].include?(cipher_suite)
+      end
     end
   end
 
@@ -81,9 +89,6 @@ module TTTLS13
     #     CipherSuite::TLS_CHACHA20_POLY1305_SHA256,
     #     CipherSuite::TLS_AES_128_GCM_SHA256
     #   ])
-    def initialize(cipher_suites)
-      super(cipher_suites)
-    end
 
     # @return [String]
     def serialize