diff options
| author | tuexen <tuexen@FreeBSD.org> | 2013-09-02 22:48:41 +0000 |
|---|---|---|
| committer | tuexen <tuexen@FreeBSD.org> | 2013-09-02 22:48:41 +0000 |
| commit | 7d2fcf19325313868b67d9952d27f94df3f54a5e (patch) | |
| tree | 54148587f470a4d630cfbd1b7480e771bc34c3c6 /sys/netinet/sctp_os_bsd.h | |
| parent | 770a4ce79bdc3984cbfaf823903b7a4bcbe2b5f6 (diff) | |
| download | FreeBSD-src-7d2fcf19325313868b67d9952d27f94df3f54a5e.zip FreeBSD-src-7d2fcf19325313868b67d9952d27f94df3f54a5e.tar.gz | |
All changes affect only SCTP-AUTH:
* Remove non working code related to SHA224.
* Remove support for non-standardised HMAC-IDs using SHA384 and SHA512.
* Prefer SHA256 over SHA1.
* Minor cleanup.
MFC after: 2 weeks
Diffstat (limited to 'sys/netinet/sctp_os_bsd.h')
| -rw-r--r-- | sys/netinet/sctp_os_bsd.h | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h index 252ea93..2159bbc 100644 --- a/sys/netinet/sctp_os_bsd.h +++ b/sys/netinet/sctp_os_bsd.h @@ -104,6 +104,9 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip_options.h> +#include <crypto/sha1.h> +#include <crypto/sha2/sha2.h> + #ifndef in6pcb #define in6pcb inpcb #endif @@ -468,23 +471,18 @@ sctp_get_mbuf_for_msg(unsigned int space_needed, /* * SCTP AUTH */ -#define HAVE_SHA2 - #define SCTP_READ_RANDOM(buf, len) read_random(buf, len) -#ifdef USE_SCTP_SHA1 -#include <netinet/sctp_sha1.h> -#else -#include <crypto/sha1.h> /* map standard crypto API names */ -#define SHA1_Init SHA1Init -#define SHA1_Update SHA1Update -#define SHA1_Final(x,y) SHA1Final((caddr_t)x, y) -#endif - -#if defined(HAVE_SHA2) -#include <crypto/sha2/sha2.h> -#endif +#define SCTP_SHA1_CTX SHA1_CTX +#define SCTP_SHA1_INIT SHA1Init +#define SCTP_SHA1_UPDATE SHA1Update +#define SCTP_SHA1_FINAL(x,y) SHA1Final((caddr_t)x, y) + +#define SCTP_SHA256_CTX SHA256_CTX +#define SCTP_SHA256_INIT SHA256_Init +#define SCTP_SHA256_UPDATE SHA256_Update +#define SCTP_SHA256_FINAL(x,y) SHA256_Final((caddr_t)x, y) #endif |
