Overview
Comment: | Move parameters for of_scrypt() to a struct
This should make it more readable for such a large number of parameters. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
63f5276b3370925ae4c8decb5f6fbf10 |
User & Date: | js on 2020-06-21 22:08:00 |
Other Links: | manifest | tags |
Context
2020-06-21
| ||
22:12 | Makefile: Add docs target check-in: 2dd5d682eb user: js tags: trunk | |
22:08 | Move parameters for of_scrypt() to a struct check-in: 63f5276b33 user: js tags: trunk | |
21:30 | Move parameters for of_pbkdf2() to a struct check-in: b9641347e3 user: js tags: trunk | |
Changes
Modified src/pbkdf2.h from [139e147fae] to [ca3cc52cca].
︙ | |||
47 48 49 50 51 52 53 | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | - + | /*! @brief The length of the password. */ size_t passwordLength; /*! @brief The buffer to write the key to. */ unsigned char *key; /*! * @brief The desired length for the derived key. * |
︙ |
Modified src/scrypt.h from [73098e0bc6] to [2a97d56e0e].
︙ | |||
26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - - - - - - - - - + - - - | OF_ASSUME_NONNULL_BEGIN /*! @file */ @class OFHMAC; /*! * @brief The parameters for @ref of_scrypt. */ typedef struct of_scrypt_parameters_t { /*! @brief The block size to use. */ size_t blockSize; /*! @brief The CPU/memory cost factor to use. */ size_t costFactor; /*! @brief The parallelization to use. */ size_t parallelization; /*! @brief The salt to derive a key with. */ const unsigned char *salt; /*! @brief The length of the salt. */ size_t saltLength; /*! @brief The password to derive a key from. */ const char *password; /*! @brief The length of the password. */ size_t passwordLength; /*! @brief The buffer to write the key to. */ unsigned char *key; /*! * @brief The desired length for the derived key. * * @ref key needs to have enough storage. */ size_t keyLength; /*! @brief Whether data may be stored in swappable memory. */ bool allowsSwappableMemory; } of_scrypt_parameters_t; #ifdef __cplusplus extern "C" { #endif extern void of_salsa20_8_core(uint32_t buffer[_Nonnull 16]); extern void of_scrypt_block_mix(uint32_t *output, const uint32_t *input, size_t blockSize); extern void of_scrypt_romix(uint32_t *buffer, size_t blockSize, size_t costFactor, uint32_t *tmp); /*! * @brief Derives a key from a password and a salt using scrypt. * |
Modified src/scrypt.m from [42e8413fd6] to [163ddcc8f1].
︙ | |||
81 82 83 84 85 86 87 | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | - - + + | void of_scrypt_block_mix(uint32_t *output, const uint32_t *input, size_t blockSize) { uint32_t tmp[16]; /* Check defined here and executed in of_scrypt() */ #define OVERFLOW_CHECK_1 \ |
︙ | |||
108 109 110 111 112 113 114 | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | - - + + | } void of_scrypt_romix(uint32_t *buffer, size_t blockSize, size_t costFactor, uint32_t *tmp) { /* Check defined here and executed in of_scrypt() */ |
︙ | |||
135 136 137 138 139 140 141 | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 | - - + + - - - - + + + - - + + - - - + + + - + - - - + + + - + - - - - - - - - - + + + + + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + + | of_scrypt_block_mix(buffer, tmp, blockSize); if (i < costFactor - 1) memcpy(tmp, buffer, 128 * blockSize); } } |
Modified tests/PBKDF2Tests.m from [f87038c7c8] to [1bccd3d759].
︙ | |||
31 32 33 34 35 36 37 | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 | - - - - - - - - + + + + + + + + - - - + + - - - - - - - - + + + + + + + + - - - + + - - - - - - - - + + + + + + + + - - - + + - - - - - - - - + + + + + + + + - - - + + - - - - - - - - + + + + + + + + + - + - - - - - - - - + + + + + + + + - - - + + | allowsSwappableMemory: true]; unsigned char key[25]; /* Test vectors from RFC 6070 */ TEST(@"PBKDF2-SHA1, 1 iteration", R(of_pbkdf2((of_pbkdf2_parameters_t){ |
Modified tests/ScryptTests.m from [dc13eea305] to [b2b1c50b4e].
︙ | |||
152 153 154 155 156 157 158 | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 | + + + + - - + + + + + + + + + + + + - - + + + + + + + + + + + + - - - + + + + + + + + + + + + - - - + + + + + + + + | TEST(@"ROMix", R(memcpy(ROMixBuffer, ROMixInput, 128)) && R(of_scrypt_romix(ROMixBuffer, 1, 16, ROMixTmp)) && memcmp(ROMixBuffer, ROMixOutput, 128) == 0) TEST(@"scrypt test vector #1", R(of_scrypt((of_scrypt_parameters_t){ .blockSize = 1, .costFactor = 16, .parallelization = 1, |