Deleted Added
full compact
cryptosoft.c (167755) cryptosoft.c (169425)
1/* $OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $ */
2
3/*-
4 * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
5 * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting
6 *
7 * This code was written by Angelos D. Keromytis in Athens, Greece, in
8 * February 2000. Network Security Technologies Inc. (NSTI) kindly

--- 9 unchanged lines hidden (view full) ---

18 * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
19 * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
20 * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
21 * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
22 * PURPOSE.
23 */
24
25#include <sys/cdefs.h>
1/* $OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $ */
2
3/*-
4 * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
5 * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting
6 *
7 * This code was written by Angelos D. Keromytis in Athens, Greece, in
8 * February 2000. Network Security Technologies Inc. (NSTI) kindly

--- 9 unchanged lines hidden (view full) ---

18 * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
19 * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
20 * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
21 * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
22 * PURPOSE.
23 */
24
25#include <sys/cdefs.h>
26__FBSDID("$FreeBSD: head/sys/opencrypto/cryptosoft.c 167755 2007-03-21 03:42:51Z sam $");
26__FBSDID("$FreeBSD: head/sys/opencrypto/cryptosoft.c 169425 2007-05-09 19:37:02Z gnn $");
27
28#include <sys/param.h>
29#include <sys/systm.h>
30#include <sys/malloc.h>
31#include <sys/mbuf.h>
32#include <sys/module.h>
33#include <sys/sysctl.h>
34#include <sys/errno.h>

--- 621 unchanged lines hidden (view full) ---

656 txf = &enc_xform_cast5;
657 goto enccommon;
658 case CRYPTO_SKIPJACK_CBC:
659 txf = &enc_xform_skipjack;
660 goto enccommon;
661 case CRYPTO_RIJNDAEL128_CBC:
662 txf = &enc_xform_rijndael128;
663 goto enccommon;
27
28#include <sys/param.h>
29#include <sys/systm.h>
30#include <sys/malloc.h>
31#include <sys/mbuf.h>
32#include <sys/module.h>
33#include <sys/sysctl.h>
34#include <sys/errno.h>

--- 621 unchanged lines hidden (view full) ---

