| kcrypto.c (184588) | kcrypto.c (298649) |
|---|---|
| 1/*- 2 * Copyright (c) 2008 Isilon Inc http://www.isilon.com/ 3 * Authors: Doug Rabson <dfr@rabson.org> 4 * Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org> 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 12 unchanged lines hidden (view full) --- 21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * SUCH DAMAGE. 26 */ 27 28#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2008 Isilon Inc http://www.isilon.com/ 3 * Authors: Doug Rabson <dfr@rabson.org> 4 * Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org> 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 12 unchanged lines hidden (view full) --- 21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * SUCH DAMAGE. 26 */ 27 28#include <sys/cdefs.h> |
| 29__FBSDID("$FreeBSD: head/sys/kgssapi/krb5/kcrypto.c 184588 2008-11-03 10:38:00Z dfr $"); | 29__FBSDID("$FreeBSD: head/sys/kgssapi/krb5/kcrypto.c 298649 2016-04-26 15:38:17Z pfg $"); |
| 30 31#include <sys/param.h> 32#include <sys/malloc.h> 33#include <sys/kobj.h> 34#include <sys/mbuf.h> 35 36#include <kgssapi/gssapi.h> 37#include <kgssapi/gssapi_impl.h> --- 159 unchanged lines hidden (view full) --- 197 */ 198 folded = malloc(ec->ec_blocklen, M_GSSAPI, M_WAITOK); 199 krb5_n_fold(folded, ec->ec_blocklen, constant, constantlen); 200 201 /* 202 * Generate enough bytes for keybits rounded up to a multiple 203 * of blocklen. 204 */ | 30 31#include <sys/param.h> 32#include <sys/malloc.h> 33#include <sys/kobj.h> 34#include <sys/mbuf.h> 35 36#include <kgssapi/gssapi.h> 37#include <kgssapi/gssapi_impl.h> --- 159 unchanged lines hidden (view full) --- 197 */ 198 folded = malloc(ec->ec_blocklen, M_GSSAPI, M_WAITOK); 199 krb5_n_fold(folded, ec->ec_blocklen, constant, constantlen); 200 201 /* 202 * Generate enough bytes for keybits rounded up to a multiple 203 * of blocklen. 204 */ |
| 205 randomlen = ((ec->ec_keybits/8 + ec->ec_blocklen - 1) / ec->ec_blocklen) 206 * ec->ec_blocklen; | 205 randomlen = roundup(ec->ec_keybits / 8, ec->ec_blocklen); |
| 207 bytes = malloc(randomlen, M_GSSAPI, M_WAITOK); 208 MGET(m, M_WAITOK, MT_DATA); 209 m->m_len = ec->ec_blocklen; 210 for (i = 0, p = bytes, q = folded; i < randomlen; 211 q = p, i += ec->ec_blocklen, p += ec->ec_blocklen) { 212 bcopy(q, m->m_data, ec->ec_blocklen); 213 krb5_encrypt(inkey, m, 0, ec->ec_blocklen, NULL, 0); 214 bcopy(m->m_data, p, ec->ec_blocklen); --- 52 unchanged lines hidden --- | 206 bytes = malloc(randomlen, M_GSSAPI, M_WAITOK); 207 MGET(m, M_WAITOK, MT_DATA); 208 m->m_len = ec->ec_blocklen; 209 for (i = 0, p = bytes, q = folded; i < randomlen; 210 q = p, i += ec->ec_blocklen, p += ec->ec_blocklen) { 211 bcopy(q, m->m_data, ec->ec_blocklen); 212 krb5_encrypt(inkey, m, 0, ec->ec_blocklen, NULL, 0); 213 bcopy(m->m_data, p, ec->ec_blocklen); --- 52 unchanged lines hidden --- |