1 files changed, 107 insertions, 1 deletions

diff --git a/src/lib/libssl/ssl_tlsext.c b/src/lib/libssl/ssl_tlsext.c
index 400c69fa87..e8723b502c 100644
--- a/src/lib/libssl/ssl_tlsext.c
+++ b/src/lib/libssl/ssl_tlsext.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_tlsext.c,v 1.3 2017/07/24 17:39:43 jsing Exp $ */
+/* $OpenBSD: ssl_tlsext.c,v 1.4 2017/08/11 05:06:34 doug Exp $ */
 /*
  * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org>
  *
@@ -21,6 +21,103 @@
 #include "ssl_tlsext.h"
 
 /*
+ * Supported Point Formats Extension - RFC 4492 section 5.1.2
+ */
+static int
+tlsext_ecpf_build(SSL *s, CBB *cbb)
+{
+        CBB ecpf;
+        size_t formats_len;
+        const uint8_t *formats;
+
+        tls1_get_formatlist(s, 0, &formats, &formats_len);
+
+        if (formats_len == 0) {
+                SSLerror(s, ERR_R_INTERNAL_ERROR);
+                return 0;
+        }
+
+        if (!CBB_add_u8_length_prefixed(cbb, &ecpf))
+                return 0;
+        if (!CBB_add_bytes(&ecpf, formats, formats_len))
+                return 0;
+        if (!CBB_flush(cbb))
+                return 0;
+
+        return 1;
+}
+
+static int
+tlsext_ecpf_parse(SSL *s, CBS *cbs, int *alert)
+{
+        CBS ecpf;
+
+        if (!CBS_get_u8_length_prefixed(cbs, &ecpf))
+                goto err;
+        if (CBS_len(&ecpf) == 0)
+                goto err;
+        if (CBS_len(cbs) != 0)
+                goto err;
+
+        /* Must contain uncompressed (0) */
+        if (!CBS_contains_zero_byte(&ecpf)) {
+                SSLerror(s, SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST);
+                goto err;
+        }
+
+        if (!s->internal->hit) {
+                if (!CBS_stow(&ecpf, &(SSI(s)->tlsext_ecpointformatlist),
+                    &(SSI(s)->tlsext_ecpointformatlist_length)))
+                        goto err;
+        }
+
+        return 1;
+
+ err:
+        *alert = TLS1_AD_INTERNAL_ERROR;
+        return 0;
+}
+
+int
+tlsext_ecpf_clienthello_needs(SSL *s)
+{
+        return ssl_has_ecc_ciphers(s);
+}
+
+int
+tlsext_ecpf_clienthello_build(SSL *s, CBB *cbb)
+{
+        return tlsext_ecpf_build(s, cbb);
+}
+
+int
+tlsext_ecpf_clienthello_parse(SSL *s, CBS *cbs, int *alert)
+{
+        return tlsext_ecpf_parse(s, cbs, alert);
+}
+
+int
+tlsext_ecpf_serverhello_needs(SSL *s)
+{
+        if (s->version == DTLS1_VERSION)
+                return 0;
+
+        return ssl_using_ecc_cipher(s);
+}
+
+int
+tlsext_ecpf_serverhello_build(SSL *s, CBB *cbb)
+{
+        return tlsext_ecpf_build(s, cbb);
+}
+
+int
+tlsext_ecpf_serverhello_parse(SSL *s, CBS *cbs, int *alert)
+{
+        return tlsext_ecpf_parse(s, cbs, alert);
+}
+
+/*
  * Renegotiation Indication - RFC 5746.
  */
 int
@@ -313,6 +410,15 @@ static struct tls_extension tls_extensions[] = {
                 .serverhello_build = tlsext_ri_serverhello_build,
                 .serverhello_parse = tlsext_ri_serverhello_parse,
         },
+        {
+                .type = TLSEXT_TYPE_ec_point_formats,
+                .clienthello_needs = tlsext_ecpf_clienthello_needs,
+                .clienthello_build = tlsext_ecpf_clienthello_build,
+                .clienthello_parse = tlsext_ecpf_clienthello_parse,
+                .serverhello_needs = tlsext_ecpf_serverhello_needs,
+                .serverhello_build = tlsext_ecpf_serverhello_build,
+                .serverhello_parse = tlsext_ecpf_serverhello_parse,
+        },
 };
 
 #define N_TLS_EXTENSIONS (sizeof(tls_extensions) / sizeof(*tls_extensions))