656 txf = &enc_xform_cast5;
657 goto enccommon;
658 case CRYPTO_SKIPJACK_CBC:
659 txf = &enc_xform_skipjack;
660 goto enccommon;
661 case CRYPTO_RIJNDAEL128_CBC:
662 txf = &enc_xform_rijndael128;
663 goto enccommon;
664 case CRYPTO_CAMELLIA_CBC:
665 txf = &enc_xform_camellia;
666 goto enccommon;
664 case CRYPTO_NULL_CBC:
665 txf = &enc_xform_null;
666 goto enccommon;
667 enccommon:
668 if (cri->cri_key != NULL) {
669 error = txf->setkey(&((*swd)->sw_kschedule),
670 cri->cri_key, cri->cri_klen / 8);
671 if (error) {

--- 139 unchanged lines hidden (view full) ---

811
812 switch (swd->sw_alg) {
813 case CRYPTO_DES_CBC:
814 case CRYPTO_3DES_CBC:
815 case CRYPTO_BLF_CBC:
816 case CRYPTO_CAST_CBC:
817 case CRYPTO_SKIPJACK_CBC:
818 case CRYPTO_RIJNDAEL128_CBC:
667 case CRYPTO_NULL_CBC:
668 txf = &enc_xform_null;
669 goto enccommon;
670 enccommon:
671 if (cri->cri_key != NULL) {
672 error = txf->setkey(&((*swd)->sw_kschedule),
673 cri->cri_key, cri->cri_klen / 8);
674 if (error) {

--- 139 unchanged lines hidden (view full) ---

814
815 switch (swd->sw_alg) {
816 case CRYPTO_DES_CBC:
817 case CRYPTO_3DES_CBC:
818 case CRYPTO_BLF_CBC:
819 case CRYPTO_CAST_CBC:
820 case CRYPTO_SKIPJACK_CBC:
821 case CRYPTO_RIJNDAEL128_CBC:
822 case CRYPTO_CAMELLIA_CBC:
819 case CRYPTO_NULL_CBC:
820 txf = swd->sw_exf;
821
822 if (swd->sw_kschedule)
823 txf->zerokey(&(swd->sw_kschedule));
824 break;
825
826 case CRYPTO_MD5_HMAC:

--- 96 unchanged lines hidden (view full) ---

923 }
924 switch (sw->sw_alg) {
925 case CRYPTO_DES_CBC:
926 case CRYPTO_3DES_CBC:
927 case CRYPTO_BLF_CBC:
928 case CRYPTO_CAST_CBC:
929 case CRYPTO_SKIPJACK_CBC:
930 case CRYPTO_RIJNDAEL128_CBC:
823 case CRYPTO_NULL_CBC:
824 txf = swd->sw_exf;
825
826 if (swd->sw_kschedule)
827 txf->zerokey(&(swd->sw_kschedule));
828 break;
829
830 case CRYPTO_MD5_HMAC:

--- 96 unchanged lines hidden (view full) ---

927 }
928 switch (sw->sw_alg) {
929 case CRYPTO_DES_CBC:
930 case CRYPTO_3DES_CBC:
931 case CRYPTO_BLF_CBC:
932 case CRYPTO_CAST_CBC:
933 case CRYPTO_SKIPJACK_CBC:
934 case CRYPTO_RIJNDAEL128_CBC:
935 case CRYPTO_CAMELLIA_CBC:
931 if ((crp->crp_etype = swcr_encdec(crd, sw,
932 crp->crp_buf, crp->crp_flags)) != 0)
933 goto done;
934 break;
935 case CRYPTO_NULL_CBC:
936 crp->crp_etype = 0;
937 break;
938 case CRYPTO_MD5_HMAC:

--- 75 unchanged lines hidden (view full) ---

1014 REGISTER(CRYPTO_SHA2_512_HMAC);
1015 REGISTER(CRYPTO_RIPEMD160_HMAC);
1016 REGISTER(CRYPTO_NULL_HMAC);
1017 REGISTER(CRYPTO_MD5_KPDK);
1018 REGISTER(CRYPTO_SHA1_KPDK);
1019 REGISTER(CRYPTO_MD5);
1020 REGISTER(CRYPTO_SHA1);
1021 REGISTER(CRYPTO_RIJNDAEL128_CBC);
936 if ((crp->crp_etype = swcr_encdec(crd, sw,
937 crp->crp_buf, crp->crp_flags)) != 0)
938 goto done;
939 break;
940 case CRYPTO_NULL_CBC:
941 crp->crp_etype = 0;
942 break;
943 case CRYPTO_MD5_HMAC:

--- 75 unchanged lines hidden (view full) ---

1019 REGISTER(CRYPTO_SHA2_512_HMAC);
1020 REGISTER(CRYPTO_RIPEMD160_HMAC);
1021 REGISTER(CRYPTO_NULL_HMAC);
1022 REGISTER(CRYPTO_MD5_KPDK);
1023 REGISTER(CRYPTO_SHA1_KPDK);
1024 REGISTER(CRYPTO_MD5);
1025 REGISTER(CRYPTO_SHA1);
1026 REGISTER(CRYPTO_RIJNDAEL128_CBC);
1027 REGISTER(CRYPTO_CAMELLIA_CBC);
1022 REGISTER(CRYPTO_DEFLATE_COMP);
1023#undef REGISTER
1024
1025 return 0;
1026}
1027
1028static void
1029swcr_detach(device_t dev)

--- 38 unchanged lines hidden ---
1028 REGISTER(CRYPTO_DEFLATE_COMP);
1029#undef REGISTER
1030
1031 return 0;
1032}
1033
1034static void
1035swcr_detach(device_t dev)

--- 38 unchanged lines hidden ---