mbed TLS upgraded to 2.6.0

Fork of mbedtls by Mark Radbourne

Committer:
Jasper Wallace
Date:
Fri Sep 29 19:50:30 2017 +0100
Revision:
2:bbdeda018a3c
Parent:
0:cdf462088d13
Update to mbedtls 2.6.0, many changes.

Changes to mbedtls sources made:

in include/mbedtls/config.h comment out:

#define MBEDTLS_FS_IO
#define MBEDTLS_NET_C
#define MBEDTLS_TIMING_C

uncomment:

#define MBEDTLS_NO_PLATFORM_ENTROPY

remove the following directorys:

programs
yotta
visualc

Who changed what in which revision?

UserRevisionLine numberNew contents of line
markrad 0:cdf462088d13 1 /*
markrad 0:cdf462088d13 2 * Elliptic curve J-PAKE
markrad 0:cdf462088d13 3 *
markrad 0:cdf462088d13 4 * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
markrad 0:cdf462088d13 5 * SPDX-License-Identifier: Apache-2.0
markrad 0:cdf462088d13 6 *
markrad 0:cdf462088d13 7 * Licensed under the Apache License, Version 2.0 (the "License"); you may
markrad 0:cdf462088d13 8 * not use this file except in compliance with the License.
markrad 0:cdf462088d13 9 * You may obtain a copy of the License at
markrad 0:cdf462088d13 10 *
markrad 0:cdf462088d13 11 * http://www.apache.org/licenses/LICENSE-2.0
markrad 0:cdf462088d13 12 *
markrad 0:cdf462088d13 13 * Unless required by applicable law or agreed to in writing, software
markrad 0:cdf462088d13 14 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
markrad 0:cdf462088d13 15 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
markrad 0:cdf462088d13 16 * See the License for the specific language governing permissions and
markrad 0:cdf462088d13 17 * limitations under the License.
markrad 0:cdf462088d13 18 *
markrad 0:cdf462088d13 19 * This file is part of mbed TLS (https://tls.mbed.org)
markrad 0:cdf462088d13 20 */
markrad 0:cdf462088d13 21
markrad 0:cdf462088d13 22 /*
markrad 0:cdf462088d13 23 * References in the code are to the Thread v1.0 Specification,
markrad 0:cdf462088d13 24 * available to members of the Thread Group http://threadgroup.org/
markrad 0:cdf462088d13 25 */
markrad 0:cdf462088d13 26
markrad 0:cdf462088d13 27 #if !defined(MBEDTLS_CONFIG_FILE)
markrad 0:cdf462088d13 28 #include "mbedtls/config.h"
markrad 0:cdf462088d13 29 #else
markrad 0:cdf462088d13 30 #include MBEDTLS_CONFIG_FILE
markrad 0:cdf462088d13 31 #endif
markrad 0:cdf462088d13 32
markrad 0:cdf462088d13 33 #if defined(MBEDTLS_ECJPAKE_C)
markrad 0:cdf462088d13 34
markrad 0:cdf462088d13 35 #include "mbedtls/ecjpake.h"
markrad 0:cdf462088d13 36
markrad 0:cdf462088d13 37 #include <string.h>
markrad 0:cdf462088d13 38
markrad 0:cdf462088d13 39 /*
markrad 0:cdf462088d13 40 * Convert a mbedtls_ecjpake_role to identifier string
markrad 0:cdf462088d13 41 */
markrad 0:cdf462088d13 42 static const char * const ecjpake_id[] = {
markrad 0:cdf462088d13 43 "client",
markrad 0:cdf462088d13 44 "server"
markrad 0:cdf462088d13 45 };
markrad 0:cdf462088d13 46
markrad 0:cdf462088d13 47 #define ID_MINE ( ecjpake_id[ ctx->role ] )
markrad 0:cdf462088d13 48 #define ID_PEER ( ecjpake_id[ 1 - ctx->role ] )
markrad 0:cdf462088d13 49
markrad 0:cdf462088d13 50 /*
markrad 0:cdf462088d13 51 * Initialize context
markrad 0:cdf462088d13 52 */
markrad 0:cdf462088d13 53 void mbedtls_ecjpake_init( mbedtls_ecjpake_context *ctx )
markrad 0:cdf462088d13 54 {
markrad 0:cdf462088d13 55 if( ctx == NULL )
markrad 0:cdf462088d13 56 return;
markrad 0:cdf462088d13 57
markrad 0:cdf462088d13 58 ctx->md_info = NULL;
markrad 0:cdf462088d13 59 mbedtls_ecp_group_init( &ctx->grp );
markrad 0:cdf462088d13 60 ctx->point_format = MBEDTLS_ECP_PF_UNCOMPRESSED;
markrad 0:cdf462088d13 61
markrad 0:cdf462088d13 62 mbedtls_ecp_point_init( &ctx->Xm1 );
markrad 0:cdf462088d13 63 mbedtls_ecp_point_init( &ctx->Xm2 );
markrad 0:cdf462088d13 64 mbedtls_ecp_point_init( &ctx->Xp1 );
markrad 0:cdf462088d13 65 mbedtls_ecp_point_init( &ctx->Xp2 );
markrad 0:cdf462088d13 66 mbedtls_ecp_point_init( &ctx->Xp );
markrad 0:cdf462088d13 67
markrad 0:cdf462088d13 68 mbedtls_mpi_init( &ctx->xm1 );
markrad 0:cdf462088d13 69 mbedtls_mpi_init( &ctx->xm2 );
markrad 0:cdf462088d13 70 mbedtls_mpi_init( &ctx->s );
markrad 0:cdf462088d13 71 }
markrad 0:cdf462088d13 72
markrad 0:cdf462088d13 73 /*
markrad 0:cdf462088d13 74 * Free context
markrad 0:cdf462088d13 75 */
markrad 0:cdf462088d13 76 void mbedtls_ecjpake_free( mbedtls_ecjpake_context *ctx )
markrad 0:cdf462088d13 77 {
markrad 0:cdf462088d13 78 if( ctx == NULL )
markrad 0:cdf462088d13 79 return;
markrad 0:cdf462088d13 80
markrad 0:cdf462088d13 81 ctx->md_info = NULL;
markrad 0:cdf462088d13 82 mbedtls_ecp_group_free( &ctx->grp );
markrad 0:cdf462088d13 83
markrad 0:cdf462088d13 84 mbedtls_ecp_point_free( &ctx->Xm1 );
markrad 0:cdf462088d13 85 mbedtls_ecp_point_free( &ctx->Xm2 );
markrad 0:cdf462088d13 86 mbedtls_ecp_point_free( &ctx->Xp1 );
markrad 0:cdf462088d13 87 mbedtls_ecp_point_free( &ctx->Xp2 );
markrad 0:cdf462088d13 88 mbedtls_ecp_point_free( &ctx->Xp );
markrad 0:cdf462088d13 89
markrad 0:cdf462088d13 90 mbedtls_mpi_free( &ctx->xm1 );
markrad 0:cdf462088d13 91 mbedtls_mpi_free( &ctx->xm2 );
markrad 0:cdf462088d13 92 mbedtls_mpi_free( &ctx->s );
markrad 0:cdf462088d13 93 }
markrad 0:cdf462088d13 94
markrad 0:cdf462088d13 95 /*
markrad 0:cdf462088d13 96 * Setup context
markrad 0:cdf462088d13 97 */
markrad 0:cdf462088d13 98 int mbedtls_ecjpake_setup( mbedtls_ecjpake_context *ctx,
markrad 0:cdf462088d13 99 mbedtls_ecjpake_role role,
markrad 0:cdf462088d13 100 mbedtls_md_type_t hash,
markrad 0:cdf462088d13 101 mbedtls_ecp_group_id curve,
markrad 0:cdf462088d13 102 const unsigned char *secret,
markrad 0:cdf462088d13 103 size_t len )
markrad 0:cdf462088d13 104 {
markrad 0:cdf462088d13 105 int ret;
markrad 0:cdf462088d13 106
markrad 0:cdf462088d13 107 ctx->role = role;
markrad 0:cdf462088d13 108
markrad 0:cdf462088d13 109 if( ( ctx->md_info = mbedtls_md_info_from_type( hash ) ) == NULL )
markrad 0:cdf462088d13 110 return( MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE );
markrad 0:cdf462088d13 111
markrad 0:cdf462088d13 112 MBEDTLS_MPI_CHK( mbedtls_ecp_group_load( &ctx->grp, curve ) );
markrad 0:cdf462088d13 113
markrad 0:cdf462088d13 114 MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &ctx->s, secret, len ) );
markrad 0:cdf462088d13 115
markrad 0:cdf462088d13 116 cleanup:
markrad 0:cdf462088d13 117 if( ret != 0 )
markrad 0:cdf462088d13 118 mbedtls_ecjpake_free( ctx );
markrad 0:cdf462088d13 119
markrad 0:cdf462088d13 120 return( ret );
markrad 0:cdf462088d13 121 }
markrad 0:cdf462088d13 122
markrad 0:cdf462088d13 123 /*
markrad 0:cdf462088d13 124 * Check if context is ready for use
markrad 0:cdf462088d13 125 */
markrad 0:cdf462088d13 126 int mbedtls_ecjpake_check( const mbedtls_ecjpake_context *ctx )
markrad 0:cdf462088d13 127 {
markrad 0:cdf462088d13 128 if( ctx->md_info == NULL ||
markrad 0:cdf462088d13 129 ctx->grp.id == MBEDTLS_ECP_DP_NONE ||
markrad 0:cdf462088d13 130 ctx->s.p == NULL )
markrad 0:cdf462088d13 131 {
markrad 0:cdf462088d13 132 return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
markrad 0:cdf462088d13 133 }
markrad 0:cdf462088d13 134
markrad 0:cdf462088d13 135 return( 0 );
markrad 0:cdf462088d13 136 }
markrad 0:cdf462088d13 137
markrad 0:cdf462088d13 138 /*
markrad 0:cdf462088d13 139 * Write a point plus its length to a buffer
markrad 0:cdf462088d13 140 */
markrad 0:cdf462088d13 141 static int ecjpake_write_len_point( unsigned char **p,
markrad 0:cdf462088d13 142 const unsigned char *end,
markrad 0:cdf462088d13 143 const mbedtls_ecp_group *grp,
markrad 0:cdf462088d13 144 const int pf,
markrad 0:cdf462088d13 145 const mbedtls_ecp_point *P )
markrad 0:cdf462088d13 146 {
markrad 0:cdf462088d13 147 int ret;
markrad 0:cdf462088d13 148 size_t len;
markrad 0:cdf462088d13 149
markrad 0:cdf462088d13 150 /* Need at least 4 for length plus 1 for point */
markrad 0:cdf462088d13 151 if( end < *p || end - *p < 5 )
markrad 0:cdf462088d13 152 return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
markrad 0:cdf462088d13 153
markrad 0:cdf462088d13 154 ret = mbedtls_ecp_point_write_binary( grp, P, pf,
markrad 0:cdf462088d13 155 &len, *p + 4, end - ( *p + 4 ) );
markrad 0:cdf462088d13 156 if( ret != 0 )
markrad 0:cdf462088d13 157 return( ret );
markrad 0:cdf462088d13 158
markrad 0:cdf462088d13 159 (*p)[0] = (unsigned char)( ( len >> 24 ) & 0xFF );
markrad 0:cdf462088d13 160 (*p)[1] = (unsigned char)( ( len >> 16 ) & 0xFF );
markrad 0:cdf462088d13 161 (*p)[2] = (unsigned char)( ( len >> 8 ) & 0xFF );
markrad 0:cdf462088d13 162 (*p)[3] = (unsigned char)( ( len ) & 0xFF );
markrad 0:cdf462088d13 163
markrad 0:cdf462088d13 164 *p += 4 + len;
markrad 0:cdf462088d13 165
markrad 0:cdf462088d13 166 return( 0 );
markrad 0:cdf462088d13 167 }
markrad 0:cdf462088d13 168
markrad 0:cdf462088d13 169 /*
markrad 0:cdf462088d13 170 * Size of the temporary buffer for ecjpake_hash:
markrad 0:cdf462088d13 171 * 3 EC points plus their length, plus ID and its length (4 + 6 bytes)
markrad 0:cdf462088d13 172 */
markrad 0:cdf462088d13 173 #define ECJPAKE_HASH_BUF_LEN ( 3 * ( 4 + MBEDTLS_ECP_MAX_PT_LEN ) + 4 + 6 )
markrad 0:cdf462088d13 174
markrad 0:cdf462088d13 175 /*
markrad 0:cdf462088d13 176 * Compute hash for ZKP (7.4.2.2.2.1)
markrad 0:cdf462088d13 177 */
markrad 0:cdf462088d13 178 static int ecjpake_hash( const mbedtls_md_info_t *md_info,
markrad 0:cdf462088d13 179 const mbedtls_ecp_group *grp,
markrad 0:cdf462088d13 180 const int pf,
markrad 0:cdf462088d13 181 const mbedtls_ecp_point *G,
markrad 0:cdf462088d13 182 const mbedtls_ecp_point *V,
markrad 0:cdf462088d13 183 const mbedtls_ecp_point *X,
markrad 0:cdf462088d13 184 const char *id,
markrad 0:cdf462088d13 185 mbedtls_mpi *h )
markrad 0:cdf462088d13 186 {
markrad 0:cdf462088d13 187 int ret;
markrad 0:cdf462088d13 188 unsigned char buf[ECJPAKE_HASH_BUF_LEN];
markrad 0:cdf462088d13 189 unsigned char *p = buf;
markrad 0:cdf462088d13 190 const unsigned char *end = buf + sizeof( buf );
markrad 0:cdf462088d13 191 const size_t id_len = strlen( id );
markrad 0:cdf462088d13 192 unsigned char hash[MBEDTLS_MD_MAX_SIZE];
markrad 0:cdf462088d13 193
markrad 0:cdf462088d13 194 /* Write things to temporary buffer */
markrad 0:cdf462088d13 195 MBEDTLS_MPI_CHK( ecjpake_write_len_point( &p, end, grp, pf, G ) );
markrad 0:cdf462088d13 196 MBEDTLS_MPI_CHK( ecjpake_write_len_point( &p, end, grp, pf, V ) );
markrad 0:cdf462088d13 197 MBEDTLS_MPI_CHK( ecjpake_write_len_point( &p, end, grp, pf, X ) );
markrad 0:cdf462088d13 198
markrad 0:cdf462088d13 199 if( end - p < 4 )
markrad 0:cdf462088d13 200 return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
markrad 0:cdf462088d13 201
markrad 0:cdf462088d13 202 *p++ = (unsigned char)( ( id_len >> 24 ) & 0xFF );
markrad 0:cdf462088d13 203 *p++ = (unsigned char)( ( id_len >> 16 ) & 0xFF );
markrad 0:cdf462088d13 204 *p++ = (unsigned char)( ( id_len >> 8 ) & 0xFF );
markrad 0:cdf462088d13 205 *p++ = (unsigned char)( ( id_len ) & 0xFF );
markrad 0:cdf462088d13 206
markrad 0:cdf462088d13 207 if( end < p || (size_t)( end - p ) < id_len )
markrad 0:cdf462088d13 208 return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
markrad 0:cdf462088d13 209
markrad 0:cdf462088d13 210 memcpy( p, id, id_len );
markrad 0:cdf462088d13 211 p += id_len;
markrad 0:cdf462088d13 212
markrad 0:cdf462088d13 213 /* Compute hash */
markrad 0:cdf462088d13 214 mbedtls_md( md_info, buf, p - buf, hash );
markrad 0:cdf462088d13 215
markrad 0:cdf462088d13 216 /* Turn it into an integer mod n */
markrad 0:cdf462088d13 217 MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( h, hash,
markrad 0:cdf462088d13 218 mbedtls_md_get_size( md_info ) ) );
markrad 0:cdf462088d13 219 MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( h, h, &grp->N ) );
markrad 0:cdf462088d13 220
markrad 0:cdf462088d13 221 cleanup:
markrad 0:cdf462088d13 222 return( ret );
markrad 0:cdf462088d13 223 }
markrad 0:cdf462088d13 224
markrad 0:cdf462088d13 225 /*
markrad 0:cdf462088d13 226 * Parse a ECShnorrZKP (7.4.2.2.2) and verify it (7.4.2.3.3)
markrad 0:cdf462088d13 227 */
markrad 0:cdf462088d13 228 static int ecjpake_zkp_read( const mbedtls_md_info_t *md_info,
markrad 0:cdf462088d13 229 const mbedtls_ecp_group *grp,
markrad 0:cdf462088d13 230 const int pf,
markrad 0:cdf462088d13 231 const mbedtls_ecp_point *G,
markrad 0:cdf462088d13 232 const mbedtls_ecp_point *X,
markrad 0:cdf462088d13 233 const char *id,
markrad 0:cdf462088d13 234 const unsigned char **p,
markrad 0:cdf462088d13 235 const unsigned char *end )
markrad 0:cdf462088d13 236 {
markrad 0:cdf462088d13 237 int ret;
markrad 0:cdf462088d13 238 mbedtls_ecp_point V, VV;
markrad 0:cdf462088d13 239 mbedtls_mpi r, h;
markrad 0:cdf462088d13 240 size_t r_len;
markrad 0:cdf462088d13 241
markrad 0:cdf462088d13 242 mbedtls_ecp_point_init( &V );
markrad 0:cdf462088d13 243 mbedtls_ecp_point_init( &VV );
markrad 0:cdf462088d13 244 mbedtls_mpi_init( &r );
markrad 0:cdf462088d13 245 mbedtls_mpi_init( &h );
markrad 0:cdf462088d13 246
markrad 0:cdf462088d13 247 /*
markrad 0:cdf462088d13 248 * struct {
markrad 0:cdf462088d13 249 * ECPoint V;
markrad 0:cdf462088d13 250 * opaque r<1..2^8-1>;
markrad 0:cdf462088d13 251 * } ECSchnorrZKP;
markrad 0:cdf462088d13 252 */
markrad 0:cdf462088d13 253 if( end < *p )
markrad 0:cdf462088d13 254 return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
markrad 0:cdf462088d13 255
markrad 0:cdf462088d13 256 MBEDTLS_MPI_CHK( mbedtls_ecp_tls_read_point( grp, &V, p, end - *p ) );
markrad 0:cdf462088d13 257
markrad 0:cdf462088d13 258 if( end < *p || (size_t)( end - *p ) < 1 )
markrad 0:cdf462088d13 259 {
markrad 0:cdf462088d13 260 ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
markrad 0:cdf462088d13 261 goto cleanup;
markrad 0:cdf462088d13 262 }
markrad 0:cdf462088d13 263
markrad 0:cdf462088d13 264 r_len = *(*p)++;
markrad 0:cdf462088d13 265
markrad 0:cdf462088d13 266 if( end < *p || (size_t)( end - *p ) < r_len )
markrad 0:cdf462088d13 267 {
markrad 0:cdf462088d13 268 ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
markrad 0:cdf462088d13 269 goto cleanup;
markrad 0:cdf462088d13 270 }
markrad 0:cdf462088d13 271
markrad 0:cdf462088d13 272 MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &r, *p, r_len ) );
markrad 0:cdf462088d13 273 *p += r_len;
markrad 0:cdf462088d13 274
markrad 0:cdf462088d13 275 /*
markrad 0:cdf462088d13 276 * Verification
markrad 0:cdf462088d13 277 */
markrad 0:cdf462088d13 278 MBEDTLS_MPI_CHK( ecjpake_hash( md_info, grp, pf, G, &V, X, id, &h ) );
markrad 0:cdf462088d13 279 MBEDTLS_MPI_CHK( mbedtls_ecp_muladd( (mbedtls_ecp_group *) grp,
markrad 0:cdf462088d13 280 &VV, &h, X, &r, G ) );
markrad 0:cdf462088d13 281
markrad 0:cdf462088d13 282 if( mbedtls_ecp_point_cmp( &VV, &V ) != 0 )
markrad 0:cdf462088d13 283 {
markrad 0:cdf462088d13 284 ret = MBEDTLS_ERR_ECP_VERIFY_FAILED;
markrad 0:cdf462088d13 285 goto cleanup;
markrad 0:cdf462088d13 286 }
markrad 0:cdf462088d13 287
markrad 0:cdf462088d13 288 cleanup:
markrad 0:cdf462088d13 289 mbedtls_ecp_point_free( &V );
markrad 0:cdf462088d13 290 mbedtls_ecp_point_free( &VV );
markrad 0:cdf462088d13 291 mbedtls_mpi_free( &r );
markrad 0:cdf462088d13 292 mbedtls_mpi_free( &h );
markrad 0:cdf462088d13 293
markrad 0:cdf462088d13 294 return( ret );
markrad 0:cdf462088d13 295 }
markrad 0:cdf462088d13 296
markrad 0:cdf462088d13 297 /*
markrad 0:cdf462088d13 298 * Generate ZKP (7.4.2.3.2) and write it as ECSchnorrZKP (7.4.2.2.2)
markrad 0:cdf462088d13 299 */
markrad 0:cdf462088d13 300 static int ecjpake_zkp_write( const mbedtls_md_info_t *md_info,
markrad 0:cdf462088d13 301 const mbedtls_ecp_group *grp,
markrad 0:cdf462088d13 302 const int pf,
markrad 0:cdf462088d13 303 const mbedtls_ecp_point *G,
markrad 0:cdf462088d13 304 const mbedtls_mpi *x,
markrad 0:cdf462088d13 305 const mbedtls_ecp_point *X,
markrad 0:cdf462088d13 306 const char *id,
markrad 0:cdf462088d13 307 unsigned char **p,
markrad 0:cdf462088d13 308 const unsigned char *end,
markrad 0:cdf462088d13 309 int (*f_rng)(void *, unsigned char *, size_t),
markrad 0:cdf462088d13 310 void *p_rng )
markrad 0:cdf462088d13 311 {
markrad 0:cdf462088d13 312 int ret;
markrad 0:cdf462088d13 313 mbedtls_ecp_point V;
markrad 0:cdf462088d13 314 mbedtls_mpi v;
markrad 0:cdf462088d13 315 mbedtls_mpi h; /* later recycled to hold r */
markrad 0:cdf462088d13 316 size_t len;
markrad 0:cdf462088d13 317
markrad 0:cdf462088d13 318 if( end < *p )
markrad 0:cdf462088d13 319 return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
markrad 0:cdf462088d13 320
markrad 0:cdf462088d13 321 mbedtls_ecp_point_init( &V );
markrad 0:cdf462088d13 322 mbedtls_mpi_init( &v );
markrad 0:cdf462088d13 323 mbedtls_mpi_init( &h );
markrad 0:cdf462088d13 324
markrad 0:cdf462088d13 325 /* Compute signature */
markrad 0:cdf462088d13 326 MBEDTLS_MPI_CHK( mbedtls_ecp_gen_keypair_base( (mbedtls_ecp_group *) grp,
markrad 0:cdf462088d13 327 G, &v, &V, f_rng, p_rng ) );
markrad 0:cdf462088d13 328 MBEDTLS_MPI_CHK( ecjpake_hash( md_info, grp, pf, G, &V, X, id, &h ) );
markrad 0:cdf462088d13 329 MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &h, &h, x ) ); /* x*h */
markrad 0:cdf462088d13 330 MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &h, &v, &h ) ); /* v - x*h */
markrad 0:cdf462088d13 331 MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &h, &h, &grp->N ) ); /* r */
markrad 0:cdf462088d13 332
markrad 0:cdf462088d13 333 /* Write it out */
markrad 0:cdf462088d13 334 MBEDTLS_MPI_CHK( mbedtls_ecp_tls_write_point( grp, &V,
markrad 0:cdf462088d13 335 pf, &len, *p, end - *p ) );
markrad 0:cdf462088d13 336 *p += len;
markrad 0:cdf462088d13 337
markrad 0:cdf462088d13 338 len = mbedtls_mpi_size( &h ); /* actually r */
markrad 0:cdf462088d13 339 if( end < *p || (size_t)( end - *p ) < 1 + len || len > 255 )
markrad 0:cdf462088d13 340 {
markrad 0:cdf462088d13 341 ret = MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL;
markrad 0:cdf462088d13 342 goto cleanup;
markrad 0:cdf462088d13 343 }
markrad 0:cdf462088d13 344
markrad 0:cdf462088d13 345 *(*p)++ = (unsigned char)( len & 0xFF );
markrad 0:cdf462088d13 346 MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &h, *p, len ) ); /* r */
markrad 0:cdf462088d13 347 *p += len;
markrad 0:cdf462088d13 348
markrad 0:cdf462088d13 349 cleanup:
markrad 0:cdf462088d13 350 mbedtls_ecp_point_free( &V );
markrad 0:cdf462088d13 351 mbedtls_mpi_free( &v );
markrad 0:cdf462088d13 352 mbedtls_mpi_free( &h );
markrad 0:cdf462088d13 353
markrad 0:cdf462088d13 354 return( ret );
markrad 0:cdf462088d13 355 }
markrad 0:cdf462088d13 356
markrad 0:cdf462088d13 357 /*
markrad 0:cdf462088d13 358 * Parse a ECJPAKEKeyKP (7.4.2.2.1) and check proof
markrad 0:cdf462088d13 359 * Output: verified public key X
markrad 0:cdf462088d13 360 */
markrad 0:cdf462088d13 361 static int ecjpake_kkp_read( const mbedtls_md_info_t *md_info,
markrad 0:cdf462088d13 362 const mbedtls_ecp_group *grp,
markrad 0:cdf462088d13 363 const int pf,
markrad 0:cdf462088d13 364 const mbedtls_ecp_point *G,
markrad 0:cdf462088d13 365 mbedtls_ecp_point *X,
markrad 0:cdf462088d13 366 const char *id,
markrad 0:cdf462088d13 367 const unsigned char **p,
markrad 0:cdf462088d13 368 const unsigned char *end )
markrad 0:cdf462088d13 369 {
markrad 0:cdf462088d13 370 int ret;
markrad 0:cdf462088d13 371
markrad 0:cdf462088d13 372 if( end < *p )
markrad 0:cdf462088d13 373 return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
markrad 0:cdf462088d13 374
markrad 0:cdf462088d13 375 /*
markrad 0:cdf462088d13 376 * struct {
markrad 0:cdf462088d13 377 * ECPoint X;
markrad 0:cdf462088d13 378 * ECSchnorrZKP zkp;
markrad 0:cdf462088d13 379 * } ECJPAKEKeyKP;
markrad 0:cdf462088d13 380 */
markrad 0:cdf462088d13 381 MBEDTLS_MPI_CHK( mbedtls_ecp_tls_read_point( grp, X, p, end - *p ) );
markrad 0:cdf462088d13 382 if( mbedtls_ecp_is_zero( X ) )
markrad 0:cdf462088d13 383 {
markrad 0:cdf462088d13 384 ret = MBEDTLS_ERR_ECP_INVALID_KEY;
markrad 0:cdf462088d13 385 goto cleanup;
markrad 0:cdf462088d13 386 }
markrad 0:cdf462088d13 387
markrad 0:cdf462088d13 388 MBEDTLS_MPI_CHK( ecjpake_zkp_read( md_info, grp, pf, G, X, id, p, end ) );
markrad 0:cdf462088d13 389
markrad 0:cdf462088d13 390 cleanup:
markrad 0:cdf462088d13 391 return( ret );
markrad 0:cdf462088d13 392 }
markrad 0:cdf462088d13 393
markrad 0:cdf462088d13 394 /*
markrad 0:cdf462088d13 395 * Generate an ECJPAKEKeyKP
markrad 0:cdf462088d13 396 * Output: the serialized structure, plus private/public key pair
markrad 0:cdf462088d13 397 */
markrad 0:cdf462088d13 398 static int ecjpake_kkp_write( const mbedtls_md_info_t *md_info,
markrad 0:cdf462088d13 399 const mbedtls_ecp_group *grp,
markrad 0:cdf462088d13 400 const int pf,
markrad 0:cdf462088d13 401 const mbedtls_ecp_point *G,
markrad 0:cdf462088d13 402 mbedtls_mpi *x,
markrad 0:cdf462088d13 403 mbedtls_ecp_point *X,
markrad 0:cdf462088d13 404 const char *id,
markrad 0:cdf462088d13 405 unsigned char **p,
markrad 0:cdf462088d13 406 const unsigned char *end,
markrad 0:cdf462088d13 407 int (*f_rng)(void *, unsigned char *, size_t),
markrad 0:cdf462088d13 408 void *p_rng )
markrad 0:cdf462088d13 409 {
markrad 0:cdf462088d13 410 int ret;
markrad 0:cdf462088d13 411 size_t len;
markrad 0:cdf462088d13 412
markrad 0:cdf462088d13 413 if( end < *p )
markrad 0:cdf462088d13 414 return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
markrad 0:cdf462088d13 415
markrad 0:cdf462088d13 416 /* Generate key (7.4.2.3.1) and write it out */
markrad 0:cdf462088d13 417 MBEDTLS_MPI_CHK( mbedtls_ecp_gen_keypair_base( (mbedtls_ecp_group *) grp, G, x, X,
markrad 0:cdf462088d13 418 f_rng, p_rng ) );
markrad 0:cdf462088d13 419 MBEDTLS_MPI_CHK( mbedtls_ecp_tls_write_point( grp, X,
markrad 0:cdf462088d13 420 pf, &len, *p, end - *p ) );
markrad 0:cdf462088d13 421 *p += len;
markrad 0:cdf462088d13 422
markrad 0:cdf462088d13 423 /* Generate and write proof */
markrad 0:cdf462088d13 424 MBEDTLS_MPI_CHK( ecjpake_zkp_write( md_info, grp, pf, G, x, X, id,
markrad 0:cdf462088d13 425 p, end, f_rng, p_rng ) );
markrad 0:cdf462088d13 426
markrad 0:cdf462088d13 427 cleanup:
markrad 0:cdf462088d13 428 return( ret );
markrad 0:cdf462088d13 429 }
markrad 0:cdf462088d13 430
markrad 0:cdf462088d13 431 /*
markrad 0:cdf462088d13 432 * Read a ECJPAKEKeyKPPairList (7.4.2.3) and check proofs
markrad 0:cdf462088d13 433 * Ouputs: verified peer public keys Xa, Xb
markrad 0:cdf462088d13 434 */
markrad 0:cdf462088d13 435 static int ecjpake_kkpp_read( const mbedtls_md_info_t *md_info,
markrad 0:cdf462088d13 436 const mbedtls_ecp_group *grp,
markrad 0:cdf462088d13 437 const int pf,
markrad 0:cdf462088d13 438 const mbedtls_ecp_point *G,
markrad 0:cdf462088d13 439 mbedtls_ecp_point *Xa,
markrad 0:cdf462088d13 440 mbedtls_ecp_point *Xb,
markrad 0:cdf462088d13 441 const char *id,
markrad 0:cdf462088d13 442 const unsigned char *buf,
markrad 0:cdf462088d13 443 size_t len )
markrad 0:cdf462088d13 444 {
markrad 0:cdf462088d13 445 int ret;
markrad 0:cdf462088d13 446 const unsigned char *p = buf;
markrad 0:cdf462088d13 447 const unsigned char *end = buf + len;
markrad 0:cdf462088d13 448
markrad 0:cdf462088d13 449 /*
markrad 0:cdf462088d13 450 * struct {
markrad 0:cdf462088d13 451 * ECJPAKEKeyKP ecjpake_key_kp_pair_list[2];
markrad 0:cdf462088d13 452 * } ECJPAKEKeyKPPairList;
markrad 0:cdf462088d13 453 */
markrad 0:cdf462088d13 454 MBEDTLS_MPI_CHK( ecjpake_kkp_read( md_info, grp, pf, G, Xa, id, &p, end ) );
markrad 0:cdf462088d13 455 MBEDTLS_MPI_CHK( ecjpake_kkp_read( md_info, grp, pf, G, Xb, id, &p, end ) );
markrad 0:cdf462088d13 456
markrad 0:cdf462088d13 457 if( p != end )
markrad 0:cdf462088d13 458 ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
markrad 0:cdf462088d13 459
markrad 0:cdf462088d13 460 cleanup:
markrad 0:cdf462088d13 461 return( ret );
markrad 0:cdf462088d13 462 }
markrad 0:cdf462088d13 463
markrad 0:cdf462088d13 464 /*
markrad 0:cdf462088d13 465 * Generate a ECJPAKEKeyKPPairList
markrad 0:cdf462088d13 466 * Outputs: the serialized structure, plus two private/public key pairs
markrad 0:cdf462088d13 467 */
markrad 0:cdf462088d13 468 static int ecjpake_kkpp_write( const mbedtls_md_info_t *md_info,
markrad 0:cdf462088d13 469 const mbedtls_ecp_group *grp,
markrad 0:cdf462088d13 470 const int pf,
markrad 0:cdf462088d13 471 const mbedtls_ecp_point *G,
markrad 0:cdf462088d13 472 mbedtls_mpi *xm1,
markrad 0:cdf462088d13 473 mbedtls_ecp_point *Xa,
markrad 0:cdf462088d13 474 mbedtls_mpi *xm2,
markrad 0:cdf462088d13 475 mbedtls_ecp_point *Xb,
markrad 0:cdf462088d13 476 const char *id,
markrad 0:cdf462088d13 477 unsigned char *buf,
markrad 0:cdf462088d13 478 size_t len,
markrad 0:cdf462088d13 479 size_t *olen,
markrad 0:cdf462088d13 480 int (*f_rng)(void *, unsigned char *, size_t),
markrad 0:cdf462088d13 481 void *p_rng )
markrad 0:cdf462088d13 482 {
markrad 0:cdf462088d13 483 int ret;
markrad 0:cdf462088d13 484 unsigned char *p = buf;
markrad 0:cdf462088d13 485 const unsigned char *end = buf + len;
markrad 0:cdf462088d13 486
markrad 0:cdf462088d13 487 MBEDTLS_MPI_CHK( ecjpake_kkp_write( md_info, grp, pf, G, xm1, Xa, id,
markrad 0:cdf462088d13 488 &p, end, f_rng, p_rng ) );
markrad 0:cdf462088d13 489 MBEDTLS_MPI_CHK( ecjpake_kkp_write( md_info, grp, pf, G, xm2, Xb, id,
markrad 0:cdf462088d13 490 &p, end, f_rng, p_rng ) );
markrad 0:cdf462088d13 491
markrad 0:cdf462088d13 492 *olen = p - buf;
markrad 0:cdf462088d13 493
markrad 0:cdf462088d13 494 cleanup:
markrad 0:cdf462088d13 495 return( ret );
markrad 0:cdf462088d13 496 }
markrad 0:cdf462088d13 497
markrad 0:cdf462088d13 498 /*
markrad 0:cdf462088d13 499 * Read and process the first round message
markrad 0:cdf462088d13 500 */
markrad 0:cdf462088d13 501 int mbedtls_ecjpake_read_round_one( mbedtls_ecjpake_context *ctx,
markrad 0:cdf462088d13 502 const unsigned char *buf,
markrad 0:cdf462088d13 503 size_t len )
markrad 0:cdf462088d13 504 {
markrad 0:cdf462088d13 505 return( ecjpake_kkpp_read( ctx->md_info, &ctx->grp, ctx->point_format,
markrad 0:cdf462088d13 506 &ctx->grp.G,
markrad 0:cdf462088d13 507 &ctx->Xp1, &ctx->Xp2, ID_PEER,
markrad 0:cdf462088d13 508 buf, len ) );
markrad 0:cdf462088d13 509 }
markrad 0:cdf462088d13 510
markrad 0:cdf462088d13 511 /*
markrad 0:cdf462088d13 512 * Generate and write the first round message
markrad 0:cdf462088d13 513 */
markrad 0:cdf462088d13 514 int mbedtls_ecjpake_write_round_one( mbedtls_ecjpake_context *ctx,
markrad 0:cdf462088d13 515 unsigned char *buf, size_t len, size_t *olen,
markrad 0:cdf462088d13 516 int (*f_rng)(void *, unsigned char *, size_t),
markrad 0:cdf462088d13 517 void *p_rng )
markrad 0:cdf462088d13 518 {
markrad 0:cdf462088d13 519 return( ecjpake_kkpp_write( ctx->md_info, &ctx->grp, ctx->point_format,
markrad 0:cdf462088d13 520 &ctx->grp.G,
markrad 0:cdf462088d13 521 &ctx->xm1, &ctx->Xm1, &ctx->xm2, &ctx->Xm2,
markrad 0:cdf462088d13 522 ID_MINE, buf, len, olen, f_rng, p_rng ) );
markrad 0:cdf462088d13 523 }
markrad 0:cdf462088d13 524
markrad 0:cdf462088d13 525 /*
markrad 0:cdf462088d13 526 * Compute the sum of three points R = A + B + C
markrad 0:cdf462088d13 527 */
markrad 0:cdf462088d13 528 static int ecjpake_ecp_add3( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
markrad 0:cdf462088d13 529 const mbedtls_ecp_point *A,
markrad 0:cdf462088d13 530 const mbedtls_ecp_point *B,
markrad 0:cdf462088d13 531 const mbedtls_ecp_point *C )
markrad 0:cdf462088d13 532 {
markrad 0:cdf462088d13 533 int ret;
markrad 0:cdf462088d13 534 mbedtls_mpi one;
markrad 0:cdf462088d13 535
markrad 0:cdf462088d13 536 mbedtls_mpi_init( &one );
markrad 0:cdf462088d13 537
markrad 0:cdf462088d13 538 MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &one, 1 ) );
markrad 0:cdf462088d13 539 MBEDTLS_MPI_CHK( mbedtls_ecp_muladd( grp, R, &one, A, &one, B ) );
markrad 0:cdf462088d13 540 MBEDTLS_MPI_CHK( mbedtls_ecp_muladd( grp, R, &one, R, &one, C ) );
markrad 0:cdf462088d13 541
markrad 0:cdf462088d13 542 cleanup:
markrad 0:cdf462088d13 543 mbedtls_mpi_free( &one );
markrad 0:cdf462088d13 544
markrad 0:cdf462088d13 545 return( ret );
markrad 0:cdf462088d13 546 }
markrad 0:cdf462088d13 547
markrad 0:cdf462088d13 548 /*
markrad 0:cdf462088d13 549 * Read and process second round message (C: 7.4.2.5, S: 7.4.2.6)
markrad 0:cdf462088d13 550 */
markrad 0:cdf462088d13 551 int mbedtls_ecjpake_read_round_two( mbedtls_ecjpake_context *ctx,
markrad 0:cdf462088d13 552 const unsigned char *buf,
markrad 0:cdf462088d13 553 size_t len )
markrad 0:cdf462088d13 554 {
markrad 0:cdf462088d13 555 int ret;
markrad 0:cdf462088d13 556 const unsigned char *p = buf;
markrad 0:cdf462088d13 557 const unsigned char *end = buf + len;
markrad 0:cdf462088d13 558 mbedtls_ecp_group grp;
markrad 0:cdf462088d13 559 mbedtls_ecp_point G; /* C: GB, S: GA */
markrad 0:cdf462088d13 560
markrad 0:cdf462088d13 561 mbedtls_ecp_group_init( &grp );
markrad 0:cdf462088d13 562 mbedtls_ecp_point_init( &G );
markrad 0:cdf462088d13 563
markrad 0:cdf462088d13 564 /*
markrad 0:cdf462088d13 565 * Server: GA = X3 + X4 + X1 (7.4.2.6.1)
markrad 0:cdf462088d13 566 * Client: GB = X1 + X2 + X3 (7.4.2.5.1)
markrad 0:cdf462088d13 567 * Unified: G = Xm1 + Xm2 + Xp1
markrad 0:cdf462088d13 568 * We need that before parsing in order to check Xp as we read it
markrad 0:cdf462088d13 569 */
markrad 0:cdf462088d13 570 MBEDTLS_MPI_CHK( ecjpake_ecp_add3( &ctx->grp, &G,
markrad 0:cdf462088d13 571 &ctx->Xm1, &ctx->Xm2, &ctx->Xp1 ) );
markrad 0:cdf462088d13 572
markrad 0:cdf462088d13 573 /*
markrad 0:cdf462088d13 574 * struct {
markrad 0:cdf462088d13 575 * ECParameters curve_params; // only client reading server msg
markrad 0:cdf462088d13 576 * ECJPAKEKeyKP ecjpake_key_kp;
markrad 0:cdf462088d13 577 * } Client/ServerECJPAKEParams;
markrad 0:cdf462088d13 578 */
markrad 0:cdf462088d13 579 if( ctx->role == MBEDTLS_ECJPAKE_CLIENT )
markrad 0:cdf462088d13 580 {
markrad 0:cdf462088d13 581 MBEDTLS_MPI_CHK( mbedtls_ecp_tls_read_group( &grp, &p, len ) );
markrad 0:cdf462088d13 582 if( grp.id != ctx->grp.id )
markrad 0:cdf462088d13 583 {
markrad 0:cdf462088d13 584 ret = MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE;
markrad 0:cdf462088d13 585 goto cleanup;
markrad 0:cdf462088d13 586 }
markrad 0:cdf462088d13 587 }
markrad 0:cdf462088d13 588
markrad 0:cdf462088d13 589 MBEDTLS_MPI_CHK( ecjpake_kkp_read( ctx->md_info, &ctx->grp,
markrad 0:cdf462088d13 590 ctx->point_format,
markrad 0:cdf462088d13 591 &G, &ctx->Xp, ID_PEER, &p, end ) );
markrad 0:cdf462088d13 592
markrad 0:cdf462088d13 593 if( p != end )
markrad 0:cdf462088d13 594 {
markrad 0:cdf462088d13 595 ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
markrad 0:cdf462088d13 596 goto cleanup;
markrad 0:cdf462088d13 597 }
markrad 0:cdf462088d13 598
markrad 0:cdf462088d13 599 cleanup:
markrad 0:cdf462088d13 600 mbedtls_ecp_group_free( &grp );
markrad 0:cdf462088d13 601 mbedtls_ecp_point_free( &G );
markrad 0:cdf462088d13 602
markrad 0:cdf462088d13 603 return( ret );
markrad 0:cdf462088d13 604 }
markrad 0:cdf462088d13 605
markrad 0:cdf462088d13 606 /*
markrad 0:cdf462088d13 607 * Compute R = +/- X * S mod N, taking care not to leak S
markrad 0:cdf462088d13 608 */
markrad 0:cdf462088d13 609 static int ecjpake_mul_secret( mbedtls_mpi *R, int sign,
markrad 0:cdf462088d13 610 const mbedtls_mpi *X,
markrad 0:cdf462088d13 611 const mbedtls_mpi *S,
markrad 0:cdf462088d13 612 const mbedtls_mpi *N,
markrad 0:cdf462088d13 613 int (*f_rng)(void *, unsigned char *, size_t),
markrad 0:cdf462088d13 614 void *p_rng )
markrad 0:cdf462088d13 615 {
markrad 0:cdf462088d13 616 int ret;
markrad 0:cdf462088d13 617 mbedtls_mpi b; /* Blinding value, then s + N * blinding */
markrad 0:cdf462088d13 618
markrad 0:cdf462088d13 619 mbedtls_mpi_init( &b );
markrad 0:cdf462088d13 620
markrad 0:cdf462088d13 621 /* b = s + rnd-128-bit * N */
markrad 0:cdf462088d13 622 MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &b, 16, f_rng, p_rng ) );
markrad 0:cdf462088d13 623 MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &b, &b, N ) );
markrad 0:cdf462088d13 624 MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &b, &b, S ) );
markrad 0:cdf462088d13 625
markrad 0:cdf462088d13 626 /* R = sign * X * b mod N */
markrad 0:cdf462088d13 627 MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( R, X, &b ) );
markrad 0:cdf462088d13 628 R->s *= sign;
markrad 0:cdf462088d13 629 MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( R, R, N ) );
markrad 0:cdf462088d13 630
markrad 0:cdf462088d13 631 cleanup:
markrad 0:cdf462088d13 632 mbedtls_mpi_free( &b );
markrad 0:cdf462088d13 633
markrad 0:cdf462088d13 634 return( ret );
markrad 0:cdf462088d13 635 }
markrad 0:cdf462088d13 636
markrad 0:cdf462088d13 637 /*
markrad 0:cdf462088d13 638 * Generate and write the second round message (S: 7.4.2.5, C: 7.4.2.6)
markrad 0:cdf462088d13 639 */
markrad 0:cdf462088d13 640 int mbedtls_ecjpake_write_round_two( mbedtls_ecjpake_context *ctx,
markrad 0:cdf462088d13 641 unsigned char *buf, size_t len, size_t *olen,
markrad 0:cdf462088d13 642 int (*f_rng)(void *, unsigned char *, size_t),
markrad 0:cdf462088d13 643 void *p_rng )
markrad 0:cdf462088d13 644 {
markrad 0:cdf462088d13 645 int ret;
markrad 0:cdf462088d13 646 mbedtls_ecp_point G; /* C: GA, S: GB */
markrad 0:cdf462088d13 647 mbedtls_ecp_point Xm; /* C: Xc, S: Xs */
markrad 0:cdf462088d13 648 mbedtls_mpi xm; /* C: xc, S: xs */
markrad 0:cdf462088d13 649 unsigned char *p = buf;
markrad 0:cdf462088d13 650 const unsigned char *end = buf + len;
markrad 0:cdf462088d13 651 size_t ec_len;
markrad 0:cdf462088d13 652
markrad 0:cdf462088d13 653 mbedtls_ecp_point_init( &G );
markrad 0:cdf462088d13 654 mbedtls_ecp_point_init( &Xm );
markrad 0:cdf462088d13 655 mbedtls_mpi_init( &xm );
markrad 0:cdf462088d13 656
markrad 0:cdf462088d13 657 /*
markrad 0:cdf462088d13 658 * First generate private/public key pair (S: 7.4.2.5.1, C: 7.4.2.6.1)
markrad 0:cdf462088d13 659 *
markrad 0:cdf462088d13 660 * Client: GA = X1 + X3 + X4 | xs = x2 * s | Xc = xc * GA
markrad 0:cdf462088d13 661 * Server: GB = X3 + X1 + X2 | xs = x4 * s | Xs = xs * GB
markrad 0:cdf462088d13 662 * Unified: G = Xm1 + Xp1 + Xp2 | xm = xm2 * s | Xm = xm * G
markrad 0:cdf462088d13 663 */
markrad 0:cdf462088d13 664 MBEDTLS_MPI_CHK( ecjpake_ecp_add3( &ctx->grp, &G,
markrad 0:cdf462088d13 665 &ctx->Xp1, &ctx->Xp2, &ctx->Xm1 ) );
markrad 0:cdf462088d13 666 MBEDTLS_MPI_CHK( ecjpake_mul_secret( &xm, 1, &ctx->xm2, &ctx->s,
markrad 0:cdf462088d13 667 &ctx->grp.N, f_rng, p_rng ) );
markrad 0:cdf462088d13 668 MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &ctx->grp, &Xm, &xm, &G, f_rng, p_rng ) );
markrad 0:cdf462088d13 669
markrad 0:cdf462088d13 670 /*
markrad 0:cdf462088d13 671 * Now write things out
markrad 0:cdf462088d13 672 *
markrad 0:cdf462088d13 673 * struct {
markrad 0:cdf462088d13 674 * ECParameters curve_params; // only server writing its message
markrad 0:cdf462088d13 675 * ECJPAKEKeyKP ecjpake_key_kp;
markrad 0:cdf462088d13 676 * } Client/ServerECJPAKEParams;
markrad 0:cdf462088d13 677 */
markrad 0:cdf462088d13 678 if( ctx->role == MBEDTLS_ECJPAKE_SERVER )
markrad 0:cdf462088d13 679 {
markrad 0:cdf462088d13 680 if( end < p )
markrad 0:cdf462088d13 681 {
markrad 0:cdf462088d13 682 ret = MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL;
markrad 0:cdf462088d13 683 goto cleanup;
markrad 0:cdf462088d13 684 }
markrad 0:cdf462088d13 685 MBEDTLS_MPI_CHK( mbedtls_ecp_tls_write_group( &ctx->grp, &ec_len,
markrad 0:cdf462088d13 686 p, end - p ) );
markrad 0:cdf462088d13 687 p += ec_len;
markrad 0:cdf462088d13 688 }
markrad 0:cdf462088d13 689
markrad 0:cdf462088d13 690 if( end < p )
markrad 0:cdf462088d13 691 {
markrad 0:cdf462088d13 692 ret = MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL;
markrad 0:cdf462088d13 693 goto cleanup;
markrad 0:cdf462088d13 694 }
markrad 0:cdf462088d13 695 MBEDTLS_MPI_CHK( mbedtls_ecp_tls_write_point( &ctx->grp, &Xm,
markrad 0:cdf462088d13 696 ctx->point_format, &ec_len, p, end - p ) );
markrad 0:cdf462088d13 697 p += ec_len;
markrad 0:cdf462088d13 698
markrad 0:cdf462088d13 699 MBEDTLS_MPI_CHK( ecjpake_zkp_write( ctx->md_info, &ctx->grp,
markrad 0:cdf462088d13 700 ctx->point_format,
markrad 0:cdf462088d13 701 &G, &xm, &Xm, ID_MINE,
markrad 0:cdf462088d13 702 &p, end, f_rng, p_rng ) );
markrad 0:cdf462088d13 703
markrad 0:cdf462088d13 704 *olen = p - buf;
markrad 0:cdf462088d13 705
markrad 0:cdf462088d13 706 cleanup:
markrad 0:cdf462088d13 707 mbedtls_ecp_point_free( &G );
markrad 0:cdf462088d13 708 mbedtls_ecp_point_free( &Xm );
markrad 0:cdf462088d13 709 mbedtls_mpi_free( &xm );
markrad 0:cdf462088d13 710
markrad 0:cdf462088d13 711 return( ret );
markrad 0:cdf462088d13 712 }
markrad 0:cdf462088d13 713
markrad 0:cdf462088d13 714 /*
markrad 0:cdf462088d13 715 * Derive PMS (7.4.2.7 / 7.4.2.8)
markrad 0:cdf462088d13 716 */
markrad 0:cdf462088d13 717 int mbedtls_ecjpake_derive_secret( mbedtls_ecjpake_context *ctx,
markrad 0:cdf462088d13 718 unsigned char *buf, size_t len, size_t *olen,
markrad 0:cdf462088d13 719 int (*f_rng)(void *, unsigned char *, size_t),
markrad 0:cdf462088d13 720 void *p_rng )
markrad 0:cdf462088d13 721 {
markrad 0:cdf462088d13 722 int ret;
markrad 0:cdf462088d13 723 mbedtls_ecp_point K;
markrad 0:cdf462088d13 724 mbedtls_mpi m_xm2_s, one;
markrad 0:cdf462088d13 725 unsigned char kx[MBEDTLS_ECP_MAX_BYTES];
markrad 0:cdf462088d13 726 size_t x_bytes;
markrad 0:cdf462088d13 727
markrad 0:cdf462088d13 728 *olen = mbedtls_md_get_size( ctx->md_info );
markrad 0:cdf462088d13 729 if( len < *olen )
markrad 0:cdf462088d13 730 return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
markrad 0:cdf462088d13 731
markrad 0:cdf462088d13 732 mbedtls_ecp_point_init( &K );
markrad 0:cdf462088d13 733 mbedtls_mpi_init( &m_xm2_s );
markrad 0:cdf462088d13 734 mbedtls_mpi_init( &one );
markrad 0:cdf462088d13 735
markrad 0:cdf462088d13 736 MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &one, 1 ) );
markrad 0:cdf462088d13 737
markrad 0:cdf462088d13 738 /*
markrad 0:cdf462088d13 739 * Client: K = ( Xs - X4 * x2 * s ) * x2
markrad 0:cdf462088d13 740 * Server: K = ( Xc - X2 * x4 * s ) * x4
markrad 0:cdf462088d13 741 * Unified: K = ( Xp - Xp2 * xm2 * s ) * xm2
markrad 0:cdf462088d13 742 */
markrad 0:cdf462088d13 743 MBEDTLS_MPI_CHK( ecjpake_mul_secret( &m_xm2_s, -1, &ctx->xm2, &ctx->s,
markrad 0:cdf462088d13 744 &ctx->grp.N, f_rng, p_rng ) );
markrad 0:cdf462088d13 745 MBEDTLS_MPI_CHK( mbedtls_ecp_muladd( &ctx->grp, &K,
markrad 0:cdf462088d13 746 &one, &ctx->Xp,
markrad 0:cdf462088d13 747 &m_xm2_s, &ctx->Xp2 ) );
markrad 0:cdf462088d13 748 MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &ctx->grp, &K, &ctx->xm2, &K,
markrad 0:cdf462088d13 749 f_rng, p_rng ) );
markrad 0:cdf462088d13 750
markrad 0:cdf462088d13 751 /* PMS = SHA-256( K.X ) */
markrad 0:cdf462088d13 752 x_bytes = ( ctx->grp.pbits + 7 ) / 8;
markrad 0:cdf462088d13 753 MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &K.X, kx, x_bytes ) );
markrad 0:cdf462088d13 754 MBEDTLS_MPI_CHK( mbedtls_md( ctx->md_info, kx, x_bytes, buf ) );
markrad 0:cdf462088d13 755
markrad 0:cdf462088d13 756 cleanup:
markrad 0:cdf462088d13 757 mbedtls_ecp_point_free( &K );
markrad 0:cdf462088d13 758 mbedtls_mpi_free( &m_xm2_s );
markrad 0:cdf462088d13 759 mbedtls_mpi_free( &one );
markrad 0:cdf462088d13 760
markrad 0:cdf462088d13 761 return( ret );
markrad 0:cdf462088d13 762 }
markrad 0:cdf462088d13 763
markrad 0:cdf462088d13 764 #undef ID_MINE
markrad 0:cdf462088d13 765 #undef ID_PEER
markrad 0:cdf462088d13 766
markrad 0:cdf462088d13 767
markrad 0:cdf462088d13 768 #if defined(MBEDTLS_SELF_TEST)
markrad 0:cdf462088d13 769
markrad 0:cdf462088d13 770 #if defined(MBEDTLS_PLATFORM_C)
markrad 0:cdf462088d13 771 #include "mbedtls/platform.h"
markrad 0:cdf462088d13 772 #else
markrad 0:cdf462088d13 773 #include <stdio.h>
markrad 0:cdf462088d13 774 #define mbedtls_printf printf
markrad 0:cdf462088d13 775 #endif
markrad 0:cdf462088d13 776
markrad 0:cdf462088d13 777 #if !defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED) || \
markrad 0:cdf462088d13 778 !defined(MBEDTLS_SHA256_C)
markrad 0:cdf462088d13 779 int mbedtls_ecjpake_self_test( int verbose )
markrad 0:cdf462088d13 780 {
markrad 0:cdf462088d13 781 (void) verbose;
markrad 0:cdf462088d13 782 return( 0 );
markrad 0:cdf462088d13 783 }
markrad 0:cdf462088d13 784 #else
markrad 0:cdf462088d13 785
markrad 0:cdf462088d13 786 static const unsigned char ecjpake_test_password[] = {
markrad 0:cdf462088d13 787 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x6a, 0x70, 0x61, 0x6b, 0x65, 0x74,
markrad 0:cdf462088d13 788 0x65, 0x73, 0x74
markrad 0:cdf462088d13 789 };
markrad 0:cdf462088d13 790
markrad 0:cdf462088d13 791 static const unsigned char ecjpake_test_x1[] = {
markrad 0:cdf462088d13 792 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c,
markrad 0:cdf462088d13 793 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
markrad 0:cdf462088d13 794 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x21
markrad 0:cdf462088d13 795 };
markrad 0:cdf462088d13 796
markrad 0:cdf462088d13 797 static const unsigned char ecjpake_test_x2[] = {
markrad 0:cdf462088d13 798 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c,
markrad 0:cdf462088d13 799 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
markrad 0:cdf462088d13 800 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x81
markrad 0:cdf462088d13 801 };
markrad 0:cdf462088d13 802
markrad 0:cdf462088d13 803 static const unsigned char ecjpake_test_x3[] = {
markrad 0:cdf462088d13 804 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c,
markrad 0:cdf462088d13 805 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
markrad 0:cdf462088d13 806 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x81
markrad 0:cdf462088d13 807 };
markrad 0:cdf462088d13 808
markrad 0:cdf462088d13 809 static const unsigned char ecjpake_test_x4[] = {
markrad 0:cdf462088d13 810 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc,
markrad 0:cdf462088d13 811 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8,
markrad 0:cdf462088d13 812 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe1
markrad 0:cdf462088d13 813 };
markrad 0:cdf462088d13 814
markrad 0:cdf462088d13 815 static const unsigned char ecjpake_test_cli_one[] = {
markrad 0:cdf462088d13 816 0x41, 0x04, 0xac, 0xcf, 0x01, 0x06, 0xef, 0x85, 0x8f, 0xa2, 0xd9, 0x19,
markrad 0:cdf462088d13 817 0x33, 0x13, 0x46, 0x80, 0x5a, 0x78, 0xb5, 0x8b, 0xba, 0xd0, 0xb8, 0x44,
markrad 0:cdf462088d13 818 0xe5, 0xc7, 0x89, 0x28, 0x79, 0x14, 0x61, 0x87, 0xdd, 0x26, 0x66, 0xad,
markrad 0:cdf462088d13 819 0xa7, 0x81, 0xbb, 0x7f, 0x11, 0x13, 0x72, 0x25, 0x1a, 0x89, 0x10, 0x62,
markrad 0:cdf462088d13 820 0x1f, 0x63, 0x4d, 0xf1, 0x28, 0xac, 0x48, 0xe3, 0x81, 0xfd, 0x6e, 0xf9,
markrad 0:cdf462088d13 821 0x06, 0x07, 0x31, 0xf6, 0x94, 0xa4, 0x41, 0x04, 0x1d, 0xd0, 0xbd, 0x5d,
markrad 0:cdf462088d13 822 0x45, 0x66, 0xc9, 0xbe, 0xd9, 0xce, 0x7d, 0xe7, 0x01, 0xb5, 0xe8, 0x2e,
markrad 0:cdf462088d13 823 0x08, 0xe8, 0x4b, 0x73, 0x04, 0x66, 0x01, 0x8a, 0xb9, 0x03, 0xc7, 0x9e,
markrad 0:cdf462088d13 824 0xb9, 0x82, 0x17, 0x22, 0x36, 0xc0, 0xc1, 0x72, 0x8a, 0xe4, 0xbf, 0x73,
markrad 0:cdf462088d13 825 0x61, 0x0d, 0x34, 0xde, 0x44, 0x24, 0x6e, 0xf3, 0xd9, 0xc0, 0x5a, 0x22,
markrad 0:cdf462088d13 826 0x36, 0xfb, 0x66, 0xa6, 0x58, 0x3d, 0x74, 0x49, 0x30, 0x8b, 0xab, 0xce,
markrad 0:cdf462088d13 827 0x20, 0x72, 0xfe, 0x16, 0x66, 0x29, 0x92, 0xe9, 0x23, 0x5c, 0x25, 0x00,
markrad 0:cdf462088d13 828 0x2f, 0x11, 0xb1, 0x50, 0x87, 0xb8, 0x27, 0x38, 0xe0, 0x3c, 0x94, 0x5b,
markrad 0:cdf462088d13 829 0xf7, 0xa2, 0x99, 0x5d, 0xda, 0x1e, 0x98, 0x34, 0x58, 0x41, 0x04, 0x7e,
markrad 0:cdf462088d13 830 0xa6, 0xe3, 0xa4, 0x48, 0x70, 0x37, 0xa9, 0xe0, 0xdb, 0xd7, 0x92, 0x62,
markrad 0:cdf462088d13 831 0xb2, 0xcc, 0x27, 0x3e, 0x77, 0x99, 0x30, 0xfc, 0x18, 0x40, 0x9a, 0xc5,
markrad 0:cdf462088d13 832 0x36, 0x1c, 0x5f, 0xe6, 0x69, 0xd7, 0x02, 0xe1, 0x47, 0x79, 0x0a, 0xeb,
markrad 0:cdf462088d13 833 0x4c, 0xe7, 0xfd, 0x65, 0x75, 0xab, 0x0f, 0x6c, 0x7f, 0xd1, 0xc3, 0x35,
markrad 0:cdf462088d13 834 0x93, 0x9a, 0xa8, 0x63, 0xba, 0x37, 0xec, 0x91, 0xb7, 0xe3, 0x2b, 0xb0,
markrad 0:cdf462088d13 835 0x13, 0xbb, 0x2b, 0x41, 0x04, 0xa4, 0x95, 0x58, 0xd3, 0x2e, 0xd1, 0xeb,
markrad 0:cdf462088d13 836 0xfc, 0x18, 0x16, 0xaf, 0x4f, 0xf0, 0x9b, 0x55, 0xfc, 0xb4, 0xca, 0x47,
markrad 0:cdf462088d13 837 0xb2, 0xa0, 0x2d, 0x1e, 0x7c, 0xaf, 0x11, 0x79, 0xea, 0x3f, 0xe1, 0x39,
markrad 0:cdf462088d13 838 0x5b, 0x22, 0xb8, 0x61, 0x96, 0x40, 0x16, 0xfa, 0xba, 0xf7, 0x2c, 0x97,
markrad 0:cdf462088d13 839 0x56, 0x95, 0xd9, 0x3d, 0x4d, 0xf0, 0xe5, 0x19, 0x7f, 0xe9, 0xf0, 0x40,
markrad 0:cdf462088d13 840 0x63, 0x4e, 0xd5, 0x97, 0x64, 0x93, 0x77, 0x87, 0xbe, 0x20, 0xbc, 0x4d,
markrad 0:cdf462088d13 841 0xee, 0xbb, 0xf9, 0xb8, 0xd6, 0x0a, 0x33, 0x5f, 0x04, 0x6c, 0xa3, 0xaa,
markrad 0:cdf462088d13 842 0x94, 0x1e, 0x45, 0x86, 0x4c, 0x7c, 0xad, 0xef, 0x9c, 0xf7, 0x5b, 0x3d,
markrad 0:cdf462088d13 843 0x8b, 0x01, 0x0e, 0x44, 0x3e, 0xf0
markrad 0:cdf462088d13 844 };
markrad 0:cdf462088d13 845
markrad 0:cdf462088d13 846 static const unsigned char ecjpake_test_srv_one[] = {
markrad 0:cdf462088d13 847 0x41, 0x04, 0x7e, 0xa6, 0xe3, 0xa4, 0x48, 0x70, 0x37, 0xa9, 0xe0, 0xdb,
markrad 0:cdf462088d13 848 0xd7, 0x92, 0x62, 0xb2, 0xcc, 0x27, 0x3e, 0x77, 0x99, 0x30, 0xfc, 0x18,
markrad 0:cdf462088d13 849 0x40, 0x9a, 0xc5, 0x36, 0x1c, 0x5f, 0xe6, 0x69, 0xd7, 0x02, 0xe1, 0x47,
markrad 0:cdf462088d13 850 0x79, 0x0a, 0xeb, 0x4c, 0xe7, 0xfd, 0x65, 0x75, 0xab, 0x0f, 0x6c, 0x7f,
markrad 0:cdf462088d13 851 0xd1, 0xc3, 0x35, 0x93, 0x9a, 0xa8, 0x63, 0xba, 0x37, 0xec, 0x91, 0xb7,
markrad 0:cdf462088d13 852 0xe3, 0x2b, 0xb0, 0x13, 0xbb, 0x2b, 0x41, 0x04, 0x09, 0xf8, 0x5b, 0x3d,
markrad 0:cdf462088d13 853 0x20, 0xeb, 0xd7, 0x88, 0x5c, 0xe4, 0x64, 0xc0, 0x8d, 0x05, 0x6d, 0x64,
markrad 0:cdf462088d13 854 0x28, 0xfe, 0x4d, 0xd9, 0x28, 0x7a, 0xa3, 0x65, 0xf1, 0x31, 0xf4, 0x36,
markrad 0:cdf462088d13 855 0x0f, 0xf3, 0x86, 0xd8, 0x46, 0x89, 0x8b, 0xc4, 0xb4, 0x15, 0x83, 0xc2,
markrad 0:cdf462088d13 856 0xa5, 0x19, 0x7f, 0x65, 0xd7, 0x87, 0x42, 0x74, 0x6c, 0x12, 0xa5, 0xec,
markrad 0:cdf462088d13 857 0x0a, 0x4f, 0xfe, 0x2f, 0x27, 0x0a, 0x75, 0x0a, 0x1d, 0x8f, 0xb5, 0x16,
markrad 0:cdf462088d13 858 0x20, 0x93, 0x4d, 0x74, 0xeb, 0x43, 0xe5, 0x4d, 0xf4, 0x24, 0xfd, 0x96,
markrad 0:cdf462088d13 859 0x30, 0x6c, 0x01, 0x17, 0xbf, 0x13, 0x1a, 0xfa, 0xbf, 0x90, 0xa9, 0xd3,
markrad 0:cdf462088d13 860 0x3d, 0x11, 0x98, 0xd9, 0x05, 0x19, 0x37, 0x35, 0x14, 0x41, 0x04, 0x19,
markrad 0:cdf462088d13 861 0x0a, 0x07, 0x70, 0x0f, 0xfa, 0x4b, 0xe6, 0xae, 0x1d, 0x79, 0xee, 0x0f,
markrad 0:cdf462088d13 862 0x06, 0xae, 0xb5, 0x44, 0xcd, 0x5a, 0xdd, 0xaa, 0xbe, 0xdf, 0x70, 0xf8,
markrad 0:cdf462088d13 863 0x62, 0x33, 0x21, 0x33, 0x2c, 0x54, 0xf3, 0x55, 0xf0, 0xfb, 0xfe, 0xc7,
markrad 0:cdf462088d13 864 0x83, 0xed, 0x35, 0x9e, 0x5d, 0x0b, 0xf7, 0x37, 0x7a, 0x0f, 0xc4, 0xea,
markrad 0:cdf462088d13 865 0x7a, 0xce, 0x47, 0x3c, 0x9c, 0x11, 0x2b, 0x41, 0xcc, 0xd4, 0x1a, 0xc5,
markrad 0:cdf462088d13 866 0x6a, 0x56, 0x12, 0x41, 0x04, 0x36, 0x0a, 0x1c, 0xea, 0x33, 0xfc, 0xe6,
markrad 0:cdf462088d13 867 0x41, 0x15, 0x64, 0x58, 0xe0, 0xa4, 0xea, 0xc2, 0x19, 0xe9, 0x68, 0x31,
markrad 0:cdf462088d13 868 0xe6, 0xae, 0xbc, 0x88, 0xb3, 0xf3, 0x75, 0x2f, 0x93, 0xa0, 0x28, 0x1d,
markrad 0:cdf462088d13 869 0x1b, 0xf1, 0xfb, 0x10, 0x60, 0x51, 0xdb, 0x96, 0x94, 0xa8, 0xd6, 0xe8,
markrad 0:cdf462088d13 870 0x62, 0xa5, 0xef, 0x13, 0x24, 0xa3, 0xd9, 0xe2, 0x78, 0x94, 0xf1, 0xee,
markrad 0:cdf462088d13 871 0x4f, 0x7c, 0x59, 0x19, 0x99, 0x65, 0xa8, 0xdd, 0x4a, 0x20, 0x91, 0x84,
markrad 0:cdf462088d13 872 0x7d, 0x2d, 0x22, 0xdf, 0x3e, 0xe5, 0x5f, 0xaa, 0x2a, 0x3f, 0xb3, 0x3f,
markrad 0:cdf462088d13 873 0xd2, 0xd1, 0xe0, 0x55, 0xa0, 0x7a, 0x7c, 0x61, 0xec, 0xfb, 0x8d, 0x80,
markrad 0:cdf462088d13 874 0xec, 0x00, 0xc2, 0xc9, 0xeb, 0x12
markrad 0:cdf462088d13 875 };
markrad 0:cdf462088d13 876
markrad 0:cdf462088d13 877 static const unsigned char ecjpake_test_srv_two[] = {
markrad 0:cdf462088d13 878 0x03, 0x00, 0x17, 0x41, 0x04, 0x0f, 0xb2, 0x2b, 0x1d, 0x5d, 0x11, 0x23,
markrad 0:cdf462088d13 879 0xe0, 0xef, 0x9f, 0xeb, 0x9d, 0x8a, 0x2e, 0x59, 0x0a, 0x1f, 0x4d, 0x7c,
markrad 0:cdf462088d13 880 0xed, 0x2c, 0x2b, 0x06, 0x58, 0x6e, 0x8f, 0x2a, 0x16, 0xd4, 0xeb, 0x2f,
markrad 0:cdf462088d13 881 0xda, 0x43, 0x28, 0xa2, 0x0b, 0x07, 0xd8, 0xfd, 0x66, 0x76, 0x54, 0xca,
markrad 0:cdf462088d13 882 0x18, 0xc5, 0x4e, 0x32, 0xa3, 0x33, 0xa0, 0x84, 0x54, 0x51, 0xe9, 0x26,
markrad 0:cdf462088d13 883 0xee, 0x88, 0x04, 0xfd, 0x7a, 0xf0, 0xaa, 0xa7, 0xa6, 0x41, 0x04, 0x55,
markrad 0:cdf462088d13 884 0x16, 0xea, 0x3e, 0x54, 0xa0, 0xd5, 0xd8, 0xb2, 0xce, 0x78, 0x6b, 0x38,
markrad 0:cdf462088d13 885 0xd3, 0x83, 0x37, 0x00, 0x29, 0xa5, 0xdb, 0xe4, 0x45, 0x9c, 0x9d, 0xd6,
markrad 0:cdf462088d13 886 0x01, 0xb4, 0x08, 0xa2, 0x4a, 0xe6, 0x46, 0x5c, 0x8a, 0xc9, 0x05, 0xb9,
markrad 0:cdf462088d13 887 0xeb, 0x03, 0xb5, 0xd3, 0x69, 0x1c, 0x13, 0x9e, 0xf8, 0x3f, 0x1c, 0xd4,
markrad 0:cdf462088d13 888 0x20, 0x0f, 0x6c, 0x9c, 0xd4, 0xec, 0x39, 0x22, 0x18, 0xa5, 0x9e, 0xd2,
markrad 0:cdf462088d13 889 0x43, 0xd3, 0xc8, 0x20, 0xff, 0x72, 0x4a, 0x9a, 0x70, 0xb8, 0x8c, 0xb8,
markrad 0:cdf462088d13 890 0x6f, 0x20, 0xb4, 0x34, 0xc6, 0x86, 0x5a, 0xa1, 0xcd, 0x79, 0x06, 0xdd,
markrad 0:cdf462088d13 891 0x7c, 0x9b, 0xce, 0x35, 0x25, 0xf5, 0x08, 0x27, 0x6f, 0x26, 0x83, 0x6c
markrad 0:cdf462088d13 892 };
markrad 0:cdf462088d13 893
markrad 0:cdf462088d13 894 static const unsigned char ecjpake_test_cli_two[] = {
markrad 0:cdf462088d13 895 0x41, 0x04, 0x69, 0xd5, 0x4e, 0xe8, 0x5e, 0x90, 0xce, 0x3f, 0x12, 0x46,
markrad 0:cdf462088d13 896 0x74, 0x2d, 0xe5, 0x07, 0xe9, 0x39, 0xe8, 0x1d, 0x1d, 0xc1, 0xc5, 0xcb,
markrad 0:cdf462088d13 897 0x98, 0x8b, 0x58, 0xc3, 0x10, 0xc9, 0xfd, 0xd9, 0x52, 0x4d, 0x93, 0x72,
markrad 0:cdf462088d13 898 0x0b, 0x45, 0x54, 0x1c, 0x83, 0xee, 0x88, 0x41, 0x19, 0x1d, 0xa7, 0xce,
markrad 0:cdf462088d13 899 0xd8, 0x6e, 0x33, 0x12, 0xd4, 0x36, 0x23, 0xc1, 0xd6, 0x3e, 0x74, 0x98,
markrad 0:cdf462088d13 900 0x9a, 0xba, 0x4a, 0xff, 0xd1, 0xee, 0x41, 0x04, 0x07, 0x7e, 0x8c, 0x31,
markrad 0:cdf462088d13 901 0xe2, 0x0e, 0x6b, 0xed, 0xb7, 0x60, 0xc1, 0x35, 0x93, 0xe6, 0x9f, 0x15,
markrad 0:cdf462088d13 902 0xbe, 0x85, 0xc2, 0x7d, 0x68, 0xcd, 0x09, 0xcc, 0xb8, 0xc4, 0x18, 0x36,
markrad 0:cdf462088d13 903 0x08, 0x91, 0x7c, 0x5c, 0x3d, 0x40, 0x9f, 0xac, 0x39, 0xfe, 0xfe, 0xe8,
markrad 0:cdf462088d13 904 0x2f, 0x72, 0x92, 0xd3, 0x6f, 0x0d, 0x23, 0xe0, 0x55, 0x91, 0x3f, 0x45,
markrad 0:cdf462088d13 905 0xa5, 0x2b, 0x85, 0xdd, 0x8a, 0x20, 0x52, 0xe9, 0xe1, 0x29, 0xbb, 0x4d,
markrad 0:cdf462088d13 906 0x20, 0x0f, 0x01, 0x1f, 0x19, 0x48, 0x35, 0x35, 0xa6, 0xe8, 0x9a, 0x58,
markrad 0:cdf462088d13 907 0x0c, 0x9b, 0x00, 0x03, 0xba, 0xf2, 0x14, 0x62, 0xec, 0xe9, 0x1a, 0x82,
markrad 0:cdf462088d13 908 0xcc, 0x38, 0xdb, 0xdc, 0xae, 0x60, 0xd9, 0xc5, 0x4c
markrad 0:cdf462088d13 909 };
markrad 0:cdf462088d13 910
markrad 0:cdf462088d13 911 static const unsigned char ecjpake_test_pms[] = {
markrad 0:cdf462088d13 912 0xf3, 0xd4, 0x7f, 0x59, 0x98, 0x44, 0xdb, 0x92, 0xa5, 0x69, 0xbb, 0xe7,
markrad 0:cdf462088d13 913 0x98, 0x1e, 0x39, 0xd9, 0x31, 0xfd, 0x74, 0x3b, 0xf2, 0x2e, 0x98, 0xf9,
markrad 0:cdf462088d13 914 0xb4, 0x38, 0xf7, 0x19, 0xd3, 0xc4, 0xf3, 0x51
markrad 0:cdf462088d13 915 };
markrad 0:cdf462088d13 916
markrad 0:cdf462088d13 917 /* Load my private keys and generate the correponding public keys */
markrad 0:cdf462088d13 918 static int ecjpake_test_load( mbedtls_ecjpake_context *ctx,
markrad 0:cdf462088d13 919 const unsigned char *xm1, size_t len1,
markrad 0:cdf462088d13 920 const unsigned char *xm2, size_t len2 )
markrad 0:cdf462088d13 921 {
markrad 0:cdf462088d13 922 int ret;
markrad 0:cdf462088d13 923
markrad 0:cdf462088d13 924 MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &ctx->xm1, xm1, len1 ) );
markrad 0:cdf462088d13 925 MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &ctx->xm2, xm2, len2 ) );
markrad 0:cdf462088d13 926 MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &ctx->grp, &ctx->Xm1, &ctx->xm1,
markrad 0:cdf462088d13 927 &ctx->grp.G, NULL, NULL ) );
markrad 0:cdf462088d13 928 MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &ctx->grp, &ctx->Xm2, &ctx->xm2,
markrad 0:cdf462088d13 929 &ctx->grp.G, NULL, NULL ) );
markrad 0:cdf462088d13 930
markrad 0:cdf462088d13 931 cleanup:
markrad 0:cdf462088d13 932 return( ret );
markrad 0:cdf462088d13 933 }
markrad 0:cdf462088d13 934
markrad 0:cdf462088d13 935 /* For tests we don't need a secure RNG;
markrad 0:cdf462088d13 936 * use the LGC from Numerical Recipes for simplicity */
markrad 0:cdf462088d13 937 static int ecjpake_lgc( void *p, unsigned char *out, size_t len )
markrad 0:cdf462088d13 938 {
markrad 0:cdf462088d13 939 static uint32_t x = 42;
markrad 0:cdf462088d13 940 (void) p;
markrad 0:cdf462088d13 941
markrad 0:cdf462088d13 942 while( len > 0 )
markrad 0:cdf462088d13 943 {
markrad 0:cdf462088d13 944 size_t use_len = len > 4 ? 4 : len;
markrad 0:cdf462088d13 945 x = 1664525 * x + 1013904223;
markrad 0:cdf462088d13 946 memcpy( out, &x, use_len );
markrad 0:cdf462088d13 947 out += use_len;
markrad 0:cdf462088d13 948 len -= use_len;
markrad 0:cdf462088d13 949 }
markrad 0:cdf462088d13 950
markrad 0:cdf462088d13 951 return( 0 );
markrad 0:cdf462088d13 952 }
markrad 0:cdf462088d13 953
markrad 0:cdf462088d13 954 #define TEST_ASSERT( x ) \
markrad 0:cdf462088d13 955 do { \
markrad 0:cdf462088d13 956 if( x ) \
markrad 0:cdf462088d13 957 ret = 0; \
markrad 0:cdf462088d13 958 else \
markrad 0:cdf462088d13 959 { \
markrad 0:cdf462088d13 960 ret = 1; \
markrad 0:cdf462088d13 961 goto cleanup; \
markrad 0:cdf462088d13 962 } \
markrad 0:cdf462088d13 963 } while( 0 )
markrad 0:cdf462088d13 964
markrad 0:cdf462088d13 965 /*
markrad 0:cdf462088d13 966 * Checkup routine
markrad 0:cdf462088d13 967 */
markrad 0:cdf462088d13 968 int mbedtls_ecjpake_self_test( int verbose )
markrad 0:cdf462088d13 969 {
markrad 0:cdf462088d13 970 int ret;
markrad 0:cdf462088d13 971 mbedtls_ecjpake_context cli;
markrad 0:cdf462088d13 972 mbedtls_ecjpake_context srv;
markrad 0:cdf462088d13 973 unsigned char buf[512], pms[32];
markrad 0:cdf462088d13 974 size_t len, pmslen;
markrad 0:cdf462088d13 975
markrad 0:cdf462088d13 976 mbedtls_ecjpake_init( &cli );
markrad 0:cdf462088d13 977 mbedtls_ecjpake_init( &srv );
markrad 0:cdf462088d13 978
markrad 0:cdf462088d13 979 if( verbose != 0 )
markrad 0:cdf462088d13 980 mbedtls_printf( " ECJPAKE test #0 (setup): " );
markrad 0:cdf462088d13 981
markrad 0:cdf462088d13 982 TEST_ASSERT( mbedtls_ecjpake_setup( &cli, MBEDTLS_ECJPAKE_CLIENT,
markrad 0:cdf462088d13 983 MBEDTLS_MD_SHA256, MBEDTLS_ECP_DP_SECP256R1,
markrad 0:cdf462088d13 984 ecjpake_test_password,
markrad 0:cdf462088d13 985 sizeof( ecjpake_test_password ) ) == 0 );
markrad 0:cdf462088d13 986
markrad 0:cdf462088d13 987 TEST_ASSERT( mbedtls_ecjpake_setup( &srv, MBEDTLS_ECJPAKE_SERVER,
markrad 0:cdf462088d13 988 MBEDTLS_MD_SHA256, MBEDTLS_ECP_DP_SECP256R1,
markrad 0:cdf462088d13 989 ecjpake_test_password,
markrad 0:cdf462088d13 990 sizeof( ecjpake_test_password ) ) == 0 );
markrad 0:cdf462088d13 991
markrad 0:cdf462088d13 992 if( verbose != 0 )
markrad 0:cdf462088d13 993 mbedtls_printf( "passed\n" );
markrad 0:cdf462088d13 994
markrad 0:cdf462088d13 995 if( verbose != 0 )
markrad 0:cdf462088d13 996 mbedtls_printf( " ECJPAKE test #1 (random handshake): " );
markrad 0:cdf462088d13 997
markrad 0:cdf462088d13 998 TEST_ASSERT( mbedtls_ecjpake_write_round_one( &cli,
markrad 0:cdf462088d13 999 buf, sizeof( buf ), &len, ecjpake_lgc, NULL ) == 0 );
markrad 0:cdf462088d13 1000
markrad 0:cdf462088d13 1001 TEST_ASSERT( mbedtls_ecjpake_read_round_one( &srv, buf, len ) == 0 );
markrad 0:cdf462088d13 1002
markrad 0:cdf462088d13 1003 TEST_ASSERT( mbedtls_ecjpake_write_round_one( &srv,
markrad 0:cdf462088d13 1004 buf, sizeof( buf ), &len, ecjpake_lgc, NULL ) == 0 );
markrad 0:cdf462088d13 1005
markrad 0:cdf462088d13 1006 TEST_ASSERT( mbedtls_ecjpake_read_round_one( &cli, buf, len ) == 0 );
markrad 0:cdf462088d13 1007
markrad 0:cdf462088d13 1008 TEST_ASSERT( mbedtls_ecjpake_write_round_two( &srv,
markrad 0:cdf462088d13 1009 buf, sizeof( buf ), &len, ecjpake_lgc, NULL ) == 0 );
markrad 0:cdf462088d13 1010
markrad 0:cdf462088d13 1011 TEST_ASSERT( mbedtls_ecjpake_read_round_two( &cli, buf, len ) == 0 );
markrad 0:cdf462088d13 1012
markrad 0:cdf462088d13 1013 TEST_ASSERT( mbedtls_ecjpake_derive_secret( &cli,
markrad 0:cdf462088d13 1014 pms, sizeof( pms ), &pmslen, ecjpake_lgc, NULL ) == 0 );
markrad 0:cdf462088d13 1015
markrad 0:cdf462088d13 1016 TEST_ASSERT( mbedtls_ecjpake_write_round_two( &cli,
markrad 0:cdf462088d13 1017 buf, sizeof( buf ), &len, ecjpake_lgc, NULL ) == 0 );
markrad 0:cdf462088d13 1018
markrad 0:cdf462088d13 1019 TEST_ASSERT( mbedtls_ecjpake_read_round_two( &srv, buf, len ) == 0 );
markrad 0:cdf462088d13 1020
markrad 0:cdf462088d13 1021 TEST_ASSERT( mbedtls_ecjpake_derive_secret( &srv,
markrad 0:cdf462088d13 1022 buf, sizeof( buf ), &len, ecjpake_lgc, NULL ) == 0 );
markrad 0:cdf462088d13 1023
markrad 0:cdf462088d13 1024 TEST_ASSERT( len == pmslen );
markrad 0:cdf462088d13 1025 TEST_ASSERT( memcmp( buf, pms, len ) == 0 );
markrad 0:cdf462088d13 1026
markrad 0:cdf462088d13 1027 if( verbose != 0 )
markrad 0:cdf462088d13 1028 mbedtls_printf( "passed\n" );
markrad 0:cdf462088d13 1029
markrad 0:cdf462088d13 1030 if( verbose != 0 )
markrad 0:cdf462088d13 1031 mbedtls_printf( " ECJPAKE test #2 (reference handshake): " );
markrad 0:cdf462088d13 1032
markrad 0:cdf462088d13 1033 /* Simulate generation of round one */
markrad 0:cdf462088d13 1034 MBEDTLS_MPI_CHK( ecjpake_test_load( &cli,
markrad 0:cdf462088d13 1035 ecjpake_test_x1, sizeof( ecjpake_test_x1 ),
markrad 0:cdf462088d13 1036 ecjpake_test_x2, sizeof( ecjpake_test_x2 ) ) );
markrad 0:cdf462088d13 1037
markrad 0:cdf462088d13 1038 MBEDTLS_MPI_CHK( ecjpake_test_load( &srv,
markrad 0:cdf462088d13 1039 ecjpake_test_x3, sizeof( ecjpake_test_x3 ),
markrad 0:cdf462088d13 1040 ecjpake_test_x4, sizeof( ecjpake_test_x4 ) ) );
markrad 0:cdf462088d13 1041
markrad 0:cdf462088d13 1042 /* Read round one */
markrad 0:cdf462088d13 1043 TEST_ASSERT( mbedtls_ecjpake_read_round_one( &srv,
markrad 0:cdf462088d13 1044 ecjpake_test_cli_one,
markrad 0:cdf462088d13 1045 sizeof( ecjpake_test_cli_one ) ) == 0 );
markrad 0:cdf462088d13 1046
markrad 0:cdf462088d13 1047 TEST_ASSERT( mbedtls_ecjpake_read_round_one( &cli,
markrad 0:cdf462088d13 1048 ecjpake_test_srv_one,
markrad 0:cdf462088d13 1049 sizeof( ecjpake_test_srv_one ) ) == 0 );
markrad 0:cdf462088d13 1050
markrad 0:cdf462088d13 1051 /* Skip generation of round two, read round two */
markrad 0:cdf462088d13 1052 TEST_ASSERT( mbedtls_ecjpake_read_round_two( &cli,
markrad 0:cdf462088d13 1053 ecjpake_test_srv_two,
markrad 0:cdf462088d13 1054 sizeof( ecjpake_test_srv_two ) ) == 0 );
markrad 0:cdf462088d13 1055
markrad 0:cdf462088d13 1056 TEST_ASSERT( mbedtls_ecjpake_read_round_two( &srv,
markrad 0:cdf462088d13 1057 ecjpake_test_cli_two,
markrad 0:cdf462088d13 1058 sizeof( ecjpake_test_cli_two ) ) == 0 );
markrad 0:cdf462088d13 1059
markrad 0:cdf462088d13 1060 /* Server derives PMS */
markrad 0:cdf462088d13 1061 TEST_ASSERT( mbedtls_ecjpake_derive_secret( &srv,
markrad 0:cdf462088d13 1062 buf, sizeof( buf ), &len, ecjpake_lgc, NULL ) == 0 );
markrad 0:cdf462088d13 1063
markrad 0:cdf462088d13 1064 TEST_ASSERT( len == sizeof( ecjpake_test_pms ) );
markrad 0:cdf462088d13 1065 TEST_ASSERT( memcmp( buf, ecjpake_test_pms, len ) == 0 );
markrad 0:cdf462088d13 1066
markrad 0:cdf462088d13 1067 memset( buf, 0, len ); /* Avoid interferences with next step */
markrad 0:cdf462088d13 1068
markrad 0:cdf462088d13 1069 /* Client derives PMS */
markrad 0:cdf462088d13 1070 TEST_ASSERT( mbedtls_ecjpake_derive_secret( &cli,
markrad 0:cdf462088d13 1071 buf, sizeof( buf ), &len, ecjpake_lgc, NULL ) == 0 );
markrad 0:cdf462088d13 1072
markrad 0:cdf462088d13 1073 TEST_ASSERT( len == sizeof( ecjpake_test_pms ) );
markrad 0:cdf462088d13 1074 TEST_ASSERT( memcmp( buf, ecjpake_test_pms, len ) == 0 );
markrad 0:cdf462088d13 1075
markrad 0:cdf462088d13 1076 if( verbose != 0 )
markrad 0:cdf462088d13 1077 mbedtls_printf( "passed\n" );
markrad 0:cdf462088d13 1078
markrad 0:cdf462088d13 1079 cleanup:
markrad 0:cdf462088d13 1080 mbedtls_ecjpake_free( &cli );
markrad 0:cdf462088d13 1081 mbedtls_ecjpake_free( &srv );
markrad 0:cdf462088d13 1082
markrad 0:cdf462088d13 1083 if( ret != 0 )
markrad 0:cdf462088d13 1084 {
markrad 0:cdf462088d13 1085 if( verbose != 0 )
markrad 0:cdf462088d13 1086 mbedtls_printf( "failed\n" );
markrad 0:cdf462088d13 1087
markrad 0:cdf462088d13 1088 ret = 1;
markrad 0:cdf462088d13 1089 }
markrad 0:cdf462088d13 1090
markrad 0:cdf462088d13 1091 if( verbose != 0 )
markrad 0:cdf462088d13 1092 mbedtls_printf( "\n" );
markrad 0:cdf462088d13 1093
markrad 0:cdf462088d13 1094 return( ret );
markrad 0:cdf462088d13 1095 }
markrad 0:cdf462088d13 1096
markrad 0:cdf462088d13 1097 #undef TEST_ASSERT
markrad 0:cdf462088d13 1098
markrad 0:cdf462088d13 1099 #endif /* MBEDTLS_ECP_DP_SECP256R1_ENABLED && MBEDTLS_SHA256_C */
markrad 0:cdf462088d13 1100
markrad 0:cdf462088d13 1101 #endif /* MBEDTLS_SELF_TEST */
markrad 0:cdf462088d13 1102
markrad 0:cdf462088d13 1103 #endif /* MBEDTLS_ECJPAKE_C */