1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
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
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
128
129
130
131
132
133
134
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
|
/* pw-argon2.c - Password module for argon2 */
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
* Copyright 2017-2021 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted only as authorized by the OpenLDAP
* Public License.
*
* A copy of this license is available in the file LICENSE in the
* top-level directory of the distribution or, alternatively, at
* <http://www.OpenLDAP.org/license.html>.
*/
#include "portable.h"
#include "ac/string.h"
#include "lber_pvt.h"
#include "lutil.h"
#include <stdint.h>
#include <stdlib.h>
#ifdef SLAPD_ARGON2_USE_ARGON2
#include <argon2.h>
/*
* For now, we hardcode the default values from the argon2 command line tool
* (as of argon2 release 20161029)
*/
#define SLAPD_ARGON2_ITERATIONS 3
#define SLAPD_ARGON2_MEMORY (1 << 12)
#define SLAPD_ARGON2_PARALLELISM 1
#define SLAPD_ARGON2_SALT_LENGTH 16
#define SLAPD_ARGON2_HASH_LENGTH 32
#else /* !SLAPD_ARGON2_USE_ARGON2 */
#include <sodium.h>
/*
* Or libsodium interactive settings
*/
#define SLAPD_ARGON2_ITERATIONS crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE
#define SLAPD_ARGON2_MEMORY (crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE / 1024)
#define SLAPD_ARGON2_PARALLELISM 1
#define SLAPD_ARGON2_SALT_LENGTH crypto_pwhash_argon2id_SALTBYTES
#define SLAPD_ARGON2_HASH_LENGTH 32
#endif
static unsigned long iterations = SLAPD_ARGON2_ITERATIONS;
static unsigned long memory = SLAPD_ARGON2_MEMORY;
static unsigned long parallelism = SLAPD_ARGON2_PARALLELISM;
const struct berval slapd_argon2_scheme = BER_BVC("{ARGON2}");
static int
slapd_argon2_hash(
const struct berval *scheme,
const struct berval *passwd,
struct berval *hash,
const char **text )
{
/*
* Duplicate these values here so future code which allows
* configuration has an easier time.
*/
uint32_t salt_length, hash_length;
char *p;
int rc = LUTIL_PASSWD_ERR;
#ifdef SLAPD_ARGON2_USE_ARGON2
struct berval salt;
size_t encoded_length;
salt_length = SLAPD_ARGON2_SALT_LENGTH;
hash_length = SLAPD_ARGON2_HASH_LENGTH;
encoded_length = argon2_encodedlen( iterations, memory, parallelism,
salt_length, hash_length, Argon2_id );
salt.bv_len = salt_length;
salt.bv_val = ber_memalloc( salt.bv_len );
if ( salt.bv_val == NULL ) {
return LUTIL_PASSWD_ERR;
}
if ( lutil_entropy( (unsigned char*)salt.bv_val, salt.bv_len ) ) {
ber_memfree( salt.bv_val );
return LUTIL_PASSWD_ERR;
}
p = hash->bv_val = ber_memalloc( scheme->bv_len + encoded_length );
if ( p == NULL ) {
ber_memfree( salt.bv_val );
return LUTIL_PASSWD_ERR;
}
AC_MEMCPY( p, scheme->bv_val, scheme->bv_len );
p += scheme->bv_len;
/*
* Do the actual heavy lifting
*/
if ( argon2i_hash_encoded( iterations, memory, parallelism,
passwd->bv_val, passwd->bv_len,
salt.bv_val, salt_length, hash_length,
p, encoded_length ) == 0 ) {
rc = LUTIL_PASSWD_OK;
}
hash->bv_len = scheme->bv_len + encoded_length;
ber_memfree( salt.bv_val );
#else /* !SLAPD_ARGON2_USE_ARGON2 */
/* Not exposed by libsodium
salt_length = SLAPD_ARGON2_SALT_LENGTH;
hash_length = SLAPD_ARGON2_HASH_LENGTH;
*/
p = hash->bv_val = ber_memalloc( scheme->bv_len + crypto_pwhash_STRBYTES );
if ( p == NULL ) {
return LUTIL_PASSWD_ERR;
}
AC_MEMCPY( hash->bv_val, scheme->bv_val, scheme->bv_len );
p += scheme->bv_len;
if ( crypto_pwhash_str_alg( p, passwd->bv_val, passwd->bv_len,
iterations, memory * 1024,
crypto_pwhash_ALG_ARGON2ID13 ) == 0 ) {
hash->bv_len = strlen( hash->bv_val );
rc = LUTIL_PASSWD_OK;
}
#endif
if ( rc ) {
ber_memfree( hash->bv_val );
return LUTIL_PASSWD_ERR;
}
return LUTIL_PASSWD_OK;
}
static int
slapd_argon2_verify(
const struct berval *scheme,
const struct berval *passwd,
const struct berval *cred,
const char **text )
{
int rc = LUTIL_PASSWD_ERR;
#ifdef SLAPD_ARGON2_USE_ARGON2
if ( strncmp( passwd->bv_val, "$argon2i$", STRLENOF("$argon2i$") ) == 0 ) {
rc = argon2i_verify( passwd->bv_val, cred->bv_val, cred->bv_len );
} else if ( strncmp( passwd->bv_val, "$argon2d$", STRLENOF("$argon2d$") ) == 0 ) {
rc = argon2d_verify( passwd->bv_val, cred->bv_val, cred->bv_len );
} else if ( strncmp( passwd->bv_val, "$argon2id$", STRLENOF("$argon2id$") ) == 0 ) {
rc = argon2id_verify( passwd->bv_val, cred->bv_val, cred->bv_len );
}
#else /* !SLAPD_ARGON2_USE_ARGON2 */
rc = crypto_pwhash_str_verify( passwd->bv_val, cred->bv_val, cred->bv_len );
#endif
if ( rc ) {
return LUTIL_PASSWD_ERR;
}
return LUTIL_PASSWD_OK;
}
int init_module( int argc, char *argv[] )
{
int i;
#ifndef SLAPD_ARGON2_USE_ARGON2
if ( sodium_init() == -1 ) {
return -1;
}
#endif
for ( i=0; i < argc; i++ ) {
char *p;
unsigned long value;
switch ( *argv[i] ) {
case 'm':
p = strchr( argv[i], '=' );
if ( !p || lutil_atoulx( &value, p+1, 0 ) ) {
return -1;
}
memory = value;
break;
case 't':
p = strchr( argv[i], '=' );
if ( !p || lutil_atoulx( &value, p+1, 0 ) ) {
return -1;
}
iterations = value;
break;
case 'p':
p = strchr( argv[i], '=' );
if ( !p || lutil_atoulx( &value, p+1, 0 ) ) {
return -1;
}
parallelism = value;
break;
default:
return -1;
}
}
return lutil_passwd_add( (struct berval *)&slapd_argon2_scheme,
slapd_argon2_verify, slapd_argon2_hash );
}
|
