Update to FreeBSD head 2018-10-23

Git mirror commit 59f44d20be3f99d181ca742e636d45fc39ec982b.

This commit updates OpenSSL to version 1.1.1.  This required an update
of racoon which uses some internal stuff from OpenSSL and seems to be
mostly unmaintained, e.g. there is update in the FreeBSD ports to cope
with OpenSSL 1.1.1.

Update #3472.

5 files changed, 96 insertions, 96 deletions

diff --git a/ipsec-tools/src/setkey/rtems-bsd-setkey-data.h b/ipsec-tools/src/setkey/rtems-bsd-setkey-data.h
index adf04e39..19b9f49b 100644
--- a/ipsec-tools/src/setkey/rtems-bsd-setkey-data.h
+++ b/ipsec-tools/src/setkey/rtems-bsd-setkey-data.h
@@ -1,34 +1,34 @@
 /* generated by userspace-header-gen.py */
 #include <rtems/linkersets.h>
 /* parse_wrapper.c */
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int setkeyyychar);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int setkeyyydebug);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int setkeyyynerrs);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int setkeyyyerrflag);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int setkeyyychar);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int setkeyyynerrs);
 /* setkey.c */
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_rfcmode);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int lineno);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int last_msg_type);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern u_int32_t last_priority);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int exit_now);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern u_char m_buf[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern u_int m_len);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_all);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_cmddump);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_debug);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int so);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_forever);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_all);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_verbose);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_hexdump);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_mode);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_cmddump);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_notreally);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_policy);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_hexdump);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_rfcmode);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_rkwarn);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_tflag);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_notreally);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_verbose);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_withports);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int f_rkwarn);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int last_msg_type);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int lineno);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int so);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern u_char m_buf[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern u_int m_len);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern u_int32_t last_priority);
 /* token_wrapper.c */
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern FILE *setkeyyyin);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern FILE *setkeyyyout);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int setkeyyylineno);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int setkeyyy_flex_debug);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern char *setkeyyytext);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int setkeyyy_flex_debug);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern int setkeyyylineno);
diff --git a/ipsec-tools/src/setkey/rtems-bsd-setkey-namespace.h b/ipsec-tools/src/setkey/rtems-bsd-setkey-namespace.h
index 7d71da7e..818726c7 100644
--- a/ipsec-tools/src/setkey/rtems-bsd-setkey-namespace.h
+++ b/ipsec-tools/src/setkey/rtems-bsd-setkey-namespace.h
@@ -1,81 +1,81 @@
 /* generated by userspace-header-gen.py */
 /* parse_wrapper.c */
+#define free_buffer _bsd_setkey_free_buffer
+#define parse_init _bsd_setkey_parse_init
+#define setkeymsg0 _bsd_setkey_setkeymsg0
+#define setkeyyychar _bsd_setkey_setkeyyychar
 #define setkeyyydebug _bsd_setkey_setkeyyydebug
-#define setkeyyynerrs _bsd_setkey_setkeyyynerrs
 #define setkeyyyerrflag _bsd_setkey_setkeyyyerrflag
-#define setkeyyychar _bsd_setkey_setkeyyychar
-#define setkeyyyval _bsd_setkey_setkeyyyval
 #define setkeyyylval _bsd_setkey_setkeyyylval
+#define setkeyyynerrs _bsd_setkey_setkeyyynerrs
 #define setkeyyyparse _bsd_setkey_setkeyyyparse
-#define free_buffer _bsd_setkey_free_buffer
-#define parse_init _bsd_setkey_parse_init
-#define setkeymsg0 _bsd_setkey_setkeymsg0
+#define setkeyyyval _bsd_setkey_setkeyyyval
 /* setkey.c */
-#define f_rfcmode _bsd_setkey_f_rfcmode
-#define lineno _bsd_setkey_lineno
-#define last_msg_type _bsd_setkey_last_msg_type
-#define last_priority _bsd_setkey_last_priority
 #define exit_now _bsd_setkey_exit_now
