From b376ae131d9e99a90ddbee2015a2e19d67244ba1 Mon Sep 17 00:00:00 2001 From: Christian Mauderer Date: Thu, 3 May 2018 14:15:11 +0200 Subject: ipsec-tools: Port libipsec, setkey and racoon. Note that this replaces the libipsec from FreeBSD with the one provided by ipsec-tools. --- rtemsbsd/include/machine/rtems-bsd-commands.h | 4 ++ rtemsbsd/include/machine/rtems-bsd-racoon.h | 52 +++++++++++++++++++++ rtemsbsd/include/rtems/netcmds-config.h | 3 ++ rtemsbsd/rtems/rtems-bsd-shell-racoon.c | 40 ++++++++++++++++ rtemsbsd/rtems/rtems-bsd-shell-setkey.c | 40 ++++++++++++++++ rtemsbsd/rtems/rtems-kernel-wpa-supplicant.c | 5 +- rtemsbsd/rtems/rtems-racoon-mutex.c | 66 +++++++++++++++++++++++++++ 7 files changed, 206 insertions(+), 4 deletions(-) create mode 100644 rtemsbsd/include/machine/rtems-bsd-racoon.h create mode 100644 rtemsbsd/rtems/rtems-bsd-shell-racoon.c create mode 100644 rtemsbsd/rtems/rtems-bsd-shell-setkey.c create mode 100644 rtemsbsd/rtems/rtems-racoon-mutex.c (limited to 'rtemsbsd') diff --git a/rtemsbsd/include/machine/rtems-bsd-commands.h b/rtemsbsd/include/machine/rtems-bsd-commands.h index 7e72627d..7717c1ea 100644 --- a/rtemsbsd/include/machine/rtems-bsd-commands.h +++ b/rtemsbsd/include/machine/rtems-bsd-commands.h @@ -74,6 +74,10 @@ int rtems_bsd_command_wlanstats(int argc, char **argv); int rtems_bsd_command_stty(int argc, char **argv); +int rtems_bsd_command_racoon(int argc, char **argv); + +int rtems_bsd_command_setkey(int argc, char **argv); + __END_DECLS #endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_COMMANDS_H_ */ diff --git a/rtemsbsd/include/machine/rtems-bsd-racoon.h b/rtemsbsd/include/machine/rtems-bsd-racoon.h new file mode 100644 index 00000000..b0d9c00e --- /dev/null +++ b/rtemsbsd/include/machine/rtems-bsd-racoon.h @@ -0,0 +1,52 @@ +/** + * @file + * + * @ingroup rtems_bsd_machine + * + * @brief TODO. + */ + +/* + * Copyright (c) 2018 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_RACOON_H_ +#define _RTEMS_BSD_MACHINE_RTEMS_BSD_RACOON_H_ + +#include + +__BEGIN_DECLS + +void rtems_bsd_racoon_lock(void); +void rtems_bsd_racoon_unlock(void); + +__END_DECLS + +#endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_RACOON_H_ */ diff --git a/rtemsbsd/include/rtems/netcmds-config.h b/rtemsbsd/include/rtems/netcmds-config.h index 4af43231..ce84c155 100644 --- a/rtemsbsd/include/rtems/netcmds-config.h +++ b/rtemsbsd/include/rtems/netcmds-config.h @@ -51,6 +51,9 @@ extern rtems_shell_cmd_t rtems_shell_WLANSTATS_Command; extern rtems_shell_cmd_t rtems_shell_STTY_Command; +extern rtems_shell_cmd_t rtems_shell_RACOON_Command; +extern rtems_shell_cmd_t rtems_shell_SETKEY_Command; + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/rtemsbsd/rtems/rtems-bsd-shell-racoon.c b/rtemsbsd/rtems/rtems-bsd-shell-racoon.c new file mode 100644 index 00000000..3ca58290 --- /dev/null +++ b/rtemsbsd/rtems/rtems-bsd-shell-racoon.c @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2018 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include + +rtems_shell_cmd_t rtems_shell_RACOON_Command = { + .name = "racoon", + .usage = "racoon [args]", + .topic = "net", + .command = rtems_bsd_command_racoon +}; diff --git a/rtemsbsd/rtems/rtems-bsd-shell-setkey.c b/rtemsbsd/rtems/rtems-bsd-shell-setkey.c new file mode 100644 index 00000000..abed565a --- /dev/null +++ b/rtemsbsd/rtems/rtems-bsd-shell-setkey.c @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2018 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include + +rtems_shell_cmd_t rtems_shell_SETKEY_Command = { + .name = "setkey", + .usage = "setkey [args]", + .topic = "net", + .command = rtems_bsd_command_setkey +}; diff --git a/rtemsbsd/rtems/rtems-kernel-wpa-supplicant.c b/rtemsbsd/rtems/rtems-kernel-wpa-supplicant.c index 0403f443..8e3bdfa1 100644 --- a/rtemsbsd/rtems/rtems-kernel-wpa-supplicant.c +++ b/rtemsbsd/rtems/rtems-kernel-wpa-supplicant.c @@ -40,15 +40,12 @@ */ #include -#include +#include #include #include -#include #include -#include - static struct mtx wpa_supplicant_mtx; MTX_SYSINIT(rtems_bsd_wpa_supplicant, &wpa_supplicant_mtx, "BSD WPA Supplicant", diff --git a/rtemsbsd/rtems/rtems-racoon-mutex.c b/rtemsbsd/rtems/rtems-racoon-mutex.c new file mode 100644 index 00000000..4356f395 --- /dev/null +++ b/rtemsbsd/rtems/rtems-racoon-mutex.c @@ -0,0 +1,66 @@ +/** + * @file + * + * @ingroup rtems_bsd_rtems + * + * @brief Mutex for protecting racoon. + * + * racoon needs it's own mutex so it can be used as a service. + */ + +/* + * Copyright (c) 2018 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include + +#include +#include +#include +#include + +#include + +static struct mtx racoon_mtx; + +MTX_SYSINIT(rtems_bsd_racoon, &racoon_mtx, "racoon daemon mutex", MTX_DEF); + +void +rtems_bsd_racoon_lock(void) +{ + mtx_lock(&racoon_mtx); +} + +void +rtems_bsd_racoon_unlock(void) +{ + mtx_unlock(&racoon_mtx); +} -- cgit v1.2.3