Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 1 | /* |
| 2 | * Message Processing Stack, Reader implementation |
| 3 | * |
| 4 | * Copyright The Mbed TLS Contributors |
| 5 | * SPDX-License-Identifier: Apache-2.0 |
| 6 | * |
| 7 | * Licensed under the Apache License, Version 2.0 (the "License"); you may |
| 8 | * not use this file except in compliance with the License. |
| 9 | * You may obtain a copy of the License at |
| 10 | * |
| 11 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 12 | * |
| 13 | * Unless required by applicable law or agreed to in writing, software |
| 14 | * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT |
| 15 | * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 16 | * See the License for the specific language governing permissions and |
| 17 | * limitations under the License. |
| 18 | * |
| 19 | * This file is part of Mbed TLS (https://tls.mbed.org) |
| 20 | */ |
| 21 | |
Hanno Becker | c518c3b | 2021-01-28 07:08:08 +0000 | [diff] [blame] | 22 | #include "mps_reader.h" |
| 23 | #include "mps_common.h" |
| 24 | #include "mps_trace.h" |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 25 | |
| 26 | #include <string.h> |
| 27 | |
| 28 | #if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \ |
| 29 | !defined(inline) && !defined(__cplusplus) |
| 30 | #define inline __inline |
| 31 | #endif |
| 32 | |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 33 | #if defined(MBEDTLS_MPS_ENABLE_TRACE) |
| 34 | static int mbedtls_mps_trace_id = MBEDTLS_MPS_TRACE_BIT_READER; |
| 35 | #endif /* MBEDTLS_MPS_ENABLE_TRACE */ |
Hanno Becker | b910016 | 2021-01-12 09:46:03 +0000 | [diff] [blame] | 36 | |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 37 | /* |
| 38 | * GENERAL NOTE ON CODING STYLE |
| 39 | * |
| 40 | * The following code intentionally separates memory loads |
| 41 | * and stores from other operations (arithmetic or branches). |
| 42 | * This leads to the introduction of many local variables |
| 43 | * and significantly increases the C-code line count, but |
| 44 | * should not increase the size of generated assembly. |
| 45 | * |
Hanno Becker | fea81b3 | 2021-02-22 15:18:11 +0000 | [diff] [blame] | 46 | * The reason for this is twofold: |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 47 | * (1) It will ease verification efforts using the VST |
Hanno Becker | fea81b3 | 2021-02-22 15:18:11 +0000 | [diff] [blame] | 48 | * (Verified Software Toolchain) |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 49 | * whose program logic cannot directly reason |
| 50 | * about instructions containing a load or store in |
| 51 | * addition to other operations (e.g. *p = *q or |
| 52 | * tmp = *p + 42). |
| 53 | * (2) Operating on local variables and writing the results |
| 54 | * back to the target contexts on success only |
| 55 | * allows to maintain structure invariants even |
| 56 | * on failure - this in turn has two benefits: |
| 57 | * (2.a) If for some reason an error code is not caught |
| 58 | * and operation continues, functions are nonetheless |
| 59 | * called with sane contexts, reducing the risk |
| 60 | * of dangerous behavior. |
| 61 | * (2.b) Randomized testing is easier if structures |
| 62 | * remain intact even in the face of failing |
| 63 | * and/or non-sensical calls. |
| 64 | * Moreover, it might even reduce code-size because |
| 65 | * the compiler need not write back temporary results |
| 66 | * to memory in case of failure. |
| 67 | * |
| 68 | */ |
| 69 | |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 70 | static inline int mps_reader_is_accumulating( |
| 71 | mbedtls_mps_reader const *rd ) |
| 72 | { |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 73 | mbedtls_mps_size_t acc_remaining; |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 74 | if( rd->acc == NULL ) |
| 75 | return( 0 ); |
| 76 | |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 77 | acc_remaining = rd->acc_share.acc_remaining; |
| 78 | return( acc_remaining > 0 ); |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 79 | } |
| 80 | |
| 81 | static inline int mps_reader_is_producing( |
| 82 | mbedtls_mps_reader const *rd ) |
| 83 | { |
| 84 | unsigned char *frag = rd->frag; |
| 85 | return( frag == NULL ); |
| 86 | } |
| 87 | |
| 88 | static inline int mps_reader_is_consuming( |
| 89 | mbedtls_mps_reader const *rd ) |
| 90 | { |
| 91 | return( !mps_reader_is_producing( rd ) ); |
| 92 | } |
| 93 | |
| 94 | static inline mbedtls_mps_size_t mps_reader_get_fragment_offset( |
| 95 | mbedtls_mps_reader const *rd ) |
| 96 | { |
| 97 | unsigned char *acc = rd->acc; |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 98 | mbedtls_mps_size_t frag_offset; |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 99 | |
| 100 | if( acc == NULL ) |
| 101 | return( 0 ); |
| 102 | |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 103 | frag_offset = rd->acc_share.frag_offset; |
| 104 | return( frag_offset ); |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 105 | } |
| 106 | |
| 107 | static inline mbedtls_mps_size_t mps_reader_serving_from_accumulator( |
| 108 | mbedtls_mps_reader const *rd ) |
| 109 | { |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 110 | mbedtls_mps_size_t frag_offset, end; |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 111 | |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 112 | frag_offset = mps_reader_get_fragment_offset( rd ); |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 113 | end = rd->end; |
| 114 | |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 115 | return( end < frag_offset ); |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 116 | } |
| 117 | |
Hanno Becker | 8899396 | 2021-01-28 09:45:47 +0000 | [diff] [blame] | 118 | static inline void mps_reader_zero( mbedtls_mps_reader *rd ) |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 119 | { |
| 120 | /* A plain memset() would likely be more efficient, |
| 121 | * but the current way of zeroing makes it harder |
| 122 | * to overlook fields which should not be zero-initialized. |
Hanno Becker | 0bea62f | 2021-02-08 07:54:19 +0000 | [diff] [blame] | 123 | * It's also more suitable for FV efforts since it |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 124 | * doesn't require reasoning about structs being |
| 125 | * interpreted as unstructured binary blobs. */ |
Hanno Becker | 8899396 | 2021-01-28 09:45:47 +0000 | [diff] [blame] | 126 | static mbedtls_mps_reader const zero = |
Hanno Becker | b185543 | 2021-02-08 08:07:35 +0000 | [diff] [blame] | 127 | { .frag = NULL, |
| 128 | .frag_len = 0, |
| 129 | .commit = 0, |
| 130 | .end = 0, |
| 131 | .pending = 0, |
| 132 | .acc = NULL, |
| 133 | .acc_len = 0, |
| 134 | .acc_available = 0, |
| 135 | .acc_share = { .acc_remaining = 0 } |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 136 | }; |
| 137 | *rd = zero; |
| 138 | } |
| 139 | |
Hanno Becker | 8899396 | 2021-01-28 09:45:47 +0000 | [diff] [blame] | 140 | int mbedtls_mps_reader_init( mbedtls_mps_reader *rd, |
| 141 | unsigned char *acc, |
| 142 | mbedtls_mps_size_t acc_len ) |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 143 | { |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 144 | MBEDTLS_MPS_TRACE_INIT( "mbedtls_mps_reader_init" ); |
| 145 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
| 146 | "* Accumulator size: %u bytes", (unsigned) acc_len ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 147 | mps_reader_zero( rd ); |
| 148 | rd->acc = acc; |
| 149 | rd->acc_len = acc_len; |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 150 | MBEDTLS_MPS_TRACE_RETURN( 0 ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 151 | } |
| 152 | |
Hanno Becker | 8899396 | 2021-01-28 09:45:47 +0000 | [diff] [blame] | 153 | int mbedtls_mps_reader_free( mbedtls_mps_reader *rd ) |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 154 | { |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 155 | MBEDTLS_MPS_TRACE_INIT( "mbedtls_mps_reader_free" ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 156 | mps_reader_zero( rd ); |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 157 | MBEDTLS_MPS_TRACE_RETURN( 0 ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 158 | } |
| 159 | |
Hanno Becker | 8899396 | 2021-01-28 09:45:47 +0000 | [diff] [blame] | 160 | int mbedtls_mps_reader_feed( mbedtls_mps_reader *rd, |
| 161 | unsigned char *new_frag, |
| 162 | mbedtls_mps_size_t new_frag_len ) |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 163 | { |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 164 | mbedtls_mps_size_t copy_to_acc; |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 165 | MBEDTLS_MPS_TRACE_INIT( "mbedtls_mps_reader_feed" ); |
| 166 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
| 167 | "* Fragment length: %u bytes", (unsigned) new_frag_len ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 168 | |
| 169 | if( new_frag == NULL ) |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 170 | MBEDTLS_MPS_TRACE_RETURN( MBEDTLS_ERR_MPS_READER_INVALID_ARG ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 171 | |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 172 | MBEDTLS_MPS_STATE_VALIDATE_RAW( mps_reader_is_producing( rd ), |
Hanno Becker | 8899396 | 2021-01-28 09:45:47 +0000 | [diff] [blame] | 173 | "mbedtls_mps_reader_feed() requires reader to be in producing mode" ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 174 | |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 175 | if( mps_reader_is_accumulating( rd ) ) |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 176 | { |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 177 | unsigned char *acc = rd->acc; |
| 178 | mbedtls_mps_size_t ar = rd->acc_share.acc_remaining; |
Hanno Becker | b185543 | 2021-02-08 08:07:35 +0000 | [diff] [blame] | 179 | mbedtls_mps_size_t aa = rd->acc_available; |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 180 | |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 181 | /* Skip over parts of the accumulator that have already been filled. */ |
| 182 | acc += aa; |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 183 | |
| 184 | copy_to_acc = ar; |
| 185 | if( copy_to_acc > new_frag_len ) |
| 186 | copy_to_acc = new_frag_len; |
| 187 | |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 188 | /* Copy new contents to accumulator. */ |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 189 | if( copy_to_acc > 0 ) |
| 190 | memcpy( acc, new_frag, copy_to_acc ); |
| 191 | |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 192 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
| 193 | "Copy new data of size %u of %u into accumulator at offset %u", |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 194 | (unsigned) copy_to_acc, (unsigned) new_frag_len, (unsigned) aa ); |
| 195 | |
| 196 | /* Check if, with the new fragment, we have enough data. */ |
| 197 | ar -= copy_to_acc; |
| 198 | if( ar > 0 ) |
| 199 | { |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 200 | /* We need to accumulate more data. Stay in producing mode. */ |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 201 | aa += copy_to_acc; |
| 202 | rd->acc_share.acc_remaining = ar; |
Hanno Becker | b185543 | 2021-02-08 08:07:35 +0000 | [diff] [blame] | 203 | rd->acc_available = aa; |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 204 | MBEDTLS_MPS_TRACE_RETURN( MBEDTLS_ERR_MPS_READER_NEED_MORE ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 205 | } |
| 206 | |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 207 | /* We have filled the accumulator: Move to consuming mode. */ |
| 208 | |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 209 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
| 210 | "Enough data available to serve user request" ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 211 | |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 212 | /* Remember overlap of accumulator and fragment. */ |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 213 | rd->acc_share.frag_offset = aa; |
| 214 | aa += copy_to_acc; |
Hanno Becker | b185543 | 2021-02-08 08:07:35 +0000 | [diff] [blame] | 215 | rd->acc_available = aa; |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 216 | } |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 217 | else /* Not accumulating */ |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 218 | { |
| 219 | rd->acc_share.frag_offset = 0; |
| 220 | } |
| 221 | |
| 222 | rd->frag = new_frag; |
| 223 | rd->frag_len = new_frag_len; |
| 224 | rd->commit = 0; |
| 225 | rd->end = 0; |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 226 | MBEDTLS_MPS_TRACE_RETURN( 0 ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 227 | } |
| 228 | |
| 229 | |
Hanno Becker | 8899396 | 2021-01-28 09:45:47 +0000 | [diff] [blame] | 230 | int mbedtls_mps_reader_get( mbedtls_mps_reader *rd, |
| 231 | mbedtls_mps_size_t desired, |
| 232 | unsigned char **buffer, |
| 233 | mbedtls_mps_size_t *buflen ) |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 234 | { |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 235 | unsigned char *frag; |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 236 | mbedtls_mps_size_t frag_len, frag_offset, end, frag_fetched, frag_remaining; |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 237 | MBEDTLS_MPS_TRACE_INIT( "mbedtls_mps_reader_get" ); |
| 238 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
| 239 | "* Bytes requested: %u", (unsigned) desired ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 240 | |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 241 | MBEDTLS_MPS_STATE_VALIDATE_RAW( mps_reader_is_consuming( rd ), |
Hanno Becker | 8899396 | 2021-01-28 09:45:47 +0000 | [diff] [blame] | 242 | "mbedtls_mps_reader_get() requires reader to be in consuming mode" ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 243 | |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 244 | end = rd->end; |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 245 | frag_offset = mps_reader_get_fragment_offset( rd ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 246 | |
| 247 | /* Check if we're still serving from the accumulator. */ |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 248 | if( mps_reader_serving_from_accumulator( rd ) ) |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 249 | { |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 250 | unsigned char *acc; |
| 251 | |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 252 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
| 253 | "Serve the request from the accumulator" ); |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 254 | if( frag_offset - end < desired ) |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 255 | { |
| 256 | /* Illustration of supported and unsupported cases: |
| 257 | * |
| 258 | * - Allowed #1 |
| 259 | * |
| 260 | * +-----------------------------------+ |
| 261 | * | frag | |
| 262 | * +-----------------------------------+ |
| 263 | * |
| 264 | * end end+desired |
| 265 | * | | |
| 266 | * +-----v-------v-------------+ |
| 267 | * | acc | |
| 268 | * +---------------------------+ |
| 269 | * | | |
Hanno Becker | b185543 | 2021-02-08 08:07:35 +0000 | [diff] [blame] | 270 | * fo/frag_offset aa/acc_available |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 271 | * |
| 272 | * - Allowed #2 |
| 273 | * |
| 274 | * +-----------------------------------+ |
| 275 | * | frag | |
| 276 | * +-----------------------------------+ |
| 277 | * |
| 278 | * end end+desired |
| 279 | * | | |
| 280 | * +----------v----------------v |
| 281 | * | acc | |
| 282 | * +---------------------------+ |
| 283 | * | | |
Hanno Becker | b185543 | 2021-02-08 08:07:35 +0000 | [diff] [blame] | 284 | * fo/frag_offset aa/acc_available |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 285 | * |
| 286 | * - Not allowed #1 (could be served, but we don't actually use it): |
| 287 | * |
| 288 | * +-----------------------------------+ |
| 289 | * | frag | |
| 290 | * +-----------------------------------+ |
| 291 | * |
| 292 | * end end+desired |
| 293 | * | | |
| 294 | * +------v-------------v------+ |
| 295 | * | acc | |
| 296 | * +---------------------------+ |
| 297 | * | | |
Hanno Becker | b185543 | 2021-02-08 08:07:35 +0000 | [diff] [blame] | 298 | * fo/frag_offset aa/acc_available |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 299 | * |
| 300 | * |
| 301 | * - Not allowed #2 (can't be served with a contiguous buffer): |
| 302 | * |
| 303 | * +-----------------------------------+ |
| 304 | * | frag | |
| 305 | * +-----------------------------------+ |
| 306 | * |
| 307 | * end end + desired |
| 308 | * | | |
| 309 | * +------v--------------------+ v |
| 310 | * | acc | |
| 311 | * +---------------------------+ |
| 312 | * | | |
Hanno Becker | b185543 | 2021-02-08 08:07:35 +0000 | [diff] [blame] | 313 | * fo/frag_offset aa/acc_available |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 314 | * |
| 315 | * In case of Allowed #1 and #2 we're switching to serve from |
Hanno Becker | 8899396 | 2021-01-28 09:45:47 +0000 | [diff] [blame] | 316 | * `frag` starting from the next call to mbedtls_mps_reader_get(). |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 317 | */ |
| 318 | |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 319 | mbedtls_mps_size_t acc_available; |
| 320 | acc_available = rd->acc_available; |
| 321 | if( acc_available - end != desired ) |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 322 | { |
| 323 | /* It might be possible to serve some of these situations by |
| 324 | * making additional space in the accumulator, removing those |
| 325 | * parts that have already been committed. |
| 326 | * On the other hand, this brings additional complexity and |
| 327 | * enlarges the code size, while there doesn't seem to be a use |
| 328 | * case where we don't attempt exactly the same `get` calls when |
| 329 | * resuming on a reader than what we tried before pausing it. |
| 330 | * If we believe we adhere to this restricted usage throughout |
| 331 | * the library, this check is a good opportunity to |
| 332 | * validate this. */ |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 333 | MBEDTLS_MPS_TRACE_RETURN( |
| 334 | MBEDTLS_ERR_MPS_READER_INCONSISTENT_REQUESTS ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 335 | } |
| 336 | } |
| 337 | |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 338 | acc = rd->acc; |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 339 | acc += end; |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 340 | |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 341 | *buffer = acc; |
| 342 | if( buflen != NULL ) |
| 343 | *buflen = desired; |
| 344 | |
| 345 | end += desired; |
| 346 | rd->end = end; |
| 347 | rd->pending = 0; |
| 348 | |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 349 | MBEDTLS_MPS_TRACE_RETURN( 0 ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 350 | } |
| 351 | |
| 352 | /* Attempt to serve the request from the current fragment */ |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 353 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
| 354 | "Serve the request from the current fragment." ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 355 | |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 356 | frag_len = rd->frag_len; |
| 357 | frag_fetched = end - frag_offset; /* The amount of data from the current |
| 358 | * fragment that has already been passed |
| 359 | * to the user. */ |
| 360 | frag_remaining = frag_len - frag_fetched; /* Remaining data in fragment */ |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 361 | |
| 362 | /* Check if we can serve the read request from the fragment. */ |
| 363 | if( frag_remaining < desired ) |
| 364 | { |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 365 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
| 366 | "There's not enough data in the current fragment " |
| 367 | "to serve the request." ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 368 | /* There's not enough data in the current fragment, |
| 369 | * so either just RETURN what we have or fail. */ |
| 370 | if( buflen == NULL ) |
| 371 | { |
| 372 | if( frag_remaining > 0 ) |
| 373 | { |
| 374 | rd->pending = desired - frag_remaining; |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 375 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
| 376 | "Remember to collect %u bytes before re-opening", |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 377 | (unsigned) rd->pending ); |
| 378 | } |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 379 | MBEDTLS_MPS_TRACE_RETURN( MBEDTLS_ERR_MPS_READER_OUT_OF_DATA ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 380 | } |
| 381 | |
| 382 | desired = frag_remaining; |
| 383 | } |
| 384 | |
| 385 | /* There's enough data in the current fragment to serve the |
| 386 | * (potentially modified) read request. */ |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 387 | |
| 388 | frag = rd->frag; |
| 389 | frag += frag_fetched; |
| 390 | |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 391 | *buffer = frag; |
| 392 | if( buflen != NULL ) |
| 393 | *buflen = desired; |
| 394 | |
| 395 | end += desired; |
| 396 | rd->end = end; |
| 397 | rd->pending = 0; |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 398 | MBEDTLS_MPS_TRACE_RETURN( 0 ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 399 | } |
| 400 | |
Hanno Becker | 8899396 | 2021-01-28 09:45:47 +0000 | [diff] [blame] | 401 | int mbedtls_mps_reader_commit( mbedtls_mps_reader *rd ) |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 402 | { |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 403 | mbedtls_mps_size_t end; |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 404 | MBEDTLS_MPS_TRACE_INIT( "mbedtls_mps_reader_commit" ); |
| 405 | MBEDTLS_MPS_STATE_VALIDATE_RAW( mps_reader_is_consuming( rd ), |
Hanno Becker | 8899396 | 2021-01-28 09:45:47 +0000 | [diff] [blame] | 406 | "mbedtls_mps_reader_commit() requires reader to be in consuming mode" ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 407 | |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 408 | end = rd->end; |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 409 | rd->commit = end; |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 410 | |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 411 | MBEDTLS_MPS_TRACE_RETURN( 0 ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 412 | } |
| 413 | |
Hanno Becker | 8899396 | 2021-01-28 09:45:47 +0000 | [diff] [blame] | 414 | int mbedtls_mps_reader_reclaim( mbedtls_mps_reader *rd, |
Hanno Becker | b9c086a | 2021-02-22 16:04:06 +0000 | [diff] [blame] | 415 | int *paused ) |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 416 | { |
| 417 | unsigned char *frag, *acc; |
| 418 | mbedtls_mps_size_t pending, commit; |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 419 | mbedtls_mps_size_t acc_len, frag_offset, frag_len; |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 420 | MBEDTLS_MPS_TRACE_INIT( "mbedtls_mps_reader_reclaim" ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 421 | |
| 422 | if( paused != NULL ) |
| 423 | *paused = 0; |
| 424 | |
Hanno Becker | f81e41f | 2021-02-08 08:04:01 +0000 | [diff] [blame] | 425 | MBEDTLS_MPS_STATE_VALIDATE_RAW( mps_reader_is_consuming( rd ), |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 426 | "mbedtls_mps_reader_reclaim() requires reader to be in consuming mode" ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 427 | |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 428 | frag = rd->frag; |
| 429 | acc = rd->acc; |
| 430 | pending = rd->pending; |
| 431 | commit = rd->commit; |
| 432 | frag_len = rd->frag_len; |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 433 | |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 434 | frag_offset = mps_reader_get_fragment_offset( rd ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 435 | |
| 436 | if( pending == 0 ) |
| 437 | { |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 438 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
| 439 | "No unsatisfied read-request has been logged." ); |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 440 | |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 441 | /* Check if there's data left to be consumed. */ |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 442 | if( commit < frag_offset || commit - frag_offset < frag_len ) |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 443 | { |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 444 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
| 445 | "There is data left to be consumed." ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 446 | rd->end = commit; |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 447 | MBEDTLS_MPS_TRACE_RETURN( MBEDTLS_ERR_MPS_READER_DATA_LEFT ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 448 | } |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 449 | |
Hanno Becker | b185543 | 2021-02-08 08:07:35 +0000 | [diff] [blame] | 450 | rd->acc_available = 0; |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 451 | rd->acc_share.acc_remaining = 0; |
| 452 | |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 453 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 454 | "Fragment has been fully processed and committed." ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 455 | } |
| 456 | else |
| 457 | { |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 458 | int overflow; |
| 459 | |
| 460 | mbedtls_mps_size_t acc_backup_offset; |
| 461 | mbedtls_mps_size_t acc_backup_len; |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 462 | mbedtls_mps_size_t frag_backup_offset; |
| 463 | mbedtls_mps_size_t frag_backup_len; |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 464 | |
| 465 | mbedtls_mps_size_t backup_len; |
| 466 | mbedtls_mps_size_t acc_len_needed; |
| 467 | |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 468 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 469 | "There has been an unsatisfied read with %u bytes overhead.", |
| 470 | (unsigned) pending ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 471 | |
| 472 | if( acc == NULL ) |
| 473 | { |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 474 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
| 475 | "No accumulator present" ); |
| 476 | MBEDTLS_MPS_TRACE_RETURN( |
| 477 | MBEDTLS_ERR_MPS_READER_NEED_ACCUMULATOR ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 478 | } |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 479 | acc_len = rd->acc_len; |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 480 | |
| 481 | /* Check if the upper layer has already fetched |
| 482 | * and committed the contents of the accumulator. */ |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 483 | if( commit < frag_offset ) |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 484 | { |
| 485 | /* No, accumulator is still being processed. */ |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 486 | frag_backup_offset = 0; |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 487 | frag_backup_len = frag_len; |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 488 | acc_backup_offset = commit; |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 489 | acc_backup_len = frag_offset - commit; |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 490 | } |
| 491 | else |
| 492 | { |
| 493 | /* Yes, the accumulator is already processed. */ |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 494 | frag_backup_offset = commit - frag_offset; |
| 495 | frag_backup_len = frag_len - frag_backup_offset; |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 496 | acc_backup_offset = 0; |
| 497 | acc_backup_len = 0; |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 498 | } |
| 499 | |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 500 | backup_len = acc_backup_len + frag_backup_len; |
| 501 | acc_len_needed = backup_len + pending; |
| 502 | |
| 503 | overflow = 0; |
| 504 | overflow |= ( backup_len < acc_backup_len ); |
| 505 | overflow |= ( acc_len_needed < backup_len ); |
| 506 | |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 507 | if( overflow || acc_len < acc_len_needed ) |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 508 | { |
| 509 | /* Except for the different return code, we behave as if |
| 510 | * there hadn't been a call to mbedtls_mps_reader_get() |
| 511 | * since the last commit. */ |
| 512 | rd->end = commit; |
| 513 | rd->pending = 0; |
| 514 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_error, |
| 515 | "The accumulator is too small to handle the backup." ); |
| 516 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_error, |
Hanno Becker | 1682a8b | 2021-02-22 16:38:56 +0000 | [diff] [blame^] | 517 | "* Size: %u", (unsigned) acc_len ); |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 518 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_error, |
| 519 | "* Needed: %u (%u + %u)", |
| 520 | (unsigned) acc_len_needed, |
| 521 | (unsigned) backup_len, (unsigned) pending ); |
| 522 | MBEDTLS_MPS_TRACE_RETURN( |
| 523 | MBEDTLS_ERR_MPS_READER_ACCUMULATOR_TOO_SMALL ); |
| 524 | } |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 525 | |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 526 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 527 | "Fragment backup: %u", (unsigned) frag_backup_len ); |
| 528 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
| 529 | "Accumulator backup: %u", (unsigned) acc_backup_len ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 530 | |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 531 | /* Move uncommitted parts from the accumulator to the front |
| 532 | * of the accumulator. */ |
| 533 | memmove( acc, acc + acc_backup_offset, acc_backup_len ); |
| 534 | |
| 535 | /* Copy uncmmitted parts of the current fragment to the |
| 536 | * accumulator. */ |
| 537 | memcpy( acc + acc_backup_len, |
| 538 | frag + frag_backup_offset, frag_backup_len ); |
| 539 | |
Hanno Becker | b185543 | 2021-02-08 08:07:35 +0000 | [diff] [blame] | 540 | rd->acc_available = backup_len; |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 541 | rd->acc_share.acc_remaining = pending; |
| 542 | |
| 543 | if( paused != NULL ) |
| 544 | *paused = 1; |
| 545 | } |
| 546 | |
| 547 | rd->frag = NULL; |
| 548 | rd->frag_len = 0; |
| 549 | |
Hanno Becker | 4f84e20 | 2021-02-08 06:54:30 +0000 | [diff] [blame] | 550 | rd->commit = 0; |
| 551 | rd->end = 0; |
| 552 | rd->pending = 0; |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 553 | |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 554 | MBEDTLS_MPS_TRACE( mbedtls_mps_trace_comment, |
| 555 | "Final state: aa %u, al %u, ar %u", |
Hanno Becker | b185543 | 2021-02-08 08:07:35 +0000 | [diff] [blame] | 556 | (unsigned) rd->acc_available, (unsigned) rd->acc_len, |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 557 | (unsigned) rd->acc_share.acc_remaining ); |
Hanno Becker | 984fbde | 2021-01-28 09:02:18 +0000 | [diff] [blame] | 558 | MBEDTLS_MPS_TRACE_RETURN( 0 ); |
Hanno Becker | 13cd784 | 2021-01-12 07:08:33 +0000 | [diff] [blame] | 559 | } |