-#define m_buf _bsd_setkey_m_buf
-#define m_len _bsd_setkey_m_len
+#define f_all _bsd_setkey_f_all
+#define f_cmddump _bsd_setkey_f_cmddump
 #define f_debug _bsd_setkey_f_debug
-#define so _bsd_setkey_so
 #define f_forever _bsd_setkey_f_forever
-#define f_all _bsd_setkey_f_all
-#define f_verbose _bsd_setkey_f_verbose
+#define f_hexdump _bsd_setkey_f_hexdump
 #define f_mode _bsd_setkey_f_mode
-#define f_cmddump _bsd_setkey_f_cmddump
+#define f_notreally _bsd_setkey_f_notreally
 #define f_policy _bsd_setkey_f_policy
-#define f_hexdump _bsd_setkey_f_hexdump
+#define f_rfcmode _bsd_setkey_f_rfcmode
+#define f_rkwarn _bsd_setkey_f_rkwarn
 #define f_tflag _bsd_setkey_f_tflag
-#define f_notreally _bsd_setkey_f_notreally
+#define f_verbose _bsd_setkey_f_verbose
 #define f_withports _bsd_setkey_f_withports
-#define f_rkwarn _bsd_setkey_f_rkwarn
-#define shortdump _bsd_setkey_shortdump
-#define shortdump_hdr _bsd_setkey_shortdump_hdr
-#define numstr _bsd_setkey_numstr
 #define fileproc _bsd_setkey_fileproc
+#define get_supported _bsd_setkey_get_supported
+#define last_msg_type _bsd_setkey_last_msg_type
+#define last_priority _bsd_setkey_last_priority
+#define lineno _bsd_setkey_lineno
+#define m_buf _bsd_setkey_m_buf
+#define m_len _bsd_setkey_m_len
+#define numstr _bsd_setkey_numstr
 #define postproc _bsd_setkey_postproc
+#define promisc _bsd_setkey_promisc
 #define sendkeymsg _bsd_setkey_sendkeymsg
 #define sendkeymsg_spigrep _bsd_setkey_sendkeymsg_spigrep
-#define promisc _bsd_setkey_promisc
 #define sendkeyshort _bsd_setkey_sendkeyshort
+#define shortdump _bsd_setkey_shortdump
+#define shortdump_hdr _bsd_setkey_shortdump_hdr
+#define so _bsd_setkey_so
 #define stdin_loop _bsd_setkey_stdin_loop
-#define get_supported _bsd_setkey_get_supported
 #define usage _bsd_setkey_usage
 /* token_wrapper.c */
-#define setkeyyyleng _bsd_setkey_setkeyyyleng
-#define setkeyyyin _bsd_setkey_setkeyyyin
-#define setkeyyyout _bsd_setkey_setkeyyyout
-#define setkeyyylineno _bsd_setkey_setkeyyylineno
-#define setkeyyy_flex_debug _bsd_setkey_setkeyyy_flex_debug
-#define setkeyyytext _bsd_setkey_setkeyyytext
-#define parse_string _bsd_setkey_parse_string
 #define parse _bsd_setkey_parse
-#define yyerror _bsd_setkey_yyerror
-#define yyfatal _bsd_setkey_yyfatal
-#define setkeyyyfree _bsd_setkey_setkeyyyfree
-#define setkeyyyrealloc _bsd_setkey_setkeyyyrealloc
+#define parse_string _bsd_setkey_parse_string
+#define setkeyyy_create_buffer _bsd_setkey_setkeyyy_create_buffer
+#define setkeyyy_delete_buffer _bsd_setkey_setkeyyy_delete_buffer
+#define setkeyyy_flex_debug _bsd_setkey_setkeyyy_flex_debug
+#define setkeyyy_flush_buffer _bsd_setkey_setkeyyy_flush_buffer
+#define setkeyyy_scan_buffer _bsd_setkey_setkeyyy_scan_buffer
+#define setkeyyy_scan_bytes _bsd_setkey_setkeyyy_scan_bytes
+#define setkeyyy_scan_string _bsd_setkey_setkeyyy_scan_string
+#define setkeyyy_switch_to_buffer _bsd_setkey_setkeyyy_switch_to_buffer
 #define setkeyyyalloc _bsd_setkey_setkeyyyalloc
