src/usr.bin/ssh/kexkems.c - diff

Return to kexkems.c CVS log

Up to [local] / src / usr.bin / ssh

-version 1.1, 2019/01/21 10:20:12
+version 1.2, 2019/01/21 10:24:09
 Line 68
 Line 68
 Line 68
                  goto out;
          /* compute shared secret */
-         if ((r = kex_kem_sntrup4591761x25519_enc(kex, client_pubkey, pklen,
+         switch (kex->kex_type) {
-             &server_pubkey, &shared_secret)) != 0)
+         case KEX_C25519_SHA256:
+                 r = kex_c25519_enc(kex, client_pubkey, pklen, &server_pubkey,
+                     &shared_secret);
+                 break;
+         case KEX_KEM_SNTRUP4591761X25519_SHA512:
+                 r = kex_kem_sntrup4591761x25519_enc(kex, client_pubkey, pklen,
+                     &server_pubkey, &shared_secret);
+                 break;
+         default:
+                 r = SSH_ERR_INVALID_ARGUMENT;
+                 break;
+         }
+         if (r !=0 )
                  goto out;
          /* calc H */