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:
1:9ebc941037d5
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 * RFC 1115/1319 compliant MD2 implementation
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 * The MD2 algorithm was designed by Ron Rivest in 1989.
markrad 0:cdf462088d13 23 *
markrad 0:cdf462088d13 24 * http://www.ietf.org/rfc/rfc1115.txt
markrad 0:cdf462088d13 25 * http://www.ietf.org/rfc/rfc1319.txt
markrad 0:cdf462088d13 26 */
markrad 0:cdf462088d13 27
markrad 0:cdf462088d13 28 #if !defined(MBEDTLS_CONFIG_FILE)
markrad 0:cdf462088d13 29 #include "mbedtls/config.h"
markrad 0:cdf462088d13 30 #else
markrad 0:cdf462088d13 31 #include MBEDTLS_CONFIG_FILE
markrad 0:cdf462088d13 32 #endif
markrad 0:cdf462088d13 33
markrad 0:cdf462088d13 34 #if defined(MBEDTLS_MD2_C)
markrad 0:cdf462088d13 35
markrad 0:cdf462088d13 36 #include "mbedtls/md2.h"
markrad 0:cdf462088d13 37
markrad 0:cdf462088d13 38 #include <string.h>
markrad 0:cdf462088d13 39
markrad 0:cdf462088d13 40 #if defined(MBEDTLS_SELF_TEST)
markrad 0:cdf462088d13 41 #if defined(MBEDTLS_PLATFORM_C)
markrad 0:cdf462088d13 42 #include "mbedtls/platform.h"
markrad 0:cdf462088d13 43 #else
markrad 0:cdf462088d13 44 #include <stdio.h>
markrad 0:cdf462088d13 45 #define mbedtls_printf printf
markrad 0:cdf462088d13 46 #endif /* MBEDTLS_PLATFORM_C */
markrad 0:cdf462088d13 47 #endif /* MBEDTLS_SELF_TEST */
markrad 0:cdf462088d13 48
markrad 0:cdf462088d13 49 #if !defined(MBEDTLS_MD2_ALT)
markrad 0:cdf462088d13 50
markrad 0:cdf462088d13 51 /* Implementation that should never be optimized out by the compiler */
markrad 0:cdf462088d13 52 static void mbedtls_zeroize( void *v, size_t n ) {
markrad 0:cdf462088d13 53 volatile unsigned char *p = v; while( n-- ) *p++ = 0;
markrad 0:cdf462088d13 54 }
markrad 0:cdf462088d13 55
markrad 0:cdf462088d13 56 static const unsigned char PI_SUBST[256] =
markrad 0:cdf462088d13 57 {
markrad 0:cdf462088d13 58 0x29, 0x2E, 0x43, 0xC9, 0xA2, 0xD8, 0x7C, 0x01, 0x3D, 0x36,
markrad 0:cdf462088d13 59 0x54, 0xA1, 0xEC, 0xF0, 0x06, 0x13, 0x62, 0xA7, 0x05, 0xF3,
markrad 0:cdf462088d13 60 0xC0, 0xC7, 0x73, 0x8C, 0x98, 0x93, 0x2B, 0xD9, 0xBC, 0x4C,
markrad 0:cdf462088d13 61 0x82, 0xCA, 0x1E, 0x9B, 0x57, 0x3C, 0xFD, 0xD4, 0xE0, 0x16,
markrad 0:cdf462088d13 62 0x67, 0x42, 0x6F, 0x18, 0x8A, 0x17, 0xE5, 0x12, 0xBE, 0x4E,
markrad 0:cdf462088d13 63 0xC4, 0xD6, 0xDA, 0x9E, 0xDE, 0x49, 0xA0, 0xFB, 0xF5, 0x8E,
markrad 0:cdf462088d13 64 0xBB, 0x2F, 0xEE, 0x7A, 0xA9, 0x68, 0x79, 0x91, 0x15, 0xB2,
markrad 0:cdf462088d13 65 0x07, 0x3F, 0x94, 0xC2, 0x10, 0x89, 0x0B, 0x22, 0x5F, 0x21,
markrad 0:cdf462088d13 66 0x80, 0x7F, 0x5D, 0x9A, 0x5A, 0x90, 0x32, 0x27, 0x35, 0x3E,
markrad 0:cdf462088d13 67 0xCC, 0xE7, 0xBF, 0xF7, 0x97, 0x03, 0xFF, 0x19, 0x30, 0xB3,
markrad 0:cdf462088d13 68 0x48, 0xA5, 0xB5, 0xD1, 0xD7, 0x5E, 0x92, 0x2A, 0xAC, 0x56,
markrad 0:cdf462088d13 69 0xAA, 0xC6, 0x4F, 0xB8, 0x38, 0xD2, 0x96, 0xA4, 0x7D, 0xB6,
markrad 0:cdf462088d13 70 0x76, 0xFC, 0x6B, 0xE2, 0x9C, 0x74, 0x04, 0xF1, 0x45, 0x9D,
markrad 0:cdf462088d13 71 0x70, 0x59, 0x64, 0x71, 0x87, 0x20, 0x86, 0x5B, 0xCF, 0x65,
markrad 0:cdf462088d13 72 0xE6, 0x2D, 0xA8, 0x02, 0x1B, 0x60, 0x25, 0xAD, 0xAE, 0xB0,
markrad 0:cdf462088d13 73 0xB9, 0xF6, 0x1C, 0x46, 0x61, 0x69, 0x34, 0x40, 0x7E, 0x0F,
markrad 0:cdf462088d13 74 0x55, 0x47, 0xA3, 0x23, 0xDD, 0x51, 0xAF, 0x3A, 0xC3, 0x5C,
markrad 0:cdf462088d13 75 0xF9, 0xCE, 0xBA, 0xC5, 0xEA, 0x26, 0x2C, 0x53, 0x0D, 0x6E,
markrad 0:cdf462088d13 76 0x85, 0x28, 0x84, 0x09, 0xD3, 0xDF, 0xCD, 0xF4, 0x41, 0x81,
markrad 0:cdf462088d13 77 0x4D, 0x52, 0x6A, 0xDC, 0x37, 0xC8, 0x6C, 0xC1, 0xAB, 0xFA,
markrad 0:cdf462088d13 78 0x24, 0xE1, 0x7B, 0x08, 0x0C, 0xBD, 0xB1, 0x4A, 0x78, 0x88,
markrad 0:cdf462088d13 79 0x95, 0x8B, 0xE3, 0x63, 0xE8, 0x6D, 0xE9, 0xCB, 0xD5, 0xFE,
markrad 0:cdf462088d13 80 0x3B, 0x00, 0x1D, 0x39, 0xF2, 0xEF, 0xB7, 0x0E, 0x66, 0x58,
markrad 0:cdf462088d13 81 0xD0, 0xE4, 0xA6, 0x77, 0x72, 0xF8, 0xEB, 0x75, 0x4B, 0x0A,
markrad 0:cdf462088d13 82 0x31, 0x44, 0x50, 0xB4, 0x8F, 0xED, 0x1F, 0x1A, 0xDB, 0x99,
markrad 0:cdf462088d13 83 0x8D, 0x33, 0x9F, 0x11, 0x83, 0x14
markrad 0:cdf462088d13 84 };
markrad 0:cdf462088d13 85
markrad 0:cdf462088d13 86 void mbedtls_md2_init( mbedtls_md2_context *ctx )
markrad 0:cdf462088d13 87 {
markrad 0:cdf462088d13 88 memset( ctx, 0, sizeof( mbedtls_md2_context ) );
markrad 0:cdf462088d13 89 }
markrad 0:cdf462088d13 90
markrad 0:cdf462088d13 91 void mbedtls_md2_free( mbedtls_md2_context *ctx )
markrad 0:cdf462088d13 92 {
markrad 0:cdf462088d13 93 if( ctx == NULL )
markrad 0:cdf462088d13 94 return;
markrad 0:cdf462088d13 95
markrad 0:cdf462088d13 96 mbedtls_zeroize( ctx, sizeof( mbedtls_md2_context ) );
markrad 0:cdf462088d13 97 }
markrad 0:cdf462088d13 98
markrad 0:cdf462088d13 99 void mbedtls_md2_clone( mbedtls_md2_context *dst,
markrad 0:cdf462088d13 100 const mbedtls_md2_context *src )
markrad 0:cdf462088d13 101 {
markrad 0:cdf462088d13 102 *dst = *src;
markrad 0:cdf462088d13 103 }
markrad 0:cdf462088d13 104
markrad 0:cdf462088d13 105 /*
markrad 0:cdf462088d13 106 * MD2 context setup
markrad 0:cdf462088d13 107 */
markrad 0:cdf462088d13 108 void mbedtls_md2_starts( mbedtls_md2_context *ctx )
markrad 0:cdf462088d13 109 {
markrad 0:cdf462088d13 110 memset( ctx->cksum, 0, 16 );
markrad 0:cdf462088d13 111 memset( ctx->state, 0, 46 );
markrad 0:cdf462088d13 112 memset( ctx->buffer, 0, 16 );
markrad 0:cdf462088d13 113 ctx->left = 0;
markrad 0:cdf462088d13 114 }
markrad 0:cdf462088d13 115
markrad 0:cdf462088d13 116 #if !defined(MBEDTLS_MD2_PROCESS_ALT)
markrad 0:cdf462088d13 117 void mbedtls_md2_process( mbedtls_md2_context *ctx )
markrad 0:cdf462088d13 118 {
markrad 0:cdf462088d13 119 int i, j;
markrad 0:cdf462088d13 120 unsigned char t = 0;
markrad 0:cdf462088d13 121
markrad 0:cdf462088d13 122 for( i = 0; i < 16; i++ )
markrad 0:cdf462088d13 123 {
markrad 0:cdf462088d13 124 ctx->state[i + 16] = ctx->buffer[i];
markrad 0:cdf462088d13 125 ctx->state[i + 32] =
markrad 0:cdf462088d13 126 (unsigned char)( ctx->buffer[i] ^ ctx->state[i]);
markrad 0:cdf462088d13 127 }
markrad 0:cdf462088d13 128
markrad 0:cdf462088d13 129 for( i = 0; i < 18; i++ )
markrad 0:cdf462088d13 130 {
markrad 0:cdf462088d13 131 for( j = 0; j < 48; j++ )
markrad 0:cdf462088d13 132 {
markrad 0:cdf462088d13 133 ctx->state[j] = (unsigned char)
markrad 0:cdf462088d13 134 ( ctx->state[j] ^ PI_SUBST[t] );
markrad 0:cdf462088d13 135 t = ctx->state[j];
markrad 0:cdf462088d13 136 }
markrad 0:cdf462088d13 137
markrad 0:cdf462088d13 138 t = (unsigned char)( t + i );
markrad 0:cdf462088d13 139 }
markrad 0:cdf462088d13 140
markrad 0:cdf462088d13 141 t = ctx->cksum[15];
markrad 0:cdf462088d13 142
markrad 0:cdf462088d13 143 for( i = 0; i < 16; i++ )
markrad 0:cdf462088d13 144 {
markrad 0:cdf462088d13 145 ctx->cksum[i] = (unsigned char)
markrad 0:cdf462088d13 146 ( ctx->cksum[i] ^ PI_SUBST[ctx->buffer[i] ^ t] );
markrad 0:cdf462088d13 147 t = ctx->cksum[i];
markrad 0:cdf462088d13 148 }
markrad 0:cdf462088d13 149 }
markrad 0:cdf462088d13 150 #endif /* !MBEDTLS_MD2_PROCESS_ALT */
markrad 0:cdf462088d13 151
markrad 0:cdf462088d13 152 /*
markrad 0:cdf462088d13 153 * MD2 process buffer
markrad 0:cdf462088d13 154 */
markrad 0:cdf462088d13 155 void mbedtls_md2_update( mbedtls_md2_context *ctx, const unsigned char *input, size_t ilen )
markrad 0:cdf462088d13 156 {
markrad 0:cdf462088d13 157 size_t fill;
markrad 0:cdf462088d13 158
markrad 0:cdf462088d13 159 while( ilen > 0 )
markrad 0:cdf462088d13 160 {
Jasper Wallace 1:9ebc941037d5 161 if( ilen > 16 - ctx->left )
markrad 0:cdf462088d13 162 fill = 16 - ctx->left;
markrad 0:cdf462088d13 163 else
markrad 0:cdf462088d13 164 fill = ilen;
markrad 0:cdf462088d13 165
markrad 0:cdf462088d13 166 memcpy( ctx->buffer + ctx->left, input, fill );
markrad 0:cdf462088d13 167
markrad 0:cdf462088d13 168 ctx->left += fill;
markrad 0:cdf462088d13 169 input += fill;
markrad 0:cdf462088d13 170 ilen -= fill;
markrad 0:cdf462088d13 171
markrad 0:cdf462088d13 172 if( ctx->left == 16 )
markrad 0:cdf462088d13 173 {
markrad 0:cdf462088d13 174 ctx->left = 0;
markrad 0:cdf462088d13 175 mbedtls_md2_process( ctx );
markrad 0:cdf462088d13 176 }
markrad 0:cdf462088d13 177 }
markrad 0:cdf462088d13 178 }
markrad 0:cdf462088d13 179
markrad 0:cdf462088d13 180 /*
markrad 0:cdf462088d13 181 * MD2 final digest
markrad 0:cdf462088d13 182 */
markrad 0:cdf462088d13 183 void mbedtls_md2_finish( mbedtls_md2_context *ctx, unsigned char output[16] )
markrad 0:cdf462088d13 184 {
markrad 0:cdf462088d13 185 size_t i;
markrad 0:cdf462088d13 186 unsigned char x;
markrad 0:cdf462088d13 187
markrad 0:cdf462088d13 188 x = (unsigned char)( 16 - ctx->left );
markrad 0:cdf462088d13 189
markrad 0:cdf462088d13 190 for( i = ctx->left; i < 16; i++ )
markrad 0:cdf462088d13 191 ctx->buffer[i] = x;
markrad 0:cdf462088d13 192
markrad 0:cdf462088d13 193 mbedtls_md2_process( ctx );
markrad 0:cdf462088d13 194
markrad 0:cdf462088d13 195 memcpy( ctx->buffer, ctx->cksum, 16 );
markrad 0:cdf462088d13 196 mbedtls_md2_process( ctx );
markrad 0:cdf462088d13 197
markrad 0:cdf462088d13 198 memcpy( output, ctx->state, 16 );
markrad 0:cdf462088d13 199 }
markrad 0:cdf462088d13 200
markrad 0:cdf462088d13 201 #endif /* !MBEDTLS_MD2_ALT */
markrad 0:cdf462088d13 202
markrad 0:cdf462088d13 203 /*
markrad 0:cdf462088d13 204 * output = MD2( input buffer )
markrad 0:cdf462088d13 205 */
markrad 0:cdf462088d13 206 void mbedtls_md2( const unsigned char *input, size_t ilen, unsigned char output[16] )
markrad 0:cdf462088d13 207 {
markrad 0:cdf462088d13 208 mbedtls_md2_context ctx;
markrad 0:cdf462088d13 209
markrad 0:cdf462088d13 210 mbedtls_md2_init( &ctx );
markrad 0:cdf462088d13 211 mbedtls_md2_starts( &ctx );
markrad 0:cdf462088d13 212 mbedtls_md2_update( &ctx, input, ilen );
markrad 0:cdf462088d13 213 mbedtls_md2_finish( &ctx, output );
markrad 0:cdf462088d13 214 mbedtls_md2_free( &ctx );
markrad 0:cdf462088d13 215 }
markrad 0:cdf462088d13 216
markrad 0:cdf462088d13 217 #if defined(MBEDTLS_SELF_TEST)
markrad 0:cdf462088d13 218
markrad 0:cdf462088d13 219 /*
markrad 0:cdf462088d13 220 * RFC 1319 test vectors
markrad 0:cdf462088d13 221 */
markrad 0:cdf462088d13 222 static const char md2_test_str[7][81] =
markrad 0:cdf462088d13 223 {
markrad 0:cdf462088d13 224 { "" },
markrad 0:cdf462088d13 225 { "a" },
markrad 0:cdf462088d13 226 { "abc" },
markrad 0:cdf462088d13 227 { "message digest" },
markrad 0:cdf462088d13 228 { "abcdefghijklmnopqrstuvwxyz" },
markrad 0:cdf462088d13 229 { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" },
markrad 0:cdf462088d13 230 { "12345678901234567890123456789012345678901234567890123456789012" \
markrad 0:cdf462088d13 231 "345678901234567890" }
markrad 0:cdf462088d13 232 };
markrad 0:cdf462088d13 233
markrad 0:cdf462088d13 234 static const unsigned char md2_test_sum[7][16] =
markrad 0:cdf462088d13 235 {
markrad 0:cdf462088d13 236 { 0x83, 0x50, 0xE5, 0xA3, 0xE2, 0x4C, 0x15, 0x3D,
markrad 0:cdf462088d13 237 0xF2, 0x27, 0x5C, 0x9F, 0x80, 0x69, 0x27, 0x73 },
markrad 0:cdf462088d13 238 { 0x32, 0xEC, 0x01, 0xEC, 0x4A, 0x6D, 0xAC, 0x72,
markrad 0:cdf462088d13 239 0xC0, 0xAB, 0x96, 0xFB, 0x34, 0xC0, 0xB5, 0xD1 },
markrad 0:cdf462088d13 240 { 0xDA, 0x85, 0x3B, 0x0D, 0x3F, 0x88, 0xD9, 0x9B,
markrad 0:cdf462088d13 241 0x30, 0x28, 0x3A, 0x69, 0xE6, 0xDE, 0xD6, 0xBB },
markrad 0:cdf462088d13 242 { 0xAB, 0x4F, 0x49, 0x6B, 0xFB, 0x2A, 0x53, 0x0B,
markrad 0:cdf462088d13 243 0x21, 0x9F, 0xF3, 0x30, 0x31, 0xFE, 0x06, 0xB0 },
markrad 0:cdf462088d13 244 { 0x4E, 0x8D, 0xDF, 0xF3, 0x65, 0x02, 0x92, 0xAB,
markrad 0:cdf462088d13 245 0x5A, 0x41, 0x08, 0xC3, 0xAA, 0x47, 0x94, 0x0B },
markrad 0:cdf462088d13 246 { 0xDA, 0x33, 0xDE, 0xF2, 0xA4, 0x2D, 0xF1, 0x39,
markrad 0:cdf462088d13 247 0x75, 0x35, 0x28, 0x46, 0xC3, 0x03, 0x38, 0xCD },
markrad 0:cdf462088d13 248 { 0xD5, 0x97, 0x6F, 0x79, 0xD8, 0x3D, 0x3A, 0x0D,
markrad 0:cdf462088d13 249 0xC9, 0x80, 0x6C, 0x3C, 0x66, 0xF3, 0xEF, 0xD8 }
markrad 0:cdf462088d13 250 };
markrad 0:cdf462088d13 251
markrad 0:cdf462088d13 252 /*
markrad 0:cdf462088d13 253 * Checkup routine
markrad 0:cdf462088d13 254 */
markrad 0:cdf462088d13 255 int mbedtls_md2_self_test( int verbose )
markrad 0:cdf462088d13 256 {
markrad 0:cdf462088d13 257 int i;
markrad 0:cdf462088d13 258 unsigned char md2sum[16];
markrad 0:cdf462088d13 259
markrad 0:cdf462088d13 260 for( i = 0; i < 7; i++ )
markrad 0:cdf462088d13 261 {
markrad 0:cdf462088d13 262 if( verbose != 0 )
markrad 0:cdf462088d13 263 mbedtls_printf( " MD2 test #%d: ", i + 1 );
markrad 0:cdf462088d13 264
markrad 0:cdf462088d13 265 mbedtls_md2( (unsigned char *) md2_test_str[i],
markrad 0:cdf462088d13 266 strlen( md2_test_str[i] ), md2sum );
markrad 0:cdf462088d13 267
markrad 0:cdf462088d13 268 if( memcmp( md2sum, md2_test_sum[i], 16 ) != 0 )
markrad 0:cdf462088d13 269 {
markrad 0:cdf462088d13 270 if( verbose != 0 )
markrad 0:cdf462088d13 271 mbedtls_printf( "failed\n" );
markrad 0:cdf462088d13 272
markrad 0:cdf462088d13 273 return( 1 );
markrad 0:cdf462088d13 274 }
markrad 0:cdf462088d13 275
markrad 0:cdf462088d13 276 if( verbose != 0 )
markrad 0:cdf462088d13 277 mbedtls_printf( "passed\n" );
markrad 0:cdf462088d13 278 }
markrad 0:cdf462088d13 279
markrad 0:cdf462088d13 280 if( verbose != 0 )
markrad 0:cdf462088d13 281 mbedtls_printf( "\n" );
markrad 0:cdf462088d13 282
markrad 0:cdf462088d13 283 return( 0 );
markrad 0:cdf462088d13 284 }
markrad 0:cdf462088d13 285
markrad 0:cdf462088d13 286 #endif /* MBEDTLS_SELF_TEST */
markrad 0:cdf462088d13 287
markrad 0:cdf462088d13 288 #endif /* MBEDTLS_MD2_C */