-#define setkeyyylex_destroy _bsd_setkey_setkeyyylex_destroy
-#define setkeyyyset_debug _bsd_setkey_setkeyyyset_debug
+#define setkeyyyfree _bsd_setkey_setkeyyyfree
 #define setkeyyyget_debug _bsd_setkey_setkeyyyget_debug
-#define setkeyyyset_out _bsd_setkey_setkeyyyset_out
-#define setkeyyyset_in _bsd_setkey_setkeyyyset_in
-#define setkeyyyset_lineno _bsd_setkey_setkeyyyset_lineno
-#define setkeyyyget_text _bsd_setkey_setkeyyyget_text
-#define setkeyyyget_leng _bsd_setkey_setkeyyyget_leng
-#define setkeyyyget_out _bsd_setkey_setkeyyyget_out
 #define setkeyyyget_in _bsd_setkey_setkeyyyget_in
+#define setkeyyyget_leng _bsd_setkey_setkeyyyget_leng
 #define setkeyyyget_lineno _bsd_setkey_setkeyyyget_lineno
-#define setkeyyy_scan_bytes _bsd_setkey_setkeyyy_scan_bytes
-#define setkeyyy_scan_string _bsd_setkey_setkeyyy_scan_string
-#define setkeyyy_scan_buffer _bsd_setkey_setkeyyy_scan_buffer
+#define setkeyyyget_out _bsd_setkey_setkeyyyget_out
+#define setkeyyyget_text _bsd_setkey_setkeyyyget_text
+#define setkeyyyin _bsd_setkey_setkeyyyin
+#define setkeyyyleng _bsd_setkey_setkeyyyleng
+#define setkeyyylex _bsd_setkey_setkeyyylex
+#define setkeyyylex_destroy _bsd_setkey_setkeyyylex_destroy
+#define setkeyyylineno _bsd_setkey_setkeyyylineno
+#define setkeyyyout _bsd_setkey_setkeyyyout
 #define setkeyyypop_buffer_state _bsd_setkey_setkeyyypop_buffer_state
 #define setkeyyypush_buffer_state _bsd_setkey_setkeyyypush_buffer_state
-#define setkeyyy_flush_buffer _bsd_setkey_setkeyyy_flush_buffer
-#define setkeyyy_delete_buffer _bsd_setkey_setkeyyy_delete_buffer
-#define setkeyyy_create_buffer _bsd_setkey_setkeyyy_create_buffer
-#define setkeyyy_switch_to_buffer _bsd_setkey_setkeyyy_switch_to_buffer
+#define setkeyyyrealloc _bsd_setkey_setkeyyyrealloc
 #define setkeyyyrestart _bsd_setkey_setkeyyyrestart
-#define setkeyyylex _bsd_setkey_setkeyyylex
+#define setkeyyyset_debug _bsd_setkey_setkeyyyset_debug
+#define setkeyyyset_in _bsd_setkey_setkeyyyset_in
+#define setkeyyyset_lineno _bsd_setkey_setkeyyyset_lineno
+#define setkeyyyset_out _bsd_setkey_setkeyyyset_out
+#define setkeyyytext _bsd_setkey_setkeyyytext
+#define yyerror _bsd_setkey_yyerror
+#define yyfatal _bsd_setkey_yyfatal
diff --git a/ipsec-tools/src/setkey/rtems-bsd-setkey-parse_wrapper-data.h b/ipsec-tools/src/setkey/rtems-bsd-setkey-parse_wrapper-data.h
index 050924fb..4fb423e6 100644
--- a/ipsec-tools/src/setkey/rtems-bsd-setkey-parse_wrapper-data.h
+++ b/ipsec-tools/src/setkey/rtems-bsd-setkey-parse_wrapper-data.h
@@ -2,24 +2,24 @@
 #include <rtems/linkersets.h>
 #include "rtems-bsd-setkey-data.h"
 /* parse_wrapper.c */
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int32_t p_spi);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int p_ext);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int p_alg_enc);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int p_alg_auth);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int p_replay);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int p_mode);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int32_t p_reqid);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int p_key_enc_len);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int p_key_auth_len);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static char const *p_key_enc);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static YYSTACKDATA yystack);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static char const *p_key_auth);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static time_t p_lt_hard);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static time_t p_lt_soft);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static char const *p_key_enc);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static int p_aifamily);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static int p_aiflags);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static size_t p_lb_hard);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static size_t p_lb_soft);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static struct addrinfo *p_natt_oa);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static struct security_ctx sec_ctx);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static time_t p_lt_hard);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static time_t p_lt_soft);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int p_alg_auth);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int p_alg_enc);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int p_ext);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int p_key_auth_len);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int p_key_enc_len);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int p_mode);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int p_natt_type);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static struct addrinfo *p_natt_oa);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static int p_aiflags);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static int p_aifamily);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static YYSTACKDATA yystack);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int p_replay);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int32_t p_reqid);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static u_int32_t p_spi);
diff --git a/ipsec-tools/src/setkey/rtems-bsd-setkey-setkey-data.h b/ipsec-tools/src/setkey/rtems-bsd-setkey-setkey-data.h
index b0aa4803..11d75502 100644
--- a/ipsec-tools/src/setkey/rtems-bsd-setkey-setkey-data.h
+++ b/ipsec-tools/src/setkey/rtems-bsd-setkey-setkey-data.h
@@ -2,7 +2,7 @@
 #include <rtems/linkersets.h>
 #include "rtems-bsd-setkey-data.h"
 /* setkey.c */
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static time_t thiszone);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static char const *satype[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static char const *sastate[]);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static char const *ipproto[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static char const *sastate[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static char const *satype[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static time_t thiszone);
diff --git a/ipsec-tools/src/setkey/rtems-bsd-setkey-token_wrapper-data.h b/ipsec-tools/src/setkey/rtems-bsd-setkey-token_wrapper-data.h
index 41691d79..908f38dc 100644
--- a/ipsec-tools/src/setkey/rtems-bsd-setkey-token_wrapper-data.h
+++ b/ipsec-tools/src/setkey/rtems-bsd-setkey-token_wrapper-data.h
@@ -2,17 +2,17 @@
 #include <rtems/linkersets.h>
 #include "rtems-bsd-setkey-data.h"
 /* token_wrapper.c */
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static size_t yy_buffer_stack_top);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static size_t yy_buffer_stack_max);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static YY_BUFFER_STATE *yy_buffer_stack);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static char yy_hold_char);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static yy_size_t yy_n_chars);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, extern yy_size_t setkeyyyleng);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static YY_BUFFER_STATE *yy_buffer_stack);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static char *yy_c_buf_p);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static int yy_init);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static int yy_start);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static int yy_did_buffer_switch_on_eof);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static yy_state_type yy_last_accepting_state);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static char *yy_last_accepting_cpos);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static char yy_hold_char);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static int yy_did_buffer_switch_on_eof);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static int yy_init);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static int yy_more_flag);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static int yy_more_len);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static int yy_start);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static size_t yy_buffer_stack_max);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static size_t yy_buffer_stack_top);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static yy_size_t yy_n_chars);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_setkey, static yy_state_type yy_last_accepting_state);