summaryrefslogtreecommitdiffstats
path: root/ipsec-tools
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-10-23 08:22:44 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-10-25 08:38:45 +0200
commitb3169c2a6a01cc0555181f61b5254dd2c1f1c310 (patch)
treef84d67c9d17b2625481513fa6dc85929fdb08442 /ipsec-tools
parentUpdate rtems_waf (diff)
downloadrtems-libbsd-b3169c2a6a01cc0555181f61b5254dd2c1f1c310.tar.bz2
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.
Diffstat (limited to 'ipsec-tools')
-rw-r--r--ipsec-tools/src/config.h2
-rw-r--r--ipsec-tools/src/racoon/crypto_openssl.c49
-rw-r--r--ipsec-tools/src/racoon/missing/crypto/sha2/sha2.c1226
-rw-r--r--ipsec-tools/src/racoon/prsa_par_wrapper.c2
-rw-r--r--ipsec-tools/src/racoon/rsalist.c3
-rw-r--r--ipsec-tools/src/racoon/rtems-bsd-racoon-algorithm-data.h8
-rw-r--r--ipsec-tools/src/racoon/rtems-bsd-racoon-cfparse_wrapper-data.h8
-rw-r--r--ipsec-tools/src/racoon/rtems-bsd-racoon-cftoken_wrapper-data.h22
-rw-r--r--ipsec-tools/src/racoon/rtems-bsd-racoon-data.h25
-rw-r--r--ipsec-tools/src/racoon/rtems-bsd-racoon-handler-data.h2
-rw-r--r--ipsec-tools/src/racoon/rtems-bsd-racoon-ipsec_doi-data.h2
-rw-r--r--ipsec-tools/src/racoon/rtems-bsd-racoon-localconf-data.h2
-rw-r--r--ipsec-tools/src/racoon/rtems-bsd-racoon-main-data.h2
-rw-r--r--ipsec-tools/src/racoon/rtems-bsd-racoon-namespace.h986
-rw-r--r--ipsec-tools/src/racoon/rtems-bsd-racoon-plog-data.h2
-rw-r--r--ipsec-tools/src/racoon/rtems-bsd-racoon-prsa_tok_wrapper-data.h14
-rw-r--r--ipsec-tools/src/racoon/rtems-bsd-racoon-session-data.h8
-rw-r--r--ipsec-tools/src/racoon/rtems-bsd-racoon-strnames-data.h38
-rw-r--r--ipsec-tools/src/setkey/rtems-bsd-setkey-data.h34
-rw-r--r--ipsec-tools/src/setkey/rtems-bsd-setkey-namespace.h102
-rw-r--r--ipsec-tools/src/setkey/rtems-bsd-setkey-parse_wrapper-data.h32
-rw-r--r--ipsec-tools/src/setkey/rtems-bsd-setkey-setkey-data.h6
-rw-r--r--ipsec-tools/src/setkey/rtems-bsd-setkey-token_wrapper-data.h18
23 files changed, 684 insertions, 1909 deletions
diff --git a/ipsec-tools/src/config.h b/ipsec-tools/src/config.h
index cd831ccc..826d827e 100644
--- a/ipsec-tools/src/config.h
+++ b/ipsec-tools/src/config.h
@@ -208,7 +208,7 @@
#define HAVE_VPRINTF 1
/* Support IPv6 */
-#define INET6 /**/
+#define INET6 1
/* Use advanced IPv6 API */
#define INET6_ADVAPI /**/
diff --git a/ipsec-tools/src/racoon/crypto_openssl.c b/ipsec-tools/src/racoon/crypto_openssl.c
index 2d140fdf..e4a4a902 100644
--- a/ipsec-tools/src/racoon/crypto_openssl.c
+++ b/ipsec-tools/src/racoon/crypto_openssl.c
@@ -98,7 +98,12 @@
#define SHA384_Init _bsd_SHA384_Init
#define SHA384_Update _bsd_SHA384_Update
#define SHA384_Final _bsd_SHA384_Final
-#include <openssl/sha2/sha384.h>
+#include <crypto/sha2/sha384.h>
+#include <crypto/rsa/rsa_locl.h>
+#include <crypto/evp/evp_locl.h>
+#include <crypto/dh/dh_locl.h>
+#include <crypto/include/internal/evp_int.h>
+#include <crypto/include/internal/x509_int.h>
#endif /* __rtems__ */
#endif
#endif
@@ -530,13 +535,13 @@ eay_get_x509asn1subjectname(cert)
goto error;
/* get the length of the name */
- len = i2d_X509_NAME(x509->cert_info->subject, NULL);
+ len = i2d_X509_NAME(x509->cert_info.subject, NULL);
name = vmalloc(len);
if (!name)
goto error;
/* get the name */
bp = (unsigned char *) name->v;
- len = i2d_X509_NAME(x509->cert_info->subject, &bp);
+ len = i2d_X509_NAME(x509->cert_info.subject, &bp);
X509_free(x509);
@@ -675,14 +680,14 @@ eay_get_x509asn1issuername(cert)
goto error;
/* get the length of the name */
- len = i2d_X509_NAME(x509->cert_info->issuer, NULL);
+ len = i2d_X509_NAME(x509->cert_info.issuer, NULL);
name = vmalloc(len);
if (name == NULL)
goto error;
/* get the name */
bp = (unsigned char *) name->v;
- len = i2d_X509_NAME(x509->cert_info->issuer, &bp);
+ len = i2d_X509_NAME(x509->cert_info.issuer, &bp);
X509_free(x509);
@@ -1124,6 +1129,7 @@ evp_crypt(vchar_t *data, vchar_t *key, vchar_t *iv, const EVP_CIPHER *e, int enc
if ((res = vmalloc(data->l)) == NULL)
return NULL;
+ memset(&ctx, 0, sizeof(ctx));
EVP_CIPHER_CTX_init(&ctx);
switch(EVP_CIPHER_nid(e)){
@@ -1693,7 +1699,7 @@ eay_hmac_init(key, md)
vchar_t *key;
const EVP_MD *md;
{
- HMAC_CTX *c = racoon_malloc(sizeof(*c));
+ HMAC_CTX *c = HMAC_CTX_new();
HMAC_Init(c, key->v, key->l, md);
@@ -1744,14 +1750,14 @@ vchar_t *
eay_hmacsha2_512_one(key, data)
vchar_t *key, *data;
{
- return eay_hmac_one(key, data, EVP_sha2_512());
+ return eay_hmac_one(key, data, EVP_sha512());
}
caddr_t
eay_hmacsha2_512_init(key)
vchar_t *key;
{
- return eay_hmac_init(key, EVP_sha2_512());
+ return eay_hmac_init(key, EVP_sha512());
}
void
@@ -1774,8 +1780,7 @@ eay_hmacsha2_512_final(c)
HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
res->l = l;
- HMAC_cleanup((HMAC_CTX *)c);
- (void)racoon_free(c);
+ HMAC_CTX_free((HMAC_CTX *)c);
if (SHA512_DIGEST_LENGTH != res->l) {
plog(LLV_ERROR, LOCATION, NULL,
@@ -1794,14 +1799,14 @@ vchar_t *
eay_hmacsha2_384_one(key, data)
vchar_t *key, *data;
{
- return eay_hmac_one(key, data, EVP_sha2_384());
+ return eay_hmac_one(key, data, EVP_sha384());
}
caddr_t
eay_hmacsha2_384_init(key)
vchar_t *key;
{
- return eay_hmac_init(key, EVP_sha2_384());
+ return eay_hmac_init(key, EVP_sha384());
}
void
@@ -1824,8 +1829,7 @@ eay_hmacsha2_384_final(c)
HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
res->l = l;
- HMAC_cleanup((HMAC_CTX *)c);
- (void)racoon_free(c);
+ HMAC_CTX_free((HMAC_CTX *)c);
if (SHA384_DIGEST_LENGTH != res->l) {
plog(LLV_ERROR, LOCATION, NULL,
@@ -1844,14 +1848,14 @@ vchar_t *
eay_hmacsha2_256_one(key, data)
vchar_t *key, *data;
{
- return eay_hmac_one(key, data, EVP_sha2_256());
+ return eay_hmac_one(key, data, EVP_sha256());
}
caddr_t
eay_hmacsha2_256_init(key)
vchar_t *key;
{
- return eay_hmac_init(key, EVP_sha2_256());
+ return eay_hmac_init(key, EVP_sha256());
}
void
@@ -1874,8 +1878,7 @@ eay_hmacsha2_256_final(c)
HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
res->l = l;
- HMAC_cleanup((HMAC_CTX *)c);
- (void)racoon_free(c);
+ HMAC_CTX_free((HMAC_CTX *)c);
if (SHA256_DIGEST_LENGTH != res->l) {
plog(LLV_ERROR, LOCATION, NULL,
@@ -1925,8 +1928,7 @@ eay_hmacsha1_final(c)
HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
res->l = l;
- HMAC_cleanup((HMAC_CTX *)c);
- (void)racoon_free(c);
+ HMAC_CTX_free((HMAC_CTX *)c);
if (SHA_DIGEST_LENGTH != res->l) {
plog(LLV_ERROR, LOCATION, NULL,
@@ -1975,8 +1977,7 @@ eay_hmacmd5_final(c)
HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
res->l = l;
- HMAC_cleanup((HMAC_CTX *)c);
- (void)racoon_free(c);
+ HMAC_CTX_free((HMAC_CTX *)c);
if (MD5_DIGEST_LENGTH != res->l) {
plog(LLV_ERROR, LOCATION, NULL,
@@ -2084,7 +2085,7 @@ vchar_t *
eay_sha2_384_one(data)
vchar_t *data;
{
- return eay_digest_one(data, EVP_sha2_384());
+ return eay_digest_one(data, EVP_sha384());
}
int
@@ -2137,7 +2138,7 @@ vchar_t *
eay_sha2_256_one(data)
vchar_t *data;
{
- return eay_digest_one(data, EVP_sha2_256());
+ return eay_digest_one(data, EVP_sha256());
}
int
diff --git a/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.c b/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.c
deleted file mode 100644
index fca879c6..00000000
--- a/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.c
+++ /dev/null
@@ -1,1226 +0,0 @@
-#include <machine/rtems-bsd-user-space.h>
-#ifdef __rtems__
-#include <machine/rtems-bsd-program.h>
-#include "../../../rtems-bsd-racoon-namespace.h"
-#endif /* __rtems__ */
-
-/* $NetBSD: sha2.c,v 1.4.40.1 2012/12/24 08:48:08 tteras Exp $ */
-
-/* Id: sha2.c,v 1.6 2004/09/21 14:35:25 ludvigm Exp */
-
-/*
- * sha2.c
- *
- * Version 1.0.0beta1
- *
- * Written by Aaron D. Gifford <me@aarongifford.com>
- *
- * Copyright 2000 Aaron D. Gifford. All rights reserved.
- *
- * 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.
- * 3. Neither the name of the copyright holder nor the names of contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``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(S) OR CONTRIBUTOR(S) 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 "config.h"
-
-#include <sys/types.h>
-#include <sys/time.h>
-#ifndef __linux__
-#include <machine/endian.h>
-#endif
-#ifndef __rtems__
-#include <crypto/sha2/sha2.h>
-#else /* __rtems__ */
-#define SHA256_Init _bsd_SHA256_Init
-#define SHA256_Update _bsd_SHA256_Update
-#define SHA256_Final _bsd_SHA256_Final
-#include <crypto/sha2/sha256.h>
-#define SHA384_Init _bsd_SHA384_Init
-#define SHA384_Update _bsd_SHA384_Update
-#define SHA384_Final _bsd_SHA384_Final
-#include <crypto/sha2/sha384.h>
-#define SHA512_Init _bsd_SHA512_Init
-#define SHA512_Update _bsd_SHA512_Update
-#define SHA512_Final _bsd_SHA512_Final
-#include <crypto/sha2/sha512.h>
-#endif /* __rtems__ */
-#include <openssl/evp.h>
-
-/* get openssl/ssleay version number */
-#include <openssl/opensslv.h>
-
-#include <err.h>
-#include <string.h>
-#define bcopy(a, b, c) memcpy((b), (a), (c))
-#define bzero(a, b) memset((a), 0, (b))
-#define panic(a) err(1, (a))
-
-#define HAVE_EVP_097
-
-#ifndef __rtems__
-/*
- * ASSERT NOTE:
- * Some sanity checking code is included using assert(). On my FreeBSD
- * system, this additional code can be removed by compiling with NDEBUG
- * defined. Check your own systems manpage on assert() to see how to
- * compile WITHOUT the sanity checking code on your system.
- *
- * UNROLLED TRANSFORM LOOP NOTE:
- * You can define SHA2_UNROLL_TRANSFORM to use the unrolled transform
- * loop version for the hash transform rounds (defined using macros
- * later in this file). Either define on the command line, for example:
- *
- * cc -DSHA2_UNROLL_TRANSFORM -o sha2 sha2.c sha2prog.c
- *
- * or define below:
- *
- * #define SHA2_UNROLL_TRANSFORM
- *
- */
-
-#define assert(x)
-
-
-/*** SHA-256/384/512 Machine Architecture Definitions *****************/
-/*
- * BYTE_ORDER NOTE:
- *
- * Please make sure that your system defines BYTE_ORDER. If your
- * architecture is little-endian, make sure it also defines
- * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are
- * equivilent.
- *
- * If your system does not define the above, then you can do so by
- * hand like this:
- *
- * #define LITTLE_ENDIAN 1234
- * #define BIG_ENDIAN 4321
- *
- * And for little-endian machines, add:
- *
- * #define BYTE_ORDER LITTLE_ENDIAN
- *
- * Or for big-endian machines:
- *
- * #define BYTE_ORDER BIG_ENDIAN
- *
- * The FreeBSD machine this was written on defines BYTE_ORDER
- * appropriately by including <sys/types.h> (which in turn includes
- * <machine/endian.h> where the appropriate definitions are actually
- * made).
- */
-#if !defined(BYTE_ORDER) || (BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN)
-#error Define BYTE_ORDER to be equal to either LITTLE_ENDIAN or BIG_ENDIAN
-#endif
-
-/*
- * Define the followingsha2_* types to types of the correct length on
- * the native archtecture. Most BSD systems and Linux define u_intXX_t
- * types. Machines with very recent ANSI C headers, can use the
- * uintXX_t definintions from inttypes.h by defining SHA2_USE_INTTYPES_H
- * during compile or in the sha.h header file.
- *
- * Machines that support neither u_intXX_t nor inttypes.h's uintXX_t
- * will need to define these three typedefs below (and the appropriate
- * ones in sha.h too) by hand according to their system architecture.
- *
- * Thank you, Jun-ichiro itojun Hagino, for suggesting using u_intXX_t
- * types and pointing out recent ANSI C support for uintXX_t in inttypes.h.
- */
-#if 0 /*def SHA2_USE_INTTYPES_H*/
-
-typedef uint8_t sha2_byte; /* Exactly 1 byte */
-typedef uint32_t sha2_word32; /* Exactly 4 bytes */
-typedef uint64_t sha2_word64; /* Exactly 8 bytes */
-
-#else /* SHA2_USE_INTTYPES_H */
-
-typedef u_int8_t sha2_byte; /* Exactly 1 byte */
-typedef u_int32_t sha2_word32; /* Exactly 4 bytes */
-typedef u_int64_t sha2_word64; /* Exactly 8 bytes */
-
-#endif /* SHA2_USE_INTTYPES_H */
-
-
-/*** SHA-256/384/512 Various Length Definitions ***********************/
-/* NOTE: Most of these are in sha2.h */
-#define SHA256_SHORT_BLOCK_LENGTH (SHA256_BLOCK_LENGTH - 8)
-#define SHA384_SHORT_BLOCK_LENGTH (SHA384_BLOCK_LENGTH - 16)
-#define SHA512_SHORT_BLOCK_LENGTH (SHA512_BLOCK_LENGTH - 16)
-
-
-/*** ENDIAN REVERSAL MACROS *******************************************/
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define REVERSE32(w,x) { \
- sha2_word32 tmp = (w); \
- tmp = (tmp >> 16) | (tmp << 16); \
- (x) = ((tmp & 0xff00ff00UL) >> 8) | ((tmp & 0x00ff00ffUL) << 8); \
-}
-#define REVERSE64(w,x) { \
- sha2_word64 tmp = (w); \
- tmp = (tmp >> 32) | (tmp << 32); \
- tmp = ((tmp & 0xff00ff00ff00ff00ULL) >> 8) | \
- ((tmp & 0x00ff00ff00ff00ffULL) << 8); \
- (x) = ((tmp & 0xffff0000ffff0000ULL) >> 16) | \
- ((tmp & 0x0000ffff0000ffffULL) << 16); \
-}
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
-/*
- * Macro for incrementally adding the unsigned 64-bit integer n to the
- * unsigned 128-bit integer (represented using a two-element array of
- * 64-bit words):
- */
-#define ADDINC128(w,n) { \
- (w)[0] += (sha2_word64)(n); \
- if ((w)[0] < (n)) { \
- (w)[1]++; \
- } \
-}
-
-/*** THE SIX LOGICAL FUNCTIONS ****************************************/
-/*
- * Bit shifting and rotation (used by the six SHA-XYZ logical functions:
- *
- * NOTE: The naming of R and S appears backwards here (R is a SHIFT and
- * S is a ROTATION) because the SHA-256/384/512 description document
- * (see http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf) uses this
- * same "backwards" definition.
- */
-/* Shift-right (used in SHA-256, SHA-384, and SHA-512): */
-#define R(b,x) ((x) >> (b))
-/* 32-bit Rotate-right (used in SHA-256): */
-#define S32(b,x) (((x) >> (b)) | ((x) << (32 - (b))))
-/* 64-bit Rotate-right (used in SHA-384 and SHA-512): */
-#define S64(b,x) (((x) >> (b)) | ((x) << (64 - (b))))
-
-/* Two of six logical functions used in SHA-256, SHA-384, and SHA-512: */
-#define Ch(x,y,z) (((x) & (y)) ^ ((~(x)) & (z)))
-#define Maj(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-
-/* Four of six logical functions used in SHA-256: */
-#define Sigma0_256(x) (S32(2, (x)) ^ S32(13, (x)) ^ S32(22, (x)))
-#define Sigma1_256(x) (S32(6, (x)) ^ S32(11, (x)) ^ S32(25, (x)))
-#define sigma0_256(x) (S32(7, (x)) ^ S32(18, (x)) ^ R(3 , (x)))
-#define sigma1_256(x) (S32(17, (x)) ^ S32(19, (x)) ^ R(10, (x)))
-
-/* Four of six logical functions used in SHA-384 and SHA-512: */
-#define Sigma0_512(x) (S64(28, (x)) ^ S64(34, (x)) ^ S64(39, (x)))
-#define Sigma1_512(x) (S64(14, (x)) ^ S64(18, (x)) ^ S64(41, (x)))
-#define sigma0_512(x) (S64( 1, (x)) ^ S64( 8, (x)) ^ R( 7, (x)))
-#define sigma1_512(x) (S64(19, (x)) ^ S64(61, (x)) ^ R( 6, (x)))
-
-/*** INTERNAL FUNCTION PROTOTYPES *************************************/
-/* NOTE: These should not be accessed directly from outside this
- * library -- they are intended for private internal visibility/use
- * only.
- */
-void SHA512_Last(SHA512_CTX*);
-void SHA256_Transform(SHA256_CTX*, const sha2_word32*);
-void SHA512_Transform(SHA512_CTX*, const sha2_word64*);
-
-
-/*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/
-/* Hash constant words K for SHA-256: */
-const static sha2_word32 K256[64] = {
- 0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL,
- 0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL,
- 0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL,
- 0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, 0xc19bf174UL,
- 0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
- 0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL,
- 0x983e5152UL, 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL,
- 0xc6e00bf3UL, 0xd5a79147UL, 0x06ca6351UL, 0x14292967UL,
- 0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, 0x53380d13UL,
- 0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
- 0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL,
- 0xd192e819UL, 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL,
- 0x19a4c116UL, 0x1e376c08UL, 0x2748774cUL, 0x34b0bcb5UL,
- 0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, 0x682e6ff3UL,
- 0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
- 0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
-};
-
-/* Initial hash value H for SHA-256: */
-const static sha2_word32 sha256_initial_hash_value[8] = {
- 0x6a09e667UL,
- 0xbb67ae85UL,
- 0x3c6ef372UL,
- 0xa54ff53aUL,
- 0x510e527fUL,
- 0x9b05688cUL,
- 0x1f83d9abUL,
- 0x5be0cd19UL
-};
-
-/* Hash constant words K for SHA-384 and SHA-512: */
-const static sha2_word64 K512[80] = {
- 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL,
- 0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
- 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
- 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
- 0xd807aa98a3030242ULL, 0x12835b0145706fbeULL,
- 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
- 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL,
- 0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
- 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
- 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
- 0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL,
- 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
- 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL,
- 0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
- 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
- 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
- 0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL,
- 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
- 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL,
- 0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
- 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
- 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
- 0xd192e819d6ef5218ULL, 0xd69906245565a910ULL,
- 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
- 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL,
- 0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
- 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
- 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
- 0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL,
- 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
- 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL,
- 0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
- 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
- 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
- 0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL,
- 0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
- 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL,
- 0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
- 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
- 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
-};
-
-/* Initial hash value H for SHA-384 */
-const static sha2_word64 sha384_initial_hash_value[8] = {
- 0xcbbb9d5dc1059ed8ULL,
- 0x629a292a367cd507ULL,
- 0x9159015a3070dd17ULL,
- 0x152fecd8f70e5939ULL,
- 0x67332667ffc00b31ULL,
- 0x8eb44a8768581511ULL,
- 0xdb0c2e0d64f98fa7ULL,
- 0x47b5481dbefa4fa4ULL
-};
-
-/* Initial hash value H for SHA-512 */
-const static sha2_word64 sha512_initial_hash_value[8] = {
- 0x6a09e667f3bcc908ULL,
- 0xbb67ae8584caa73bULL,
- 0x3c6ef372fe94f82bULL,
- 0xa54ff53a5f1d36f1ULL,
- 0x510e527fade682d1ULL,
- 0x9b05688c2b3e6c1fULL,
- 0x1f83d9abfb41bd6bULL,
- 0x5be0cd19137e2179ULL
-};
-
-/*
- * Constant used by SHA256/384/512_End() functions for converting the
- * digest to a readable hexadecimal character string:
- */
-static const char *sha2_hex_digits = "0123456789abcdef";
-
-
-/*** SHA-256: *********************************************************/
-void SHA256_Init(SHA256_CTX* context) {
- if (context == (SHA256_CTX*)0) {
- return;
- }
- bcopy(sha256_initial_hash_value, context->state, SHA256_DIGEST_LENGTH);
- bzero(context->buffer, SHA256_BLOCK_LENGTH);
- context->bitcount = 0;
-}
-
-#ifdef SHA2_UNROLL_TRANSFORM
-
-/* Unrolled SHA-256 round macros: */
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-
-#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h) \
- REVERSE32(*data++, W256[j]); \
- T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
- K256[j] + W256[j]; \
- (d) += T1; \
- (h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
- j++
-
-
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
-
-#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h) \
- T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
- K256[j] + (W256[j] = *data++); \
- (d) += T1; \
- (h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
- j++
-
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
-#define ROUND256(a,b,c,d,e,f,g,h) \
- s0 = W256[(j+1)&0x0f]; \
- s0 = sigma0_256(s0); \
- s1 = W256[(j+14)&0x0f]; \
- s1 = sigma1_256(s1); \
- T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + K256[j] + \
- (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0); \
- (d) += T1; \
- (h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
- j++
-
-void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
- sha2_word32 a, b, c, d, e, f, g, h, s0, s1;
- sha2_word32 T1, *W256;
- int j;
-
- W256 = (sha2_word32*)context->buffer;
-
- /* Initialize registers with the prev. intermediate value */
- a = context->state[0];
- b = context->state[1];
- c = context->state[2];
- d = context->state[3];
- e = context->state[4];
- f = context->state[5];
- g = context->state[6];
- h = context->state[7];
-
- j = 0;
- do {
- /* Rounds 0 to 15 (unrolled): */
- ROUND256_0_TO_15(a,b,c,d,e,f,g,h);
- ROUND256_0_TO_15(h,a,b,c,d,e,f,g);
- ROUND256_0_TO_15(g,h,a,b,c,d,e,f);
- ROUND256_0_TO_15(f,g,h,a,b,c,d,e);
- ROUND256_0_TO_15(e,f,g,h,a,b,c,d);
- ROUND256_0_TO_15(d,e,f,g,h,a,b,c);
- ROUND256_0_TO_15(c,d,e,f,g,h,a,b);
- ROUND256_0_TO_15(b,c,d,e,f,g,h,a);
- } while (j < 16);
-
- /* Now for the remaining rounds to 64: */
- do {
- ROUND256(a,b,c,d,e,f,g,h);
- ROUND256(h,a,b,c,d,e,f,g);
- ROUND256(g,h,a,b,c,d,e,f);
- ROUND256(f,g,h,a,b,c,d,e);
- ROUND256(e,f,g,h,a,b,c,d);
- ROUND256(d,e,f,g,h,a,b,c);
- ROUND256(c,d,e,f,g,h,a,b);
- ROUND256(b,c,d,e,f,g,h,a);
- } while (j < 64);
-
- /* Compute the current intermediate hash value */
- context->state[0] += a;
- context->state[1] += b;
- context->state[2] += c;
- context->state[3] += d;
- context->state[4] += e;
- context->state[5] += f;
- context->state[6] += g;
- context->state[7] += h;
-
- /* Clean up */
- a = b = c = d = e = f = g = h = T1 = 0;
-}
-
-#else /* SHA2_UNROLL_TRANSFORM */
-
-void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
- sha2_word32 a, b, c, d, e, f, g, h, s0, s1;
- sha2_word32 T1, T2, *W256;
- int j;
-
- W256 = (sha2_word32*)context->buffer;
-
- /* Initialize registers with the prev. intermediate value */
- a = context->state[0];
- b = context->state[1];
- c = context->state[2];
- d = context->state[3];
- e = context->state[4];
- f = context->state[5];
- g = context->state[6];
- h = context->state[7];
-
- j = 0;
- do {
-#if BYTE_ORDER == LITTLE_ENDIAN
- /* Copy data while converting to host byte order */
- REVERSE32(*data++,W256[j]);
- /* Apply the SHA-256 compression function to update a..h */
- T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + W256[j];
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
- /* Apply the SHA-256 compression function to update a..h with copy */
- T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + (W256[j] = *data++);
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- T2 = Sigma0_256(a) + Maj(a, b, c);
- h = g;
- g = f;
- f = e;
- e = d + T1;
- d = c;
- c = b;
- b = a;
- a = T1 + T2;
-
- j++;
- } while (j < 16);
-
- do {
- /* Part of the message block expansion: */
- s0 = W256[(j+1)&0x0f];
- s0 = sigma0_256(s0);
- s1 = W256[(j+14)&0x0f];
- s1 = sigma1_256(s1);
-
- /* Apply the SHA-256 compression function to update a..h */
- T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] +
- (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0);
- T2 = Sigma0_256(a) + Maj(a, b, c);
- h = g;
- g = f;
- f = e;
- e = d + T1;
- d = c;
- c = b;
- b = a;
- a = T1 + T2;
-
- j++;
- } while (j < 64);
-
- /* Compute the current intermediate hash value */
- context->state[0] += a;
- context->state[1] += b;
- context->state[2] += c;
- context->state[3] += d;
- context->state[4] += e;
- context->state[5] += f;
- context->state[6] += g;
- context->state[7] += h;
-
- /* Clean up */
- a = b = c = d = e = f = g = h = T1 = T2 = 0;
-}
-
-#endif /* SHA2_UNROLL_TRANSFORM */
-
-void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
- unsigned int freespace, usedspace;
-
- if (len == 0) {
- /* Calling with no data is valid - we do nothing */
- return;
- }
-
- /* Sanity check: */
- assert(context != (SHA256_CTX*)0 && data != (sha2_byte*)0);
-
- usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
- if (usedspace > 0) {
- /* Calculate how much free space is available in the buffer */
- freespace = SHA256_BLOCK_LENGTH - usedspace;
-
- if (len >= freespace) {
- /* Fill the buffer completely and process it */
- bcopy(data, &context->buffer[usedspace], freespace);
- context->bitcount += freespace << 3;
- len -= freespace;
- data += freespace;
- SHA256_Transform(context, (sha2_word32*)context->buffer);
- } else {
- /* The buffer is not yet full */
- bcopy(data, &context->buffer[usedspace], len);
- context->bitcount += len << 3;
- /* Clean up: */
- usedspace = freespace = 0;
- return;
- }
- }
- while (len >= SHA256_BLOCK_LENGTH) {
- /* Process as many complete blocks as we can */
- SHA256_Transform(context, (const sha2_word32*)data);
- context->bitcount += SHA256_BLOCK_LENGTH << 3;
- len -= SHA256_BLOCK_LENGTH;
- data += SHA256_BLOCK_LENGTH;
- }
- if (len > 0) {
- /* There's left-overs, so save 'em */
- bcopy(data, context->buffer, len);
- context->bitcount += len << 3;
- }
- /* Clean up: */
- usedspace = freespace = 0;
-}
-
-void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
- sha2_word32 *d = (sha2_word32*)digest;
- unsigned int usedspace;
-
- /* Sanity check: */
- assert(context != (SHA256_CTX*)0);
-
- /* If no digest buffer is passed, we don't bother doing this: */
- if (digest != (sha2_byte*)0) {
- usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
-#if BYTE_ORDER == LITTLE_ENDIAN
- /* Convert FROM host byte order */
- REVERSE64(context->bitcount,context->bitcount);
-#endif
- if (usedspace > 0) {
- /* Begin padding with a 1 bit: */
- context->buffer[usedspace++] = 0x80;
-
- if (usedspace <= SHA256_SHORT_BLOCK_LENGTH) {
- /* Set-up for the last transform: */
- bzero(&context->buffer[usedspace], SHA256_SHORT_BLOCK_LENGTH - usedspace);
- } else {
- if (usedspace < SHA256_BLOCK_LENGTH) {
- bzero(&context->buffer[usedspace], SHA256_BLOCK_LENGTH - usedspace);
- }
- /* Do second-to-last transform: */
- SHA256_Transform(context, (sha2_word32*)context->buffer);
-
- /* And set-up for the last transform: */
- bzero(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
- }
- } else {
- /* Set-up for the last transform: */
- bzero(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
-
- /* Begin padding with a 1 bit: */
- *context->buffer = 0x80;
- }
- /* Set the bit count: */
- *(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount;
-
- /* Final transform: */
- SHA256_Transform(context, (sha2_word32*)context->buffer);
-
-#if BYTE_ORDER == LITTLE_ENDIAN
- {
- /* Convert TO host byte order */
- int j;
- for (j = 0; j < 8; j++) {
- REVERSE32(context->state[j],context->state[j]);
- *d++ = context->state[j];
- }
- }
-#else
- bcopy(context->state, d, SHA256_DIGEST_LENGTH);
-#endif
- }
-
- /* Clean up state data: */
- bzero(context, sizeof(*context));
- usedspace = 0;
-}
-
-char *SHA256_End(SHA256_CTX* context, char buffer[]) {
- sha2_byte digest[SHA256_DIGEST_LENGTH], *d = digest;
- int i;
-
- /* Sanity check: */
- assert(context != (SHA256_CTX*)0);
-
- if (buffer != (char*)0) {
- SHA256_Final(digest, context);
-
- for (i = 0; i < SHA256_DIGEST_LENGTH; i++) {
- *buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
- *buffer++ = sha2_hex_digits[*d & 0x0f];
- d++;
- }
- *buffer = (char)0;
- } else {
- bzero(context, sizeof(*context));
- }
- bzero(digest, SHA256_DIGEST_LENGTH);
- return buffer;
-}
-
-char* SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_STRING_LENGTH]) {
- SHA256_CTX context;
-
- SHA256_Init(&context);
- SHA256_Update(&context, data, len);
- return SHA256_End(&context, digest);
-}
-
-
-/*** SHA-512: *********************************************************/
-void SHA512_Init(SHA512_CTX* context) {
- if (context == (SHA512_CTX*)0) {
- return;
- }
- bcopy(sha512_initial_hash_value, context->state, SHA512_DIGEST_LENGTH);
- bzero(context->buffer, SHA512_BLOCK_LENGTH);
- context->bitcount[0] = context->bitcount[1] = 0;
-}
-
-#ifdef SHA2_UNROLL_TRANSFORM
-
-/* Unrolled SHA-512 round macros: */
-#if BYTE_ORDER == LITTLE_ENDIAN
-
-#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h) \
- REVERSE64(*data++, W512[j]); \
- T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
- K512[j] + W512[j]; \
- (d) += T1, \
- (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)), \
- j++
-
-
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
-
-#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h) \
- T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
- K512[j] + (W512[j] = *data++); \
- (d) += T1; \
- (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
- j++
-
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
-#define ROUND512(a,b,c,d,e,f,g,h) \
- s0 = W512[(j+1)&0x0f]; \
- s0 = sigma0_512(s0); \
- s1 = W512[(j+14)&0x0f]; \
- s1 = sigma1_512(s1); \
- T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + K512[j] + \
- (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0); \
- (d) += T1; \
- (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
- j++
-
-void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
- sha2_word64 a, b, c, d, e, f, g, h, s0, s1;
- sha2_word64 T1, *W512 = (sha2_word64*)context->buffer;
- int j;
-
- /* Initialize registers with the prev. intermediate value */
- a = context->state[0];
- b = context->state[1];
- c = context->state[2];
- d = context->state[3];
- e = context->state[4];
- f = context->state[5];
- g = context->state[6];
- h = context->state[7];
-
- j = 0;
- do {
- ROUND512_0_TO_15(a,b,c,d,e,f,g,h);
- ROUND512_0_TO_15(h,a,b,c,d,e,f,g);
- ROUND512_0_TO_15(g,h,a,b,c,d,e,f);
- ROUND512_0_TO_15(f,g,h,a,b,c,d,e);
- ROUND512_0_TO_15(e,f,g,h,a,b,c,d);
- ROUND512_0_TO_15(d,e,f,g,h,a,b,c);
- ROUND512_0_TO_15(c,d,e,f,g,h,a,b);
- ROUND512_0_TO_15(b,c,d,e,f,g,h,a);
- } while (j < 16);
-
- /* Now for the remaining rounds up to 79: */
- do {
- ROUND512(a,b,c,d,e,f,g,h);
- ROUND512(h,a,b,c,d,e,f,g);
- ROUND512(g,h,a,b,c,d,e,f);
- ROUND512(f,g,h,a,b,c,d,e);
- ROUND512(e,f,g,h,a,b,c,d);
- ROUND512(d,e,f,g,h,a,b,c);
- ROUND512(c,d,e,f,g,h,a,b);
- ROUND512(b,c,d,e,f,g,h,a);
- } while (j < 80);
-
- /* Compute the current intermediate hash value */
- context->state[0] += a;
- context->state[1] += b;
- context->state[2] += c;
- context->state[3] += d;
- context->state[4] += e;
- context->state[5] += f;
- context->state[6] += g;
- context->state[7] += h;
-
- /* Clean up */
- a = b = c = d = e = f = g = h = T1 = 0;
-}
-
-#else /* SHA2_UNROLL_TRANSFORM */
-
-void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
- sha2_word64 a, b, c, d, e, f, g, h, s0, s1;
- sha2_word64 T1, T2, *W512 = (sha2_word64*)context->buffer;
- int j;
-
- /* Initialize registers with the prev. intermediate value */
- a = context->state[0];
- b = context->state[1];
- c = context->state[2];
- d = context->state[3];
- e = context->state[4];
- f = context->state[5];
- g = context->state[6];
- h = context->state[7];
-
- j = 0;
- do {
-#if BYTE_ORDER == LITTLE_ENDIAN
- /* Convert TO host byte order */
- REVERSE64(*data++, W512[j]);
- /* Apply the SHA-512 compression function to update a..h */
- T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + W512[j];
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
- /* Apply the SHA-512 compression function to update a..h with copy */
- T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + (W512[j] = *data++);
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- T2 = Sigma0_512(a) + Maj(a, b, c);
- h = g;
- g = f;
- f = e;
- e = d + T1;
- d = c;
- c = b;
- b = a;
- a = T1 + T2;
-
- j++;
- } while (j < 16);
-
- do {
- /* Part of the message block expansion: */
- s0 = W512[(j+1)&0x0f];
- s0 = sigma0_512(s0);
- s1 = W512[(j+14)&0x0f];
- s1 = sigma1_512(s1);
-
- /* Apply the SHA-512 compression function to update a..h */
- T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] +
- (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0);
- T2 = Sigma0_512(a) + Maj(a, b, c);
- h = g;
- g = f;
- f = e;
- e = d + T1;
- d = c;
- c = b;
- b = a;
- a = T1 + T2;
-
- j++;
- } while (j < 80);
-
- /* Compute the current intermediate hash value */
- context->state[0] += a;
- context->state[1] += b;
- context->state[2] += c;
- context->state[3] += d;
- context->state[4] += e;
- context->state[5] += f;
- context->state[6] += g;
- context->state[7] += h;
-
- /* Clean up */
- a = b = c = d = e = f = g = h = T1 = T2 = 0;
-}
-
-#endif /* SHA2_UNROLL_TRANSFORM */
-
-void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
- unsigned int freespace, usedspace;
-
- if (len == 0) {
- /* Calling with no data is valid - we do nothing */
- return;
- }
-
- /* Sanity check: */
- assert(context != (SHA512_CTX*)0 && data != (sha2_byte*)0);
-
- usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
- if (usedspace > 0) {
- /* Calculate how much free space is available in the buffer */
- freespace = SHA512_BLOCK_LENGTH - usedspace;
-
- if (len >= freespace) {
- /* Fill the buffer completely and process it */
- bcopy(data, &context->buffer[usedspace], freespace);
- ADDINC128(context->bitcount, freespace << 3);
- len -= freespace;
- data += freespace;
- SHA512_Transform(context, (sha2_word64*)context->buffer);
- } else {
- /* The buffer is not yet full */
- bcopy(data, &context->buffer[usedspace], len);
- ADDINC128(context->bitcount, len << 3);
- /* Clean up: */
- usedspace = freespace = 0;
- return;
- }
- }
- while (len >= SHA512_BLOCK_LENGTH) {
- /* Process as many complete blocks as we can */
- SHA512_Transform(context, (const sha2_word64*)data);
- ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3);
- len -= SHA512_BLOCK_LENGTH;
- data += SHA512_BLOCK_LENGTH;
- }
- if (len > 0) {
- /* There's left-overs, so save 'em */
- bcopy(data, context->buffer, len);
- ADDINC128(context->bitcount, len << 3);
- }
- /* Clean up: */
- usedspace = freespace = 0;
-}
-
-void SHA512_Last(SHA512_CTX* context) {
- unsigned int usedspace;
-
- usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
-#if BYTE_ORDER == LITTLE_ENDIAN
- /* Convert FROM host byte order */
- REVERSE64(context->bitcount[0],context->bitcount[0]);
- REVERSE64(context->bitcount[1],context->bitcount[1]);
-#endif
- if (usedspace > 0) {
- /* Begin padding with a 1 bit: */
- context->buffer[usedspace++] = 0x80;
-
- if (usedspace <= SHA512_SHORT_BLOCK_LENGTH) {
- /* Set-up for the last transform: */
- bzero(&context->buffer[usedspace], SHA512_SHORT_BLOCK_LENGTH - usedspace);
- } else {
- if (usedspace < SHA512_BLOCK_LENGTH) {
- bzero(&context->buffer[usedspace], SHA512_BLOCK_LENGTH - usedspace);
- }
- /* Do second-to-last transform: */
- SHA512_Transform(context, (sha2_word64*)context->buffer);
-
- /* And set-up for the last transform: */
- bzero(context->buffer, SHA512_BLOCK_LENGTH - 2);
- }
- } else {
- /* Prepare for final transform: */
- bzero(context->buffer, SHA512_SHORT_BLOCK_LENGTH);
-
- /* Begin padding with a 1 bit: */
- *context->buffer = 0x80;
- }
- /* Store the length of input data (in bits): */
- *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1];
- *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0];
-
- /* Final transform: */
- SHA512_Transform(context, (sha2_word64*)context->buffer);
-}
-
-void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
- sha2_word64 *d = (sha2_word64*)digest;
-
- /* Sanity check: */
- assert(context != (SHA512_CTX*)0);
-
- /* If no digest buffer is passed, we don't bother doing this: */
- if (digest != (sha2_byte*)0) {
- SHA512_Last(context);
-
- /* Save the hash data for output: */
-#if BYTE_ORDER == LITTLE_ENDIAN
- {
- /* Convert TO host byte order */
- int j;
- for (j = 0; j < 8; j++) {
- REVERSE64(context->state[j],context->state[j]);
- *d++ = context->state[j];
- }
- }
-#else
- bcopy(context->state, d, SHA512_DIGEST_LENGTH);
-#endif
- }
-
- /* Zero out state data */
- bzero(context, sizeof(*context));
-}
-
-char *SHA512_End(SHA512_CTX* context, char buffer[]) {
- sha2_byte digest[SHA512_DIGEST_LENGTH], *d = digest;
- int i;
-
- /* Sanity check: */
- assert(context != (SHA512_CTX*)0);
-
- if (buffer != (char*)0) {
- SHA512_Final(digest, context);
-
- for (i = 0; i < SHA512_DIGEST_LENGTH; i++) {
- *buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
- *buffer++ = sha2_hex_digits[*d & 0x0f];
- d++;
- }
- *buffer = (char)0;
- } else {
- bzero(context, sizeof(*context));
- }
- bzero(digest, SHA512_DIGEST_LENGTH);
- return buffer;
-}
-
-char* SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_STRING_LENGTH]) {
- SHA512_CTX context;
-
- SHA512_Init(&context);
- SHA512_Update(&context, data, len);
- return SHA512_End(&context, digest);
-}
-
-/*** SHA-384: *********************************************************/
-void SHA384_Init(SHA384_CTX* context) {
- if (context == (SHA384_CTX*)0) {
- return;
- }
- bcopy(sha384_initial_hash_value, context->state, SHA512_DIGEST_LENGTH);
- bzero(context->buffer, SHA384_BLOCK_LENGTH);
- context->bitcount[0] = context->bitcount[1] = 0;
-}
-
-void SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) {
- SHA512_Update((SHA512_CTX*)context, data, len);
-}
-
-void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
- sha2_word64 *d = (sha2_word64*)digest;
-
- /* Sanity check: */
- assert(context != (SHA384_CTX*)0);
-
- /* If no digest buffer is passed, we don't bother doing this: */
- if (digest != (sha2_byte*)0) {
- SHA512_Last((SHA512_CTX*)context);
-
- /* Save the hash data for output: */
-#if BYTE_ORDER == LITTLE_ENDIAN
- {
- /* Convert TO host byte order */
- int j;
- for (j = 0; j < 6; j++) {
- REVERSE64(context->state[j],context->state[j]);
- *d++ = context->state[j];
- }
- }
-#else
- bcopy(context->state, d, SHA384_DIGEST_LENGTH);
-#endif
- }
-
- /* Zero out state data */
- bzero(context, sizeof(*context));
-}
-
-char *SHA384_End(SHA384_CTX* context, char buffer[]) {
- sha2_byte digest[SHA384_DIGEST_LENGTH], *d = digest;
- int i;
-
- /* Sanity check: */
- assert(context != (SHA384_CTX*)0);
-
- if (buffer != (char*)0) {
- SHA384_Final(digest, context);
-
- for (i = 0; i < SHA384_DIGEST_LENGTH; i++) {
- *buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
- *buffer++ = sha2_hex_digits[*d & 0x0f];
- d++;
- }
- *buffer = (char)0;
- } else {
- bzero(context, sizeof(*context));
- }
- bzero(digest, SHA384_DIGEST_LENGTH);
- return buffer;
-}
-
-char* SHA384_Data(const sha2_byte* data, size_t len, char digest[SHA384_DIGEST_STRING_LENGTH]) {
- SHA384_CTX context;
-
- SHA384_Init(&context);
- SHA384_Update(&context, data, len);
- return SHA384_End(&context, digest);
-}
-
-#endif /* __rtems__ */
-
-/*glue*/
-#ifdef HAVE_EVP_097
-
-/* SHA256 */
-#define data(ctx) ((SHA256_CTX *)(ctx)->md_data)
-static int sha256_init(EVP_MD_CTX *ctx)
-{
- SHA256_Init(data(ctx));
- return 1;
-}
-static int sha256_update(EVP_MD_CTX *ctx, const void *data, unsigned long count)
-{
- SHA256_Update(data(ctx), data, count);
- return 1;
-}
-static int sha256_final(EVP_MD_CTX *ctx, unsigned char *md)
-{
- SHA256_Final(md, data(ctx));
- return 1;
-}
-#undef data
-
-/* SHA384 */
-#define data(ctx) ((SHA384_CTX *)(ctx)->md_data)
-static int sha384_init(EVP_MD_CTX *ctx)
-{
- SHA384_Init(data(ctx));
- return 1;
-}
-static int sha384_update(EVP_MD_CTX *ctx, const void *data, unsigned long count)
-{
- SHA384_Update(data(ctx), data, count);
- return 1;
-}
-static int sha384_final(EVP_MD_CTX *ctx, unsigned char *md)
-{
- SHA384_Final(md, data(ctx));
- return 1;
-}
-#undef data
-
-/* SHA512 */
-#define data(ctx) ((SHA512_CTX *)(ctx)->md_data)
-static int sha512_init(EVP_MD_CTX *ctx)
-{
- SHA512_Init(data(ctx));
- return 1;
-}
-static int sha512_update(EVP_MD_CTX *ctx, const void *data, unsigned long count)
-{
- SHA512_Update(data(ctx), data, count);
- return 1;
-}
-static int sha512_final(EVP_MD_CTX *ctx, unsigned char *md)
-{
- SHA512_Final(md, data(ctx));
- return 1;
-}
-#undef data
-#endif
-
-static struct env_md_st sha2_256_md = {
- 0, /*NID_sha1*/
- 0, /*NID_sha1WithRSAEncryption*/
- SHA256_DIGEST_LENGTH,
-#ifdef HAVE_EVP_097
- 0, /* flags */
- sha256_init,
- sha256_update,
- sha256_final,
- NULL, /* copy */
- NULL, /* cleanup */
-#else
- SHA256_Init,
- SHA256_Update,
- SHA256_Final,
-#endif
- NULL, NULL, {0, 0, 0, 0},
- SHA256_BLOCK_LENGTH,
- sizeof(struct env_md_st *) + sizeof(SHA256_CTX),
-};
-
-struct env_md_st *EVP_sha2_256(void)
-{
- return(&sha2_256_md);
-}
-
-static struct env_md_st sha2_384_md = {
- 0, /*NID_sha1*/
- 0, /*NID_sha1WithRSAEncryption*/
- SHA384_DIGEST_LENGTH,
-#ifdef HAVE_EVP_097
- 0, /* flags */
- sha384_init,
- sha384_update,
- sha384_final,
- NULL, /* copy */
- NULL, /* cleanup */
-#else
- SHA384_Init,
- SHA384_Update,
- SHA384_Final,
-#endif
- NULL, NULL, {0, 0, 0, 0},
- SHA384_BLOCK_LENGTH,
- sizeof(struct env_md_st *) + sizeof(SHA384_CTX),
-};
-
-struct env_md_st *EVP_sha2_384(void)
-{
- return(&sha2_384_md);
-}
-
-static struct env_md_st sha2_512_md = {
- 0, /*NID_sha1*/
- 0, /*NID_sha1WithRSAEncryption*/
- SHA512_DIGEST_LENGTH,
-#ifdef HAVE_EVP_097
- 0, /* flags */
- sha512_init,
- sha512_update,
- sha512_final,
- NULL, /* copy */
- NULL, /* cleanup */
-#else
- SHA512_Init,
- SHA512_Update,
- SHA512_Final,
-#endif
- NULL, NULL, {0, 0, 0, 0}, /*EVP_PKEY_RSA_method*/
- SHA512_BLOCK_LENGTH,
- sizeof(struct env_md_st *) + sizeof(SHA512_CTX),
-};
-
-struct env_md_st *EVP_sha2_512(void)
-{
- return(&sha2_512_md);
-}
-
-#ifdef __rtems__
-#include "../../../rtems-bsd-racoon-main-data.h"
-#endif /* __rtems__ */
diff --git a/ipsec-tools/src/racoon/prsa_par_wrapper.c b/ipsec-tools/src/racoon/prsa_par_wrapper.c
index 321fe36e..cdb88609 100644
--- a/ipsec-tools/src/racoon/prsa_par_wrapper.c
+++ b/ipsec-tools/src/racoon/prsa_par_wrapper.c
@@ -1,5 +1,7 @@
#include <machine/rtems-bsd-user-space.h>
#include <machine/rtems-bsd-program.h>
#include "rtems-bsd-racoon-namespace.h"
+#include <openssl/rsa.h>
+#include <crypto/rsa/rsa_locl.h>
#include "prsa_par.c"
#include "rtems-bsd-racoon-prsa_par_wrapper-data.h"
diff --git a/ipsec-tools/src/racoon/rsalist.c b/ipsec-tools/src/racoon/rsalist.c
index 703b6587..db4cf136 100644
--- a/ipsec-tools/src/racoon/rsalist.c
+++ b/ipsec-tools/src/racoon/rsalist.c
@@ -50,6 +50,9 @@
#include <openssl/bn.h>
#include <openssl/rsa.h>
+#ifdef __rtems__
+#include <crypto/rsa/rsa_locl.h>
+#endif /* __rtems__ */
#include "misc.h"
#include "plog.h"
diff --git a/ipsec-tools/src/racoon/rtems-bsd-racoon-algorithm-data.h b/ipsec-tools/src/racoon/rtems-bsd-racoon-algorithm-data.h
index 5c3d43e2..f6e4ab5d 100644
--- a/ipsec-tools/src/racoon/rtems-bsd-racoon-algorithm-data.h
+++ b/ipsec-tools/src/racoon/rtems-bsd-racoon-algorithm-data.h
@@ -2,11 +2,11 @@
#include <rtems/linkersets.h>
#include "rtems-bsd-racoon-data.h"
/* algorithm.c */
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct hash_algorithm oakley_hashdef[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct hmac_algorithm oakley_hmacdef[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct enc_algorithm oakley_encdef[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct dh_algorithm oakley_dhdef[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct enc_algorithm ipsec_encdef[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct enc_algorithm oakley_encdef[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct hash_algorithm oakley_hashdef[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct hmac_algorithm ipsec_hmacdef[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct hmac_algorithm oakley_hmacdef[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct misc_algorithm ipsec_compdef[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct misc_algorithm oakley_authdef[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct dh_algorithm oakley_dhdef[]);
diff --git a/ipsec-tools/src/racoon/rtems-bsd-racoon-cfparse_wrapper-data.h b/ipsec-tools/src/racoon/rtems-bsd-racoon-cfparse_wrapper-data.h
index b5a5e554..1ac7ec1b 100644
--- a/ipsec-tools/src/racoon/rtems-bsd-racoon-cfparse_wrapper-data.h
+++ b/ipsec-tools/src/racoon/rtems-bsd-racoon-cfparse_wrapper-data.h
@@ -2,10 +2,10 @@
#include <rtems/linkersets.h>
#include "rtems-bsd-racoon-data.h"
/* cfparse_wrapper.c */
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static YYSTACKDATA yystack);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int cur_algclass);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int num2dhgroup[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct remoteconf *cur_rmconf);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int oldloglevel);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int tmpalgtype[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct remoteconf *cur_rmconf);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct sainfo *cur_sainfo);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int cur_algclass);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int oldloglevel);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static YYSTACKDATA yystack);
diff --git a/ipsec-tools/src/racoon/rtems-bsd-racoon-cftoken_wrapper-data.h b/ipsec-tools/src/racoon/rtems-bsd-racoon-cftoken_wrapper-data.h
index 42c6d646..b1a1c1b7 100644
--- a/ipsec-tools/src/racoon/rtems-bsd-racoon-cftoken_wrapper-data.h
+++ b/ipsec-tools/src/racoon/rtems-bsd-racoon-cftoken_wrapper-data.h
@@ -2,20 +2,20 @@
#include <rtems/linkersets.h>
#include "rtems-bsd-racoon-data.h"
/* cftoken_wrapper.c */
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static size_t yy_buffer_stack_top);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static size_t yy_buffer_stack_max);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static YY_BUFFER_STATE *yy_buffer_stack);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static char yy_hold_char);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static yy_size_t yy_n_chars);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern yy_size_t racoonyyleng);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static YY_BUFFER_STATE *yy_buffer_stack);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static char *yy_c_buf_p);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int yy_init);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int yy_start);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int yy_did_buffer_switch_on_eof);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static yy_state_type yy_last_accepting_state);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static char *yy_last_accepting_cpos);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static char yy_hold_char);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int incstackp);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int yy_did_buffer_switch_on_eof);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int yy_first_time);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int yy_init);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int yy_more_flag);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int yy_more_len);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int yy_start);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static size_t yy_buffer_stack_max);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static size_t yy_buffer_stack_top);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct include_stack incstack[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int incstackp);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int yy_first_time);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static yy_size_t yy_n_chars);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static yy_state_type yy_last_accepting_state);
diff --git a/ipsec-tools/src/racoon/rtems-bsd-racoon-data.h b/ipsec-tools/src/racoon/rtems-bsd-racoon-data.h
index 3aaf0b3f..7f1e9247 100644
--- a/ipsec-tools/src/racoon/rtems-bsd-racoon-data.h
+++ b/ipsec-tools/src/racoon/rtems-bsd-racoon-data.h
@@ -4,16 +4,16 @@
/* algorithm.c */
/* backupsa.c */
/* cfparse_wrapper.c */
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonyychar);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonyydebug);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonyynerrs);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonyyerrflag);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonyychar);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonyynerrs);
/* cftoken_wrapper.c */
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern FILE *racoonyyin);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern FILE *racoonyyout);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonyylineno);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonyy_flex_debug);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern char *racoonyytext);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonyy_flex_debug);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonyylineno);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int yyerrorcount);
/* crypto_openssl.c */
/* dnssec.c */
@@ -41,41 +41,40 @@ RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int dump_config);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int f_local);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int vflag);
/* misc.c */
-/* sha2.c */
/* nattraversal.c */
/* oakley.c */
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern struct dhgroup dh_modp768);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern struct dhgroup dh_modp1024);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern struct dhgroup dh_modp1536);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern struct dhgroup dh_modp2048);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern struct dhgroup dh_modp3072);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern struct dhgroup dh_modp4096);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern struct dhgroup dh_modp6144);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern struct dhgroup dh_modp768);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern struct dhgroup dh_modp8192);
/* pfkey.c */
/* plog.c */
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern char *pname);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern u_int32_t loglevel);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int f_foreground);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int print_location);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern u_int32_t loglevel);
/* policy.c */
/* privsep.c */
/* proposal.c */
/* prsa_par_wrapper.c */
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int prsa_cur_lineno);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern char *prsa_cur_fname);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern struct genlist *prsa_cur_list);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern enum rsa_key_type prsa_cur_type);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int prsa_cur_lineno);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonprsachar);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonprsadebug);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonprsanerrs);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonprsaerrflag);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonprsachar);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonprsanerrs);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern struct genlist *prsa_cur_list);
/* prsa_tok_wrapper.c */
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern FILE *racoonprsain);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern FILE *racoonprsaout);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonprsalineno);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonprsa_flex_debug);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern char *racoonprsatext);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonprsa_flex_debug);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern int racoonprsalineno);
/* remoteconf.c */
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern char *script_names[]);
/* rsalist.c */
diff --git a/ipsec-tools/src/racoon/rtems-bsd-racoon-handler-data.h b/ipsec-tools/src/racoon/rtems-bsd-racoon-handler-data.h
index c9a2c87f..b92b41e6 100644
--- a/ipsec-tools/src/racoon/rtems-bsd-racoon-handler-data.h
+++ b/ipsec-tools/src/racoon/rtems-bsd-racoon-handler-data.h
@@ -2,8 +2,8 @@
#include <rtems/linkersets.h>
#include "rtems-bsd-racoon-data.h"
/* handler.c */
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct _ctdtree_ ctdtree);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct _ph1tree_ ph1tree);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct _ph2tree_ ph2tree);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct _ctdtree_ ctdtree);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct _rcptree_ rcptree);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct sched sc_sweep);
diff --git a/ipsec-tools/src/racoon/rtems-bsd-racoon-ipsec_doi-data.h b/ipsec-tools/src/racoon/rtems-bsd-racoon-ipsec_doi-data.h
index a3bf167d..bd20cabc 100644
--- a/ipsec-tools/src/racoon/rtems-bsd-racoon-ipsec_doi-data.h
+++ b/ipsec-tools/src/racoon/rtems-bsd-racoon-ipsec_doi-data.h
@@ -2,7 +2,7 @@
#include <rtems/linkersets.h>
#include "rtems-bsd-racoon-data.h"
/* ipsec_doi.c */
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int (*check_attributes[])(struct isakmp_pl_t *));
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int (*check_protocol[])(int ));
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int (*check_transform[])(int ));
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int (*check_attributes[])(struct isakmp_pl_t *));
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int rm_idtype2doi[]);
diff --git a/ipsec-tools/src/racoon/rtems-bsd-racoon-localconf-data.h b/ipsec-tools/src/racoon/rtems-bsd-racoon-localconf-data.h
index 224c3f85..0d482845 100644
--- a/ipsec-tools/src/racoon/rtems-bsd-racoon-localconf-data.h
+++ b/ipsec-tools/src/racoon/rtems-bsd-racoon-localconf-data.h
@@ -2,5 +2,5 @@
#include <rtems/linkersets.h>
#include "rtems-bsd-racoon-data.h"
/* localconf.c */
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int lc_sittype2doi[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int lc_doitype2doi[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int lc_sittype2doi[]);
diff --git a/ipsec-tools/src/racoon/rtems-bsd-racoon-main-data.h b/ipsec-tools/src/racoon/rtems-bsd-racoon-main-data.h
index a6d31dbf..8fe145ef 100644
--- a/ipsec-tools/src/racoon/rtems-bsd-racoon-main-data.h
+++ b/ipsec-tools/src/racoon/rtems-bsd-racoon-main-data.h
@@ -2,5 +2,5 @@
#include <rtems/linkersets.h>
#include "rtems-bsd-racoon-data.h"
/* main.c */
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int loading_sa);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static char version[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int loading_sa);
diff --git a/ipsec-tools/src/racoon/rtems-bsd-racoon-namespace.h b/ipsec-tools/src/racoon/rtems-bsd-racoon-namespace.h
index 521f9497..63c009c6 100644
--- a/ipsec-tools/src/racoon/rtems-bsd-racoon-namespace.h
+++ b/ipsec-tools/src/racoon/rtems-bsd-racoon-namespace.h
@@ -1,763 +1,759 @@
/* generated by userspace-header-gen.py */
/* admin.c */
/* algorithm.c */
-#define algclass2doi _bsd_racoon_algclass2doi
-#define algtype2doi _bsd_racoon_algtype2doi
-#define check_keylen _bsd_racoon_check_keylen
-#define default_keylen _bsd_racoon_default_keylen
-#define alg_oakley_authdef_name _bsd_racoon_alg_oakley_authdef_name
+#define alg_ipsec_compdef_doi _bsd_racoon_alg_ipsec_compdef_doi
+#define alg_ipsec_encdef_doi _bsd_racoon_alg_ipsec_encdef_doi
+#define alg_ipsec_encdef_keylen _bsd_racoon_alg_ipsec_encdef_keylen
+#define alg_ipsec_hmacdef_doi _bsd_racoon_alg_ipsec_hmacdef_doi
+#define alg_ipsec_hmacdef_hashlen _bsd_racoon_alg_ipsec_hmacdef_hashlen
#define alg_oakley_authdef_doi _bsd_racoon_alg_oakley_authdef_doi
-#define alg_oakley_dhdef_name _bsd_racoon_alg_oakley_dhdef_name
-#define alg_oakley_dhdef_group _bsd_racoon_alg_oakley_dhdef_group
+#define alg_oakley_authdef_name _bsd_racoon_alg_oakley_authdef_name
#define alg_oakley_dhdef_doi _bsd_racoon_alg_oakley_dhdef_doi
+#define alg_oakley_dhdef_group _bsd_racoon_alg_oakley_dhdef_group
+#define alg_oakley_dhdef_name _bsd_racoon_alg_oakley_dhdef_name
#define alg_oakley_dhdef_ok _bsd_racoon_alg_oakley_dhdef_ok
-#define alg_ipsec_compdef_doi _bsd_racoon_alg_ipsec_compdef_doi
-#define alg_ipsec_hmacdef_hashlen _bsd_racoon_alg_ipsec_hmacdef_hashlen
-#define alg_ipsec_hmacdef_doi _bsd_racoon_alg_ipsec_hmacdef_doi
-#define alg_ipsec_encdef_keylen _bsd_racoon_alg_ipsec_encdef_keylen
-#define alg_ipsec_encdef_doi _bsd_racoon_alg_ipsec_encdef_doi
-#define alg_oakley_encdef_encrypt _bsd_racoon_alg_oakley_encdef_encrypt
-#define alg_oakley_encdef_decrypt _bsd_racoon_alg_oakley_encdef_decrypt
-#define alg_oakley_encdef_name _bsd_racoon_alg_oakley_encdef_name
#define alg_oakley_encdef_blocklen _bsd_racoon_alg_oakley_encdef_blocklen
-#define alg_oakley_encdef_keylen _bsd_racoon_alg_oakley_encdef_keylen
+#define alg_oakley_encdef_decrypt _bsd_racoon_alg_oakley_encdef_decrypt
#define alg_oakley_encdef_doi _bsd_racoon_alg_oakley_encdef_doi
+#define alg_oakley_encdef_encrypt _bsd_racoon_alg_oakley_encdef_encrypt
+#define alg_oakley_encdef_keylen _bsd_racoon_alg_oakley_encdef_keylen
+#define alg_oakley_encdef_name _bsd_racoon_alg_oakley_encdef_name
#define alg_oakley_encdef_ok _bsd_racoon_alg_oakley_encdef_ok
-#define alg_oakley_hmacdef_one _bsd_racoon_alg_oakley_hmacdef_one
-#define alg_oakley_hmacdef_doi _bsd_racoon_alg_oakley_hmacdef_doi
-#define alg_oakley_hashdef_one _bsd_racoon_alg_oakley_hashdef_one
-#define alg_oakley_hashdef_name _bsd_racoon_alg_oakley_hashdef_name
-#define alg_oakley_hashdef_hashlen _bsd_racoon_alg_oakley_hashdef_hashlen
#define alg_oakley_hashdef_doi _bsd_racoon_alg_oakley_hashdef_doi
+#define alg_oakley_hashdef_hashlen _bsd_racoon_alg_oakley_hashdef_hashlen
+#define alg_oakley_hashdef_name _bsd_racoon_alg_oakley_hashdef_name
#define alg_oakley_hashdef_ok _bsd_racoon_alg_oakley_hashdef_ok
+#define alg_oakley_hashdef_one _bsd_racoon_alg_oakley_hashdef_one
+#define alg_oakley_hmacdef_doi _bsd_racoon_alg_oakley_hmacdef_doi
+#define alg_oakley_hmacdef_one _bsd_racoon_alg_oakley_hmacdef_one
+#define algclass2doi _bsd_racoon_algclass2doi
+#define algtype2doi _bsd_racoon_algtype2doi
+#define check_keylen _bsd_racoon_check_keylen
+#define default_keylen _bsd_racoon_default_keylen
/* backupsa.c */
#define backupsa_clean _bsd_racoon_backupsa_clean
#define backupsa_from_file _bsd_racoon_backupsa_from_file
#define backupsa_to_file _bsd_racoon_backupsa_to_file
/* cfparse_wrapper.c */
+#define cfparse _bsd_racoon_cfparse
+#define cfreparse _bsd_racoon_cfreparse
+#define dupspspec_list _bsd_racoon_dupspspec_list
+#define flushspspec _bsd_racoon_flushspspec
+#define racoonyychar _bsd_racoon_racoonyychar
#define racoonyydebug _bsd_racoon_racoonyydebug
-#define racoonyynerrs _bsd_racoon_racoonyynerrs
#define racoonyyerrflag _bsd_racoon_racoonyyerrflag
-#define racoonyychar _bsd_racoon_racoonyychar
-#define racoonyyval _bsd_racoon_racoonyyval
#define racoonyylval _bsd_racoon_racoonyylval
+#define racoonyynerrs _bsd_racoon_racoonyynerrs
#define racoonyyparse _bsd_racoon_racoonyyparse
-#define cfreparse _bsd_racoon_cfreparse
-#define cfparse _bsd_racoon_cfparse
-#define flushspspec _bsd_racoon_flushspspec
-#define dupspspec_list _bsd_racoon_dupspspec_list
+#define racoonyyval _bsd_racoon_racoonyyval
/* cftoken_wrapper.c */
-#define racoonyyleng _bsd_racoon_racoonyyleng
-#define racoonyyin _bsd_racoon_racoonyyin
-#define racoonyyout _bsd_racoon_racoonyyout
-#define racoonyylineno _bsd_racoon_racoonyylineno
+#define racoonyy_create_buffer _bsd_racoon_racoonyy_create_buffer
+#define racoonyy_delete_buffer _bsd_racoon_racoonyy_delete_buffer
#define racoonyy_flex_debug _bsd_racoon_racoonyy_flex_debug
-#define racoonyytext _bsd_racoon_racoonyytext
-#define yyerrorcount _bsd_racoon_yyerrorcount
-#define yycf_clean_buffer _bsd_racoon_yycf_clean_buffer
-#define yycf_init_buffer _bsd_racoon_yycf_init_buffer
-#define yycf_set_buffer _bsd_racoon_yycf_set_buffer
-#define yycf_switch_buffer _bsd_racoon_yycf_switch_buffer
-#define yywarn _bsd_racoon_yywarn
+#define racoonyy_flush_buffer _bsd_racoon_racoonyy_flush_buffer
+#define racoonyy_scan_buffer _bsd_racoon_racoonyy_scan_buffer
+#define racoonyy_scan_bytes _bsd_racoon_racoonyy_scan_bytes
+#define racoonyy_scan_string _bsd_racoon_racoonyy_scan_string
+#define racoonyy_switch_to_buffer _bsd_racoon_racoonyy_switch_to_buffer
+#define racoonyyalloc _bsd_racoon_racoonyyalloc
#define racoonyyerror _bsd_racoon_racoonyyerror
#define racoonyyfree _bsd_racoon_racoonyyfree
-#define racoonyyrealloc _bsd_racoon_racoonyyrealloc
-#define racoonyyalloc _bsd_racoon_racoonyyalloc
-#define racoonyylex_destroy _bsd_racoon_racoonyylex_destroy
-#define racoonyyset_debug _bsd_racoon_racoonyyset_debug
#define racoonyyget_debug _bsd_racoon_racoonyyget_debug
-#define racoonyyset_out _bsd_racoon_racoonyyset_out
-#define racoonyyset_in _bsd_racoon_racoonyyset_in
-#define racoonyyset_lineno _bsd_racoon_racoonyyset_lineno
-#define racoonyyget_text _bsd_racoon_racoonyyget_text
-#define racoonyyget_leng _bsd_racoon_racoonyyget_leng
-#define racoonyyget_out _bsd_racoon_racoonyyget_out
#define racoonyyget_in _bsd_racoon_racoonyyget_in
+#define racoonyyget_leng _bsd_racoon_racoonyyget_leng
#define racoonyyget_lineno _bsd_racoon_racoonyyget_lineno
-#define racoonyy_scan_bytes _bsd_racoon_racoonyy_scan_bytes
-#define racoonyy_scan_string _bsd_racoon_racoonyy_scan_string
-#define racoonyy_scan_buffer _bsd_racoon_racoonyy_scan_buffer
+#define racoonyyget_out _bsd_racoon_racoonyyget_out
+#define racoonyyget_text _bsd_racoon_racoonyyget_text
+#define racoonyyin _bsd_racoon_racoonyyin
+#define racoonyyleng _bsd_racoon_racoonyyleng
+#define racoonyylex _bsd_racoon_racoonyylex
+#define racoonyylex_destroy _bsd_racoon_racoonyylex_destroy
+#define racoonyylineno _bsd_racoon_racoonyylineno
+#define racoonyyout _bsd_racoon_racoonyyout
#define racoonyypop_buffer_state _bsd_racoon_racoonyypop_buffer_state
#define racoonyypush_buffer_state _bsd_racoon_racoonyypush_buffer_state
-#define racoonyy_flush_buffer _bsd_racoon_racoonyy_flush_buffer
-#define racoonyy_delete_buffer _bsd_racoon_racoonyy_delete_buffer
-#define racoonyy_create_buffer _bsd_racoon_racoonyy_create_buffer
-#define racoonyy_switch_to_buffer _bsd_racoon_racoonyy_switch_to_buffer
+#define racoonyyrealloc _bsd_racoon_racoonyyrealloc
#define racoonyyrestart _bsd_racoon_racoonyyrestart
-#define racoonyylex _bsd_racoon_racoonyylex
+#define racoonyyset_debug _bsd_racoon_racoonyyset_debug
+#define racoonyyset_in _bsd_racoon_racoonyyset_in
+#define racoonyyset_lineno _bsd_racoon_racoonyyset_lineno
+#define racoonyyset_out _bsd_racoon_racoonyyset_out
+#define racoonyytext _bsd_racoon_racoonyytext
+#define yycf_clean_buffer _bsd_racoon_yycf_clean_buffer
+#define yycf_init_buffer _bsd_racoon_yycf_init_buffer
+#define yycf_set_buffer _bsd_racoon_yycf_set_buffer
+#define yycf_switch_buffer _bsd_racoon_yycf_switch_buffer
+#define yyerrorcount _bsd_racoon_yyerrorcount
+#define yywarn _bsd_racoon_yywarn
/* crypto_openssl.c */
-#define eay_version _bsd_racoon_eay_version
-#define eay_random _bsd_racoon_eay_random
-#define bignum_pubkey2rsa _bsd_racoon_bignum_pubkey2rsa
-#define base64_pubkey2rsa _bsd_racoon_base64_pubkey2rsa
-#define base64_encode _bsd_racoon_base64_encode
#define base64_decode _bsd_racoon_base64_decode
-#define eay_init _bsd_racoon_eay_init
+#define base64_encode _bsd_racoon_base64_encode
+#define base64_pubkey2rsa _bsd_racoon_base64_pubkey2rsa
+#define bignum_pubkey2rsa _bsd_racoon_bignum_pubkey2rsa
+#define eay_3des_decrypt _bsd_racoon_eay_3des_decrypt
+#define eay_3des_encrypt _bsd_racoon_eay_3des_encrypt
+#define eay_3des_keylen _bsd_racoon_eay_3des_keylen
+#define eay_3des_weakkey _bsd_racoon_eay_3des_weakkey
+#define eay_aes_decrypt _bsd_racoon_eay_aes_decrypt
+#define eay_aes_encrypt _bsd_racoon_eay_aes_encrypt
+#define eay_aes_keylen _bsd_racoon_eay_aes_keylen
+#define eay_aes_weakkey _bsd_racoon_eay_aes_weakkey
+#define eay_bf_decrypt _bsd_racoon_eay_bf_decrypt
+#define eay_bf_encrypt _bsd_racoon_eay_bf_encrypt
+#define eay_bf_keylen _bsd_racoon_eay_bf_keylen
+#define eay_bf_weakkey _bsd_racoon_eay_bf_weakkey
#define eay_bn2v _bsd_racoon_eay_bn2v
-#define eay_v2bn _bsd_racoon_eay_v2bn
+#define eay_camellia_decrypt _bsd_racoon_eay_camellia_decrypt
+#define eay_camellia_encrypt _bsd_racoon_eay_camellia_encrypt
+#define eay_camellia_keylen _bsd_racoon_eay_camellia_keylen
+#define eay_camellia_weakkey _bsd_racoon_eay_camellia_weakkey
+#define eay_cast_decrypt _bsd_racoon_eay_cast_decrypt
+#define eay_cast_encrypt _bsd_racoon_eay_cast_encrypt
+#define eay_cast_keylen _bsd_racoon_eay_cast_keylen
+#define eay_cast_weakkey _bsd_racoon_eay_cast_weakkey
+#define eay_check_rsasign _bsd_racoon_eay_check_rsasign
+#define eay_check_x509cert _bsd_racoon_eay_check_x509cert
+#define eay_check_x509sign _bsd_racoon_eay_check_x509sign
+#define eay_cmp_asn1dn _bsd_racoon_eay_cmp_asn1dn
+#define eay_des_decrypt _bsd_racoon_eay_des_decrypt
+#define eay_des_encrypt _bsd_racoon_eay_des_encrypt
+#define eay_des_keylen _bsd_racoon_eay_des_keylen
+#define eay_des_weakkey _bsd_racoon_eay_des_weakkey
#define eay_dh_compute _bsd_racoon_eay_dh_compute
#define eay_dh_generate _bsd_racoon_eay_dh_generate
-#define eay_set_random _bsd_racoon_eay_set_random
-#define eay_md5_hashlen _bsd_racoon_eay_md5_hashlen
-#define eay_md5_one _bsd_racoon_eay_md5_one
-#define eay_md5_final _bsd_racoon_eay_md5_final
-#define eay_md5_update _bsd_racoon_eay_md5_update
-#define eay_md5_init _bsd_racoon_eay_md5_init
-#define eay_sha1_hashlen _bsd_racoon_eay_sha1_hashlen
-#define eay_sha1_one _bsd_racoon_eay_sha1_one
-#define eay_sha1_final _bsd_racoon_eay_sha1_final
-#define eay_sha1_update _bsd_racoon_eay_sha1_update
-#define eay_sha1_init _bsd_racoon_eay_sha1_init
-#define eay_sha2_256_hashlen _bsd_racoon_eay_sha2_256_hashlen
-#define eay_sha2_256_one _bsd_racoon_eay_sha2_256_one
-#define eay_sha2_256_final _bsd_racoon_eay_sha2_256_final
-#define eay_sha2_256_update _bsd_racoon_eay_sha2_256_update
-#define eay_sha2_256_init _bsd_racoon_eay_sha2_256_init
-#define eay_sha2_384_hashlen _bsd_racoon_eay_sha2_384_hashlen
-#define eay_sha2_384_one _bsd_racoon_eay_sha2_384_one
-#define eay_sha2_384_final _bsd_racoon_eay_sha2_384_final
-#define eay_sha2_384_update _bsd_racoon_eay_sha2_384_update
-#define eay_sha2_384_init _bsd_racoon_eay_sha2_384_init
-#define eay_sha2_512_hashlen _bsd_racoon_eay_sha2_512_hashlen
-#define eay_sha2_512_one _bsd_racoon_eay_sha2_512_one
-#define eay_sha2_512_final _bsd_racoon_eay_sha2_512_final
-#define eay_sha2_512_update _bsd_racoon_eay_sha2_512_update
-#define eay_sha2_512_init _bsd_racoon_eay_sha2_512_init
+#define eay_get_pkcs1privkey _bsd_racoon_eay_get_pkcs1privkey
+#define eay_get_pkcs1pubkey _bsd_racoon_eay_get_pkcs1pubkey
+#define eay_get_rsasign _bsd_racoon_eay_get_rsasign
+#define eay_get_x509asn1issuername _bsd_racoon_eay_get_x509asn1issuername
+#define eay_get_x509asn1subjectname _bsd_racoon_eay_get_x509asn1subjectname
+#define eay_get_x509cert _bsd_racoon_eay_get_x509cert
+#define eay_get_x509sign _bsd_racoon_eay_get_x509sign
+#define eay_get_x509subjectaltname _bsd_racoon_eay_get_x509subjectaltname
+#define eay_get_x509text _bsd_racoon_eay_get_x509text
+#define eay_hex2asn1dn _bsd_racoon_eay_hex2asn1dn
#define eay_hmacmd5_final _bsd_racoon_eay_hmacmd5_final
-#define eay_hmacmd5_update _bsd_racoon_eay_hmacmd5_update
#define eay_hmacmd5_init _bsd_racoon_eay_hmacmd5_init
#define eay_hmacmd5_one _bsd_racoon_eay_hmacmd5_one
+#define eay_hmacmd5_update _bsd_racoon_eay_hmacmd5_update
#define eay_hmacsha1_final _bsd_racoon_eay_hmacsha1_final
-#define eay_hmacsha1_update _bsd_racoon_eay_hmacsha1_update
#define eay_hmacsha1_init _bsd_racoon_eay_hmacsha1_init
#define eay_hmacsha1_one _bsd_racoon_eay_hmacsha1_one
+#define eay_hmacsha1_update _bsd_racoon_eay_hmacsha1_update
#define eay_hmacsha2_256_final _bsd_racoon_eay_hmacsha2_256_final
-#define eay_hmacsha2_256_update _bsd_racoon_eay_hmacsha2_256_update
#define eay_hmacsha2_256_init _bsd_racoon_eay_hmacsha2_256_init
#define eay_hmacsha2_256_one _bsd_racoon_eay_hmacsha2_256_one
+#define eay_hmacsha2_256_update _bsd_racoon_eay_hmacsha2_256_update
#define eay_hmacsha2_384_final _bsd_racoon_eay_hmacsha2_384_final
-#define eay_hmacsha2_384_update _bsd_racoon_eay_hmacsha2_384_update
#define eay_hmacsha2_384_init _bsd_racoon_eay_hmacsha2_384_init
#define eay_hmacsha2_384_one _bsd_racoon_eay_hmacsha2_384_one
+#define eay_hmacsha2_384_update _bsd_racoon_eay_hmacsha2_384_update
#define eay_hmacsha2_512_final _bsd_racoon_eay_hmacsha2_512_final
-#define eay_hmacsha2_512_update _bsd_racoon_eay_hmacsha2_512_update
#define eay_hmacsha2_512_init _bsd_racoon_eay_hmacsha2_512_init
#define eay_hmacsha2_512_one _bsd_racoon_eay_hmacsha2_512_one
-#define eay_null_keylen _bsd_racoon_eay_null_keylen
-#define eay_twofish_keylen _bsd_racoon_eay_twofish_keylen
-#define eay_kpdk_hashlen _bsd_racoon_eay_kpdk_hashlen
-#define eay_null_hashlen _bsd_racoon_eay_null_hashlen
-#define eay_camellia_keylen _bsd_racoon_eay_camellia_keylen
-#define eay_camellia_weakkey _bsd_racoon_eay_camellia_weakkey
-#define eay_camellia_decrypt _bsd_racoon_eay_camellia_decrypt
-#define eay_camellia_encrypt _bsd_racoon_eay_camellia_encrypt
-#define eay_aes_keylen _bsd_racoon_eay_aes_keylen
-#define eay_aes_weakkey _bsd_racoon_eay_aes_weakkey
-#define eay_aes_decrypt _bsd_racoon_eay_aes_decrypt
-#define eay_aes_encrypt _bsd_racoon_eay_aes_encrypt
-#define eay_cast_keylen _bsd_racoon_eay_cast_keylen
-#define eay_cast_weakkey _bsd_racoon_eay_cast_weakkey
-#define eay_cast_decrypt _bsd_racoon_eay_cast_decrypt
-#define eay_cast_encrypt _bsd_racoon_eay_cast_encrypt
-#define eay_3des_keylen _bsd_racoon_eay_3des_keylen
-#define eay_3des_weakkey _bsd_racoon_eay_3des_weakkey
-#define eay_3des_decrypt _bsd_racoon_eay_3des_decrypt
-#define eay_3des_encrypt _bsd_racoon_eay_3des_encrypt
-#define eay_bf_keylen _bsd_racoon_eay_bf_keylen
-#define eay_bf_weakkey _bsd_racoon_eay_bf_weakkey
-#define eay_bf_decrypt _bsd_racoon_eay_bf_decrypt
-#define eay_bf_encrypt _bsd_racoon_eay_bf_encrypt
-#define eay_idea_keylen _bsd_racoon_eay_idea_keylen
-#define eay_idea_weakkey _bsd_racoon_eay_idea_weakkey
+#define eay_hmacsha2_512_update _bsd_racoon_eay_hmacsha2_512_update
#define eay_idea_decrypt _bsd_racoon_eay_idea_decrypt
#define eay_idea_encrypt _bsd_racoon_eay_idea_encrypt
-#define eay_des_keylen _bsd_racoon_eay_des_keylen
-#define eay_des_weakkey _bsd_racoon_eay_des_weakkey
-#define eay_des_decrypt _bsd_racoon_eay_des_decrypt
-#define eay_des_encrypt _bsd_racoon_eay_des_encrypt
-#define evp_keylen _bsd_racoon_evp_keylen
-#define evp_weakkey _bsd_racoon_evp_weakkey
-#define evp_crypt _bsd_racoon_evp_crypt
-#define eay_strerror _bsd_racoon_eay_strerror
-#define eay_rsa_verify _bsd_racoon_eay_rsa_verify
+#define eay_idea_keylen _bsd_racoon_eay_idea_keylen
+#define eay_idea_weakkey _bsd_racoon_eay_idea_weakkey
+#define eay_init _bsd_racoon_eay_init
+#define eay_kpdk_hashlen _bsd_racoon_eay_kpdk_hashlen
+#define eay_md5_final _bsd_racoon_eay_md5_final
+#define eay_md5_hashlen _bsd_racoon_eay_md5_hashlen
+#define eay_md5_init _bsd_racoon_eay_md5_init
+#define eay_md5_one _bsd_racoon_eay_md5_one
+#define eay_md5_update _bsd_racoon_eay_md5_update
+#define eay_null_hashlen _bsd_racoon_eay_null_hashlen
+#define eay_null_keylen _bsd_racoon_eay_null_keylen
+#define eay_random _bsd_racoon_eay_random
#define eay_rsa_sign _bsd_racoon_eay_rsa_sign
-#define eay_get_rsasign _bsd_racoon_eay_get_rsasign
-#define eay_get_x509sign _bsd_racoon_eay_get_x509sign
-#define eay_get_pkcs1pubkey _bsd_racoon_eay_get_pkcs1pubkey
-#define eay_get_pkcs1privkey _bsd_racoon_eay_get_pkcs1privkey
-#define eay_check_rsasign _bsd_racoon_eay_check_rsasign
-#define eay_check_x509sign _bsd_racoon_eay_check_x509sign
-#define eay_get_x509cert _bsd_racoon_eay_get_x509cert
-#define eay_get_x509text _bsd_racoon_eay_get_x509text
-#define eay_get_x509asn1issuername _bsd_racoon_eay_get_x509asn1issuername
-#define eay_get_x509subjectaltname _bsd_racoon_eay_get_x509subjectaltname
-#define eay_get_x509asn1subjectname _bsd_racoon_eay_get_x509asn1subjectname
-#define eay_check_x509cert _bsd_racoon_eay_check_x509cert
-#define eay_cmp_asn1dn _bsd_racoon_eay_cmp_asn1dn
-#define eay_hex2asn1dn _bsd_racoon_eay_hex2asn1dn
+#define eay_rsa_verify _bsd_racoon_eay_rsa_verify
+#define eay_set_random _bsd_racoon_eay_set_random
+#define eay_sha1_final _bsd_racoon_eay_sha1_final
+#define eay_sha1_hashlen _bsd_racoon_eay_sha1_hashlen
+#define eay_sha1_init _bsd_racoon_eay_sha1_init
+#define eay_sha1_one _bsd_racoon_eay_sha1_one
+#define eay_sha1_update _bsd_racoon_eay_sha1_update
+#define eay_sha2_256_final _bsd_racoon_eay_sha2_256_final
+#define eay_sha2_256_hashlen _bsd_racoon_eay_sha2_256_hashlen
+#define eay_sha2_256_init _bsd_racoon_eay_sha2_256_init
+#define eay_sha2_256_one _bsd_racoon_eay_sha2_256_one
+#define eay_sha2_256_update _bsd_racoon_eay_sha2_256_update
+#define eay_sha2_384_final _bsd_racoon_eay_sha2_384_final
+#define eay_sha2_384_hashlen _bsd_racoon_eay_sha2_384_hashlen
+#define eay_sha2_384_init _bsd_racoon_eay_sha2_384_init
+#define eay_sha2_384_one _bsd_racoon_eay_sha2_384_one
+#define eay_sha2_384_update _bsd_racoon_eay_sha2_384_update
+#define eay_sha2_512_final _bsd_racoon_eay_sha2_512_final
+#define eay_sha2_512_hashlen _bsd_racoon_eay_sha2_512_hashlen
+#define eay_sha2_512_init _bsd_racoon_eay_sha2_512_init
+#define eay_sha2_512_one _bsd_racoon_eay_sha2_512_one
+#define eay_sha2_512_update _bsd_racoon_eay_sha2_512_update
#define eay_str2asn1dn _bsd_racoon_eay_str2asn1dn
+#define eay_strerror _bsd_racoon_eay_strerror
+#define eay_twofish_keylen _bsd_racoon_eay_twofish_keylen
+#define eay_v2bn _bsd_racoon_eay_v2bn
+#define eay_version _bsd_racoon_eay_version
+#define evp_crypt _bsd_racoon_evp_crypt
+#define evp_keylen _bsd_racoon_evp_keylen
+#define evp_weakkey _bsd_racoon_evp_weakkey
/* dnssec.c */
#define dnssec_getcert _bsd_racoon_dnssec_getcert
/* evt.c */
/* genlist.c */
-#define genlist_free _bsd_racoon_genlist_free
-#define genlist_next _bsd_racoon_genlist_next
-#define genlist_foreach _bsd_racoon_genlist_foreach
#define genlist_append _bsd_racoon_genlist_append
-#define genlist_insert _bsd_racoon_genlist_insert
+#define genlist_foreach _bsd_racoon_genlist_foreach
+#define genlist_free _bsd_racoon_genlist_free
#define genlist_init _bsd_racoon_genlist_init
+#define genlist_insert _bsd_racoon_genlist_insert
+#define genlist_next _bsd_racoon_genlist_next
/* getcertsbyname.c */
-#define getcertsbyname _bsd_racoon_getcertsbyname
#define freecertinfo _bsd_racoon_freecertinfo
+#define getcertsbyname _bsd_racoon_getcertsbyname
/* grabmyaddr.c */
#define myaddr_close _bsd_racoon_myaddr_close
+#define myaddr_flush _bsd_racoon_myaddr_flush
+#define myaddr_getfd _bsd_racoon_myaddr_getfd
+#define myaddr_getsport _bsd_racoon_myaddr_getsport
#define myaddr_init _bsd_racoon_myaddr_init
#define myaddr_init_lists _bsd_racoon_myaddr_init_lists
-#define myaddr_getsport _bsd_racoon_myaddr_getsport
-#define myaddr_getfd _bsd_racoon_myaddr_getfd
-#define myaddr_sync _bsd_racoon_myaddr_sync
#define myaddr_listen _bsd_racoon_myaddr_listen
-#define myaddr_flush _bsd_racoon_myaddr_flush
+#define myaddr_sync _bsd_racoon_myaddr_sync
/* gssapi.c */
#define __gssapi_dUmMy _bsd_racoon___gssapi_dUmMy
/* handler.c */
-#define revalidate_ph12 _bsd_racoon_revalidate_ph12
-#define init_recvdpkt _bsd_racoon_init_recvdpkt
#define add_recvdpkt _bsd_racoon_add_recvdpkt
-#define check_recvdpkt _bsd_racoon_check_recvdpkt
-#define initctdtree _bsd_racoon_initctdtree
-#define remcontacted _bsd_racoon_remcontacted
-#define inscontacted _bsd_racoon_inscontacted
-#define getcontacted _bsd_racoon_getcontacted
-#define unbindph12 _bsd_racoon_unbindph12
#define bindph12 _bsd_racoon_bindph12
+#define check_recvdpkt _bsd_racoon_check_recvdpkt
#define deleteallph2 _bsd_racoon_deleteallph2
-#define flushph2 _bsd_racoon_flushph2
-#define initph2tree _bsd_racoon_initph2tree
-#define remph2 _bsd_racoon_remph2
-#define insph2 _bsd_racoon_insph2
+#define delph1 _bsd_racoon_delph1
#define delph2 _bsd_racoon_delph2
-#define initph2 _bsd_racoon_initph2
-#define newph2 _bsd_racoon_newph2
-#define getph2bysaidx _bsd_racoon_getph2bysaidx
-#define getph2bysaddr _bsd_racoon_getph2bysaddr
+#define dumpph1 _bsd_racoon_dumpph1
+#define enumph1 _bsd_racoon_enumph1
+#define enumph2 _bsd_racoon_enumph2
+#define flushph1 _bsd_racoon_flushph1
+#define flushph2 _bsd_racoon_flushph2
+#define getcontacted _bsd_racoon_getcontacted
+#define getph1 _bsd_racoon_getph1
+#define getph1byindex _bsd_racoon_getph1byindex
+#define getph1byindex0 _bsd_racoon_getph1byindex0
#define getph2byid _bsd_racoon_getph2byid
#define getph2bymsgid _bsd_racoon_getph2bymsgid
+#define getph2bysaddr _bsd_racoon_getph2bysaddr
+#define getph2bysaidx _bsd_racoon_getph2bysaidx
#define getph2byseq _bsd_racoon_getph2byseq
-#define enumph2 _bsd_racoon_enumph2
-#define ph1_rekey_enabled _bsd_racoon_ph1_rekey_enabled
+#define init_recvdpkt _bsd_racoon_init_recvdpkt
+#define initctdtree _bsd_racoon_initctdtree
#define initph1tree _bsd_racoon_initph1tree
-#define flushph1 _bsd_racoon_flushph1
-#define remph1 _bsd_racoon_remph1
+#define initph2 _bsd_racoon_initph2
+#define initph2tree _bsd_racoon_initph2tree
+#define inscontacted _bsd_racoon_inscontacted
#define insph1 _bsd_racoon_insph1
-#define delph1 _bsd_racoon_delph1
-#define newph1 _bsd_racoon_newph1
-#define dumpph1 _bsd_racoon_dumpph1
+#define insph2 _bsd_racoon_insph2
#define migrate_dying_ph12 _bsd_racoon_migrate_dying_ph12
#define migrate_ph12 _bsd_racoon_migrate_ph12
+#define newph1 _bsd_racoon_newph1
+#define newph2 _bsd_racoon_newph2
+#define ph1_rekey_enabled _bsd_racoon_ph1_rekey_enabled
+#define remcontacted _bsd_racoon_remcontacted
+#define remph1 _bsd_racoon_remph1
+#define remph2 _bsd_racoon_remph2
#define resolveph1rmconf _bsd_racoon_resolveph1rmconf
-#define getph1 _bsd_racoon_getph1
-#define getph1byindex0 _bsd_racoon_getph1byindex0
-#define getph1byindex _bsd_racoon_getph1byindex
-#define enumph1 _bsd_racoon_enumph1
+#define revalidate_ph12 _bsd_racoon_revalidate_ph12
+#define unbindph12 _bsd_racoon_unbindph12
/* ipsec_doi.c */
#define doi2idtype _bsd_racoon_doi2idtype
+#define doi2ipproto _bsd_racoon_doi2ipproto
+#define free_proppair _bsd_racoon_free_proppair
+#define get_proppair _bsd_racoon_get_proppair
+#define get_sabyproppair _bsd_racoon_get_sabyproppair
+#define get_sabysaprop _bsd_racoon_get_sabysaprop
#define idtype2doi _bsd_racoon_idtype2doi
+#define ipproto2doi _bsd_racoon_ipproto2doi
#define ipsecdoi_authalg2trnsid _bsd_racoon_ipsecdoi_authalg2trnsid
-#define ipsecdoi_t2satrns _bsd_racoon_ipsecdoi_t2satrns
-#define ipsecdoi_id2str _bsd_racoon_ipsecdoi_id2str
-#define ipsecdoi_id2sockaddr _bsd_racoon_ipsecdoi_id2sockaddr
-#define ipsecdoi_sockrange2id _bsd_racoon_ipsecdoi_sockrange2id
-#define ipsecdoi_sockaddr2id _bsd_racoon_ipsecdoi_sockaddr2id
-#define ipsecdoi_setid2 _bsd_racoon_ipsecdoi_setid2
-#define set_identifier_qual _bsd_racoon_set_identifier_qual
-#define set_identifier _bsd_racoon_set_identifier
-#define ipsecdoi_setid1 _bsd_racoon_ipsecdoi_setid1
+#define ipsecdoi_checkalgtypes _bsd_racoon_ipsecdoi_checkalgtypes
#define ipsecdoi_checkid1 _bsd_racoon_ipsecdoi_checkid1
+#define ipsecdoi_checkph1proposal _bsd_racoon_ipsecdoi_checkph1proposal
+#define ipsecdoi_checkph2proposal _bsd_racoon_ipsecdoi_checkph2proposal
#define ipsecdoi_chkcmpids _bsd_racoon_ipsecdoi_chkcmpids
-#define ipsecdoi_subnetisaddr_v6 _bsd_racoon_ipsecdoi_subnetisaddr_v6
-#define ipsecdoi_subnetisaddr_v4 _bsd_racoon_ipsecdoi_subnetisaddr_v4
-#define doi2ipproto _bsd_racoon_doi2ipproto
-#define ipproto2doi _bsd_racoon_ipproto2doi
-#define ipsecdoi_checkalgtypes _bsd_racoon_ipsecdoi_checkalgtypes
#define ipsecdoi_get_defaultlifetime _bsd_racoon_ipsecdoi_get_defaultlifetime
-#define ipsecdoi_transportmode _bsd_racoon_ipsecdoi_transportmode
-#define ipsecdoi_setph2proposal _bsd_racoon_ipsecdoi_setph2proposal
-#define ipsecdoi_setph1proposal _bsd_racoon_ipsecdoi_setph1proposal
+#define ipsecdoi_id2sockaddr _bsd_racoon_ipsecdoi_id2sockaddr
+#define ipsecdoi_id2str _bsd_racoon_ipsecdoi_id2str
#define ipsecdoi_parse_responder_lifetime _bsd_racoon_ipsecdoi_parse_responder_lifetime
-#define get_sabysaprop _bsd_racoon_get_sabysaprop
-#define ipsecdoi_updatespi _bsd_racoon_ipsecdoi_updatespi
-#define get_sabyproppair _bsd_racoon_get_sabyproppair
-#define get_proppair _bsd_racoon_get_proppair
-#define free_proppair _bsd_racoon_free_proppair
-#define ipsecdoi_checkph2proposal _bsd_racoon_ipsecdoi_checkph2proposal
#define ipsecdoi_selectph2proposal _bsd_racoon_ipsecdoi_selectph2proposal
-#define ipsecdoi_checkph1proposal _bsd_racoon_ipsecdoi_checkph1proposal
+#define ipsecdoi_setid1 _bsd_racoon_ipsecdoi_setid1
+#define ipsecdoi_setid2 _bsd_racoon_ipsecdoi_setid2
+#define ipsecdoi_setph1proposal _bsd_racoon_ipsecdoi_setph1proposal
+#define ipsecdoi_setph2proposal _bsd_racoon_ipsecdoi_setph2proposal
+#define ipsecdoi_sockaddr2id _bsd_racoon_ipsecdoi_sockaddr2id
+#define ipsecdoi_sockrange2id _bsd_racoon_ipsecdoi_sockrange2id
+#define ipsecdoi_subnetisaddr_v4 _bsd_racoon_ipsecdoi_subnetisaddr_v4
+#define ipsecdoi_subnetisaddr_v6 _bsd_racoon_ipsecdoi_subnetisaddr_v6
+#define ipsecdoi_t2satrns _bsd_racoon_ipsecdoi_t2satrns
+#define ipsecdoi_transportmode _bsd_racoon_ipsecdoi_transportmode
+#define ipsecdoi_updatespi _bsd_racoon_ipsecdoi_updatespi
+#define set_identifier _bsd_racoon_set_identifier
+#define set_identifier_qual _bsd_racoon_set_identifier_qual
/* isakmp_agg.c */
-#define agg_r2send _bsd_racoon_agg_r2send
-#define agg_r2recv _bsd_racoon_agg_r2recv
-#define agg_r1send _bsd_racoon_agg_r1send
-#define agg_r1recv _bsd_racoon_agg_r1recv
-#define agg_i2send _bsd_racoon_agg_i2send
-#define agg_i2recv _bsd_racoon_agg_i2recv
#define agg_i1send _bsd_racoon_agg_i1send
+#define agg_i2recv _bsd_racoon_agg_i2recv
+#define agg_i2send _bsd_racoon_agg_i2send
+#define agg_r1recv _bsd_racoon_agg_r1recv
+#define agg_r1send _bsd_racoon_agg_r1send
+#define agg_r2recv _bsd_racoon_agg_r2recv
+#define agg_r2send _bsd_racoon_agg_r2send
/* isakmp_base.c */
-#define base_r2send _bsd_racoon_base_r2send
-#define base_r2recv _bsd_racoon_base_r2recv
-#define base_r1send _bsd_racoon_base_r1send
-#define base_r1recv _bsd_racoon_base_r1recv
-#define base_i3send _bsd_racoon_base_i3send
-#define base_i3recv _bsd_racoon_base_i3recv
-#define base_i2send _bsd_racoon_base_i2send
-#define base_i2recv _bsd_racoon_base_i2recv
#define base_i1send _bsd_racoon_base_i1send
+#define base_i2recv _bsd_racoon_base_i2recv
+#define base_i2send _bsd_racoon_base_i2send
+#define base_i3recv _bsd_racoon_base_i3recv
+#define base_i3send _bsd_racoon_base_i3send
+#define base_r1recv _bsd_racoon_base_r1recv
+#define base_r1send _bsd_racoon_base_r1send
+#define base_r2recv _bsd_racoon_base_r2recv
+#define base_r2send _bsd_racoon_base_r2send
/* isakmp.c */
-#define setscopeid _bsd_racoon_setscopeid
-#define delete_spd _bsd_racoon_delete_spd
-#define purge_remote _bsd_racoon_purge_remote
-#define script_exec _bsd_racoon_script_exec
-#define script_env_append _bsd_racoon_script_env_append
-#define script_hook _bsd_racoon_script_hook
-#define isakmp_plist_set_all _bsd_racoon_isakmp_plist_set_all
-#define isakmp_plist_append_full _bsd_racoon_isakmp_plist_append_full
-#define log_ph1established _bsd_racoon_log_ph1established
#define copy_ph1addresses _bsd_racoon_copy_ph1addresses
-#define set_isakmp_payload _bsd_racoon_set_isakmp_payload
-#define set_isakmp_header2 _bsd_racoon_set_isakmp_header2
-#define set_isakmp_header1 _bsd_racoon_set_isakmp_header1
-#define isakmp_newmsgid2 _bsd_racoon_isakmp_newmsgid2
-#define isakmp_p2ph _bsd_racoon_isakmp_p2ph
-#define isakmp_newcookie _bsd_racoon_isakmp_newcookie
+#define delete_spd _bsd_racoon_delete_spd
#define isakmp_add_attr_l _bsd_racoon_isakmp_add_attr_l
#define isakmp_add_attr_v _bsd_racoon_isakmp_add_attr_v
-#define isakmp_set_attr_l _bsd_racoon_isakmp_set_attr_l
-#define isakmp_set_attr_v _bsd_racoon_isakmp_set_attr_v
#define isakmp_chkph1there _bsd_racoon_isakmp_chkph1there
#define isakmp_chkph1there_stub _bsd_racoon_isakmp_chkph1there_stub
-#define isakmp_post_getspi _bsd_racoon_isakmp_post_getspi
+#define isakmp_close _bsd_racoon_isakmp_close
#define isakmp_get_sainfo _bsd_racoon_isakmp_get_sainfo
-#define isakmp_post_acquire _bsd_racoon_isakmp_post_acquire
-#define isakmp_ph2delete _bsd_racoon_isakmp_ph2delete
-#define isakmp_ph2delete_stub _bsd_racoon_isakmp_ph2delete_stub
-#define isakmp_ph2expire _bsd_racoon_isakmp_ph2expire
-#define isakmp_ph2expire_stub _bsd_racoon_isakmp_ph2expire_stub
+#define isakmp_init _bsd_racoon_isakmp_init
+#define isakmp_newcookie _bsd_racoon_isakmp_newcookie
+#define isakmp_newmsgid2 _bsd_racoon_isakmp_newmsgid2
+#define isakmp_open _bsd_racoon_isakmp_open
+#define isakmp_p2ph _bsd_racoon_isakmp_p2ph
+#define isakmp_parse _bsd_racoon_isakmp_parse
+#define isakmp_parsewoh _bsd_racoon_isakmp_parsewoh
+#define isakmp_ph1begin_i _bsd_racoon_isakmp_ph1begin_i
#define isakmp_ph1delete _bsd_racoon_isakmp_ph1delete
#define isakmp_ph1delete_stub _bsd_racoon_isakmp_ph1delete_stub
-#define isakmp_ph1expire _bsd_racoon_isakmp_ph1expire
-#define isakmp_ph1expire_stub _bsd_racoon_isakmp_ph1expire_stub
#define isakmp_ph1dying _bsd_racoon_isakmp_ph1dying
#define isakmp_ph1dying_stub _bsd_racoon_isakmp_ph1dying_stub
-#define isakmp_ph2send _bsd_racoon_isakmp_ph2send
+#define isakmp_ph1expire _bsd_racoon_isakmp_ph1expire
+#define isakmp_ph1expire_stub _bsd_racoon_isakmp_ph1expire_stub
#define isakmp_ph1send _bsd_racoon_isakmp_ph1send
-#define isakmp_send _bsd_racoon_isakmp_send
-#define isakmp_close _bsd_racoon_isakmp_close
-#define isakmp_open _bsd_racoon_isakmp_open
+#define isakmp_ph2delete _bsd_racoon_isakmp_ph2delete
+#define isakmp_ph2delete_stub _bsd_racoon_isakmp_ph2delete_stub
+#define isakmp_ph2expire _bsd_racoon_isakmp_ph2expire
+#define isakmp_ph2expire_stub _bsd_racoon_isakmp_ph2expire_stub
+#define isakmp_ph2send _bsd_racoon_isakmp_ph2send
#define isakmp_pindex _bsd_racoon_isakmp_pindex
-#define isakmp_init _bsd_racoon_isakmp_init
-#define isakmp_parse _bsd_racoon_isakmp_parse
-#define isakmp_parsewoh _bsd_racoon_isakmp_parsewoh
-#define isakmp_ph1begin_i _bsd_racoon_isakmp_ph1begin_i
+#define isakmp_plist_append_full _bsd_racoon_isakmp_plist_append_full
+#define isakmp_plist_set_all _bsd_racoon_isakmp_plist_set_all
+#define isakmp_post_acquire _bsd_racoon_isakmp_post_acquire
+#define isakmp_post_getspi _bsd_racoon_isakmp_post_getspi
+#define isakmp_send _bsd_racoon_isakmp_send
+#define isakmp_set_attr_l _bsd_racoon_isakmp_set_attr_l
+#define isakmp_set_attr_v _bsd_racoon_isakmp_set_attr_v
+#define log_ph1established _bsd_racoon_log_ph1established
+#define purge_remote _bsd_racoon_purge_remote
+#define script_env_append _bsd_racoon_script_env_append
+#define script_exec _bsd_racoon_script_exec
+#define script_hook _bsd_racoon_script_hook
+#define set_isakmp_header1 _bsd_racoon_set_isakmp_header1
+#define set_isakmp_header2 _bsd_racoon_set_isakmp_header2
+#define set_isakmp_payload _bsd_racoon_set_isakmp_payload
+#define setscopeid _bsd_racoon_setscopeid
/* isakmp_frag.c */
#define isakmp_frag_addcap _bsd_racoon_isakmp_frag_addcap
-#define isakmp_frag_reassembly _bsd_racoon_isakmp_frag_reassembly
#define isakmp_frag_extract _bsd_racoon_isakmp_frag_extract
-#define vendorid_frag_cap _bsd_racoon_vendorid_frag_cap
+#define isakmp_frag_reassembly _bsd_racoon_isakmp_frag_reassembly
#define isakmp_sendfrags _bsd_racoon_isakmp_sendfrags
+#define vendorid_frag_cap _bsd_racoon_vendorid_frag_cap
/* isakmp_ident.c */
-#define ident_r3send _bsd_racoon_ident_r3send
-#define ident_r3recv _bsd_racoon_ident_r3recv
-#define ident_r2send _bsd_racoon_ident_r2send
-#define ident_r2recv _bsd_racoon_ident_r2recv
-#define ident_r1send _bsd_racoon_ident_r1send
-#define ident_r1recv _bsd_racoon_ident_r1recv
-#define ident_i4send _bsd_racoon_ident_i4send
-#define ident_i4recv _bsd_racoon_ident_i4recv
-#define ident_i3send _bsd_racoon_ident_i3send
-#define ident_i3recv _bsd_racoon_ident_i3recv
-#define ident_i2send _bsd_racoon_ident_i2send
-#define ident_i2recv _bsd_racoon_ident_i2recv
#define ident_i1send _bsd_racoon_ident_i1send
+#define ident_i2recv _bsd_racoon_ident_i2recv
+#define ident_i2send _bsd_racoon_ident_i2send
+#define ident_i3recv _bsd_racoon_ident_i3recv
+#define ident_i3send _bsd_racoon_ident_i3send
+#define ident_i4recv _bsd_racoon_ident_i4recv
+#define ident_i4send _bsd_racoon_ident_i4send
+#define ident_r1recv _bsd_racoon_ident_r1recv
+#define ident_r1send _bsd_racoon_ident_r1send
+#define ident_r2recv _bsd_racoon_ident_r2recv
+#define ident_r2send _bsd_racoon_ident_r2send
+#define ident_r3recv _bsd_racoon_ident_r3recv
+#define ident_r3send _bsd_racoon_ident_r3send
/* isakmp_inf.c */
-#define isakmp_sched_r_u _bsd_racoon_isakmp_sched_r_u
-#define isakmp_info_recv_initialcontact _bsd_racoon_isakmp_info_recv_initialcontact
-#define purge_ipsec_spi _bsd_racoon_purge_ipsec_spi
#define isakmp_add_pl_n _bsd_racoon_isakmp_add_pl_n
+#define isakmp_info_recv _bsd_racoon_isakmp_info_recv
+#define isakmp_info_recv_initialcontact _bsd_racoon_isakmp_info_recv_initialcontact
#define isakmp_info_send_common _bsd_racoon_isakmp_info_send_common
-#define isakmp_info_send_n2 _bsd_racoon_isakmp_info_send_n2
+#define isakmp_info_send_d1 _bsd_racoon_isakmp_info_send_d1
+#define isakmp_info_send_d2 _bsd_racoon_isakmp_info_send_d2
#define isakmp_info_send_n1 _bsd_racoon_isakmp_info_send_n1
+#define isakmp_info_send_n2 _bsd_racoon_isakmp_info_send_n2
#define isakmp_info_send_nx _bsd_racoon_isakmp_info_send_nx
-#define isakmp_info_send_d2 _bsd_racoon_isakmp_info_send_d2
-#define isakmp_info_send_d1 _bsd_racoon_isakmp_info_send_d1
#define isakmp_log_notify _bsd_racoon_isakmp_log_notify
-#define isakmp_info_recv _bsd_racoon_isakmp_info_recv
+#define isakmp_sched_r_u _bsd_racoon_isakmp_sched_r_u
+#define purge_ipsec_spi _bsd_racoon_purge_ipsec_spi
/* isakmp_newg.c */
#define isakmp_newgroup_r _bsd_racoon_isakmp_newgroup_r
/* isakmp_quick.c */
-#define quick_r3prep _bsd_racoon_quick_r3prep
-#define tunnel_mode_prop _bsd_racoon_tunnel_mode_prop
-#define quick_r3send _bsd_racoon_quick_r3send
-#define quick_r3recv _bsd_racoon_quick_r3recv
-#define quick_r2send _bsd_racoon_quick_r2send
+#define quick_i1prep _bsd_racoon_quick_i1prep
+#define quick_i1send _bsd_racoon_quick_i1send
+#define quick_i2recv _bsd_racoon_quick_i2recv
+#define quick_i2send _bsd_racoon_quick_i2send
+#define quick_i3recv _bsd_racoon_quick_i3recv
#define quick_r1prep _bsd_racoon_quick_r1prep
#define quick_r1recv _bsd_racoon_quick_r1recv
-#define quick_i3recv _bsd_racoon_quick_i3recv
-#define quick_i2send _bsd_racoon_quick_i2send
-#define quick_i2recv _bsd_racoon_quick_i2recv
-#define quick_i1send _bsd_racoon_quick_i1send
-#define quick_i1prep _bsd_racoon_quick_i1prep
+#define quick_r2send _bsd_racoon_quick_r2send
+#define quick_r3prep _bsd_racoon_quick_r3prep
+#define quick_r3recv _bsd_racoon_quick_r3recv
+#define quick_r3send _bsd_racoon_quick_r3send
+#define tunnel_mode_prop _bsd_racoon_tunnel_mode_prop
/* localconf.c */
-#define lcconf _bsd_racoon_lcconf
-#define save_params _bsd_racoon_save_params
-#define restore_params _bsd_racoon_restore_params
#define doitype2doi _bsd_racoon_doitype2doi
-#define sittype2doi _bsd_racoon_sittype2doi
+#define flushlcconf _bsd_racoon_flushlcconf
#define getpathname _bsd_racoon_getpathname
#define getpsk _bsd_racoon_getpsk
#define getpskbyaddr _bsd_racoon_getpskbyaddr
#define getpskbyname _bsd_racoon_getpskbyname
-#define flushlcconf _bsd_racoon_flushlcconf
#define initlcconf _bsd_racoon_initlcconf
+#define lcconf _bsd_racoon_lcconf
+#define restore_params _bsd_racoon_restore_params
+#define save_params _bsd_racoon_save_params
+#define sittype2doi _bsd_racoon_sittype2doi
/* logger.c */
-#define log_free _bsd_racoon_log_free
+#define log_add _bsd_racoon_log_add
#define log_close _bsd_racoon_log_close
+#define log_free _bsd_racoon_log_free
+#define log_open _bsd_racoon_log_open
+#define log_print _bsd_racoon_log_print
#define log_vaprint _bsd_racoon_log_vaprint
#define log_vprint _bsd_racoon_log_vprint
-#define log_print _bsd_racoon_log_print
-#define log_add _bsd_racoon_log_add
-#define log_open _bsd_racoon_log_open
/* main.c */
#define dump_config _bsd_racoon_dump_config
#define f_local _bsd_racoon_f_local
#define vflag _bsd_racoon_vflag
/* misc.c */
-#define timedelta _bsd_racoon_timedelta
+#define bit2str _bsd_racoon_bit2str
#define close_on_exec _bsd_racoon_close_on_exec
-#define getfsize _bsd_racoon_getfsize
#define debug_location _bsd_racoon_debug_location
-#define bit2str _bsd_racoon_bit2str
+#define getfsize _bsd_racoon_getfsize
#define racoon_hexdump _bsd_racoon_racoon_hexdump
-/* sha2.c */
-#define EVP_sha2_512 _bsd_racoon_EVP_sha2_512
-#define EVP_sha2_384 _bsd_racoon_EVP_sha2_384
-#define EVP_sha2_256 _bsd_racoon_EVP_sha2_256
+#define timedelta _bsd_racoon_timedelta
/* nattraversal.c */
#define isakmp_plist_append_natt_vids _bsd_racoon_isakmp_plist_append_natt_vids
+#define natt_compare_addr_hash _bsd_racoon_natt_compare_addr_hash
#define natt_enabled_in_rmconf _bsd_racoon_natt_enabled_in_rmconf
-#define natt_keepalive_remove _bsd_racoon_natt_keepalive_remove
-#define natt_keepalive_add_ph1 _bsd_racoon_natt_keepalive_add_ph1
+#define natt_fill_options _bsd_racoon_natt_fill_options
+#define natt_float_ports _bsd_racoon_natt_float_ports
+#define natt_handle_vendorid _bsd_racoon_natt_handle_vendorid
+#define natt_hash_addr _bsd_racoon_natt_hash_addr
#define natt_keepalive_add _bsd_racoon_natt_keepalive_add
+#define natt_keepalive_add_ph1 _bsd_racoon_natt_keepalive_add_ph1
#define natt_keepalive_init _bsd_racoon_natt_keepalive_init
-#define natt_handle_vendorid _bsd_racoon_natt_handle_vendorid
-#define natt_float_ports _bsd_racoon_natt_float_ports
-#define natt_fill_options _bsd_racoon_natt_fill_options
+#define natt_keepalive_remove _bsd_racoon_natt_keepalive_remove
#define natt_udp_encap _bsd_racoon_natt_udp_encap
-#define natt_compare_addr_hash _bsd_racoon_natt_compare_addr_hash
-#define natt_hash_addr _bsd_racoon_natt_hash_addr
#define natt_vendorid _bsd_racoon_natt_vendorid
/* oakley.c */
-#define dh_modp768 _bsd_racoon_dh_modp768
#define dh_modp1024 _bsd_racoon_dh_modp1024
#define dh_modp1536 _bsd_racoon_dh_modp1536
#define dh_modp2048 _bsd_racoon_dh_modp2048
#define dh_modp3072 _bsd_racoon_dh_modp3072
#define dh_modp4096 _bsd_racoon_dh_modp4096
#define dh_modp6144 _bsd_racoon_dh_modp6144
+#define dh_modp768 _bsd_racoon_dh_modp768
#define dh_modp8192 _bsd_racoon_dh_modp8192
-#define oakley_do_encrypt _bsd_racoon_oakley_do_encrypt
-#define oakley_do_decrypt _bsd_racoon_oakley_do_decrypt
-#define oakley_delivm _bsd_racoon_oakley_delivm
-#define oakley_newiv2 _bsd_racoon_oakley_newiv2
-#define oakley_newiv _bsd_racoon_oakley_newiv
-#define oakley_compute_enckey _bsd_racoon_oakley_compute_enckey
-#define oakley_skeyid_dae _bsd_racoon_oakley_skeyid_dae
-#define oakley_skeyid _bsd_racoon_oakley_skeyid
-#define oakley_needcr _bsd_racoon_oakley_needcr
-#define oakley_checkcr _bsd_racoon_oakley_checkcr
#define oakley_append_cr _bsd_racoon_oakley_append_cr
-#define oakley_savecr _bsd_racoon_oakley_savecr
-#define oakley_savecert _bsd_racoon_oakley_savecert
-#define oakley_getsign _bsd_racoon_oakley_getsign
-#define oakley_getmycert _bsd_racoon_oakley_getmycert
-#define oakley_validate_auth _bsd_racoon_oakley_validate_auth
-#define oakley_ph1hash_base_r _bsd_racoon_oakley_ph1hash_base_r
-#define oakley_ph1hash_base_i _bsd_racoon_oakley_ph1hash_base_i
-#define oakley_ph1hash_common _bsd_racoon_oakley_ph1hash_common
+#define oakley_checkcr _bsd_racoon_oakley_checkcr
+#define oakley_compute_enckey _bsd_racoon_oakley_compute_enckey
#define oakley_compute_hash1 _bsd_racoon_oakley_compute_hash1
#define oakley_compute_hash3 _bsd_racoon_oakley_compute_hash3
#define oakley_compute_keymat _bsd_racoon_oakley_compute_keymat
-#define oakley_hash _bsd_racoon_oakley_hash
-#define oakley_prf _bsd_racoon_oakley_prf
-#define oakley_setdhgroup _bsd_racoon_oakley_setdhgroup
-#define oakley_dh_generate _bsd_racoon_oakley_dh_generate
+#define oakley_delivm _bsd_racoon_oakley_delivm
#define oakley_dh_compute _bsd_racoon_oakley_dh_compute
+#define oakley_dh_generate _bsd_racoon_oakley_dh_generate
#define oakley_dhgrp_free _bsd_racoon_oakley_dhgrp_free
#define oakley_dhinit _bsd_racoon_oakley_dhinit
-#define oakley_get_defaultlifetime _bsd_racoon_oakley_get_defaultlifetime
+#define oakley_do_decrypt _bsd_racoon_oakley_do_decrypt
+#define oakley_do_encrypt _bsd_racoon_oakley_do_encrypt
#define oakley_get_certtype _bsd_racoon_oakley_get_certtype
+#define oakley_get_defaultlifetime _bsd_racoon_oakley_get_defaultlifetime
+#define oakley_getmycert _bsd_racoon_oakley_getmycert
+#define oakley_getsign _bsd_racoon_oakley_getsign
+#define oakley_hash _bsd_racoon_oakley_hash
+#define oakley_needcr _bsd_racoon_oakley_needcr
+#define oakley_newiv _bsd_racoon_oakley_newiv
+#define oakley_newiv2 _bsd_racoon_oakley_newiv2
+#define oakley_ph1hash_base_i _bsd_racoon_oakley_ph1hash_base_i
+#define oakley_ph1hash_base_r _bsd_racoon_oakley_ph1hash_base_r
+#define oakley_ph1hash_common _bsd_racoon_oakley_ph1hash_common
+#define oakley_prf _bsd_racoon_oakley_prf
+#define oakley_savecert _bsd_racoon_oakley_savecert
+#define oakley_savecr _bsd_racoon_oakley_savecr
+#define oakley_setdhgroup _bsd_racoon_oakley_setdhgroup
+#define oakley_skeyid _bsd_racoon_oakley_skeyid
+#define oakley_skeyid_dae _bsd_racoon_oakley_skeyid_dae
+#define oakley_validate_auth _bsd_racoon_oakley_validate_auth
/* pfkey.c */
-#define sadbsecas2str _bsd_racoon_sadbsecas2str
-#define pk_getseq _bsd_racoon_pk_getseq
+#define ipsecdoi2pfkey_mode _bsd_racoon_ipsecdoi2pfkey_mode
+#define ipsecdoi2pfkey_proto _bsd_racoon_ipsecdoi2pfkey_proto
+#define pfkey2ipsecdoi_mode _bsd_racoon_pfkey2ipsecdoi_mode
+#define pfkey2ipsecdoi_proto _bsd_racoon_pfkey2ipsecdoi_proto
+#define pfkey_convertfromipsecdoi _bsd_racoon_pfkey_convertfromipsecdoi
+#define pfkey_dump_sadb _bsd_racoon_pfkey_dump_sadb
+#define pfkey_init _bsd_racoon_pfkey_init
+#define pfkey_reload _bsd_racoon_pfkey_reload
#define pk_checkalg _bsd_racoon_pk_checkalg
+#define pk_fixup_sa_addresses _bsd_racoon_pk_fixup_sa_addresses
+#define pk_getseq _bsd_racoon_pk_getseq
+#define pk_sendadd _bsd_racoon_pk_sendadd
#define pk_sendeacquire _bsd_racoon_pk_sendeacquire
-#define pk_sendspddelete _bsd_racoon_pk_sendspddelete
+#define pk_sendgetspi _bsd_racoon_pk_sendgetspi
#define pk_sendspdadd2 _bsd_racoon_pk_sendspdadd2
+#define pk_sendspddelete _bsd_racoon_pk_sendspddelete
#define pk_sendspdupdate2 _bsd_racoon_pk_sendspdupdate2
-#define pk_sendadd _bsd_racoon_pk_sendadd
#define pk_sendupdate _bsd_racoon_pk_sendupdate
-#define pk_sendgetspi _bsd_racoon_pk_sendgetspi
-#define pfkey_convertfromipsecdoi _bsd_racoon_pfkey_convertfromipsecdoi
-#define pk_fixup_sa_addresses _bsd_racoon_pk_fixup_sa_addresses
-#define pfkey2ipsecdoi_mode _bsd_racoon_pfkey2ipsecdoi_mode
-#define ipsecdoi2pfkey_mode _bsd_racoon_ipsecdoi2pfkey_mode
-#define pfkey2ipsecdoi_proto _bsd_racoon_pfkey2ipsecdoi_proto
-#define ipsecdoi2pfkey_proto _bsd_racoon_ipsecdoi2pfkey_proto
-#define pfkey_reload _bsd_racoon_pfkey_reload
-#define pfkey_init _bsd_racoon_pfkey_init
-#define pfkey_dump_sadb _bsd_racoon_pfkey_dump_sadb
+#define sadbsecas2str _bsd_racoon_sadbsecas2str
/* plog.c */
-#define pname _bsd_racoon_pname
-#define loglevel _bsd_racoon_loglevel
-#define f_foreground _bsd_racoon_f_foreground
-#define print_location _bsd_racoon_print_location
+#define _plog _bsd_racoon__plog
#define binsanitize _bsd_racoon_binsanitize
-#define plogset _bsd_racoon_plogset
-#define ploginit _bsd_racoon_ploginit
+#define f_foreground _bsd_racoon_f_foreground
+#define loglevel _bsd_racoon_loglevel
#define plogdump _bsd_racoon_plogdump
+#define ploginit _bsd_racoon_ploginit
+#define plogset _bsd_racoon_plogset
#define plogv _bsd_racoon_plogv
-#define _plog _bsd_racoon__plog
+#define pname _bsd_racoon_pname
+#define print_location _bsd_racoon_print_location
/* policy.c */
-#define spidx2str _bsd_racoon_spidx2str
-#define newipsecreq _bsd_racoon_newipsecreq
-#define initsp _bsd_racoon_initsp
+#define cmpspidxstrict _bsd_racoon_cmpspidxstrict
+#define cmpspidxwild _bsd_racoon_cmpspidxwild
+#define delsp _bsd_racoon_delsp
+#define delsp_bothdir _bsd_racoon_delsp_bothdir
#define flushsp _bsd_racoon_flushsp
-#define remsp _bsd_racoon_remsp
+#define getsp _bsd_racoon_getsp
+#define getsp_r _bsd_racoon_getsp_r
+#define getspbyspid _bsd_racoon_getspbyspid
+#define initsp _bsd_racoon_initsp
#define inssp _bsd_racoon_inssp
-#define delsp_bothdir _bsd_racoon_delsp_bothdir
-#define delsp _bsd_racoon_delsp
+#define newipsecreq _bsd_racoon_newipsecreq
#define newsp _bsd_racoon_newsp
-#define cmpspidxwild _bsd_racoon_cmpspidxwild
-#define cmpspidxstrict _bsd_racoon_cmpspidxstrict
-#define getspbyspid _bsd_racoon_getspbyspid
-#define getsp_r _bsd_racoon_getsp_r
-#define getsp _bsd_racoon_getsp
+#define remsp _bsd_racoon_remsp
+#define spidx2str _bsd_racoon_spidx2str
/* privsep.c */
-#define privsep_setsockopt _bsd_racoon_privsep_setsockopt
#define privsep_bind _bsd_racoon_privsep_bind
-#define privsep_socket _bsd_racoon_privsep_socket
-#define privsep_getpsk _bsd_racoon_privsep_getpsk
-#define privsep_script_exec _bsd_racoon_privsep_script_exec
#define privsep_eay_get_pkcs1privkey _bsd_racoon_privsep_eay_get_pkcs1privkey
+#define privsep_getpsk _bsd_racoon_privsep_getpsk
#define privsep_init _bsd_racoon_privsep_init
+#define privsep_script_exec _bsd_racoon_privsep_script_exec
+#define privsep_setsockopt _bsd_racoon_privsep_setsockopt
+#define privsep_socket _bsd_racoon_privsep_socket
/* proposal.c */
-#define set_proposal_from_proposal _bsd_racoon_set_proposal_from_proposal
-#define set_proposal_from_policy _bsd_racoon_set_proposal_from_policy
-#define print_proppair _bsd_racoon_print_proppair
-#define print_proppair0 _bsd_racoon_print_proppair0
-#define printsatrns _bsd_racoon_printsatrns
-#define printsaproto _bsd_racoon_printsaproto
-#define printsaprop0 _bsd_racoon_printsaprop0
-#define printsaprop _bsd_racoon_printsaprop
-#define flushsatrns _bsd_racoon_flushsatrns
-#define flushsaproto _bsd_racoon_flushsaproto
-#define flushsaprop _bsd_racoon_flushsaprop
#define aproppair2saprop _bsd_racoon_aproppair2saprop
-#define set_satrnsbysainfo _bsd_racoon_set_satrnsbysainfo
-#define cmpsatrns _bsd_racoon_cmpsatrns
#define cmpsaprop _bsd_racoon_cmpsaprop
#define cmpsaprop_alloc _bsd_racoon_cmpsaprop_alloc
-#define inssatrns _bsd_racoon_inssatrns
-#define newsatrns _bsd_racoon_newsatrns
-#define inssaprotorev _bsd_racoon_inssaprotorev
-#define inssaproto _bsd_racoon_inssaproto
+#define cmpsatrns _bsd_racoon_cmpsatrns
+#define flushsaprop _bsd_racoon_flushsaprop
+#define flushsaproto _bsd_racoon_flushsaproto
+#define flushsatrns _bsd_racoon_flushsatrns
#define inssaprop _bsd_racoon_inssaprop
-#define newsaproto _bsd_racoon_newsaproto
+#define inssaproto _bsd_racoon_inssaproto
+#define inssaprotorev _bsd_racoon_inssaprotorev
+#define inssatrns _bsd_racoon_inssatrns
#define newsaprop _bsd_racoon_newsaprop
+#define newsaproto _bsd_racoon_newsaproto
+#define newsatrns _bsd_racoon_newsatrns
+#define print_proppair _bsd_racoon_print_proppair
+#define print_proppair0 _bsd_racoon_print_proppair0
+#define printsaprop _bsd_racoon_printsaprop
+#define printsaprop0 _bsd_racoon_printsaprop0
+#define printsaproto _bsd_racoon_printsaproto
+#define printsatrns _bsd_racoon_printsatrns
+#define set_proposal_from_policy _bsd_racoon_set_proposal_from_policy
+#define set_proposal_from_proposal _bsd_racoon_set_proposal_from_proposal
+#define set_satrnsbysainfo _bsd_racoon_set_satrnsbysainfo
/* prsa_par_wrapper.c */
-#define prsa_cur_lineno _bsd_racoon_prsa_cur_lineno
#define prsa_cur_fname _bsd_racoon_prsa_cur_fname
+#define prsa_cur_lineno _bsd_racoon_prsa_cur_lineno
#define prsa_cur_list _bsd_racoon_prsa_cur_list
#define prsa_cur_type _bsd_racoon_prsa_cur_type
+#define prsa_parse_file _bsd_racoon_prsa_parse_file
+#define prsawarning _bsd_racoon_prsawarning
+#define racoonprsachar _bsd_racoon_racoonprsachar
#define racoonprsadebug _bsd_racoon_racoonprsadebug
-#define racoonprsanerrs _bsd_racoon_racoonprsanerrs
#define racoonprsaerrflag _bsd_racoon_racoonprsaerrflag
-#define racoonprsachar _bsd_racoon_racoonprsachar
-#define racoonprsaval _bsd_racoon_racoonprsaval
+#define racoonprsaerror _bsd_racoon_racoonprsaerror
#define racoonprsalval _bsd_racoon_racoonprsalval
+#define racoonprsanerrs _bsd_racoon_racoonprsanerrs
#define racoonprsaparse _bsd_racoon_racoonprsaparse
-#define prsa_parse_file _bsd_racoon_prsa_parse_file
+#define racoonprsaval _bsd_racoon_racoonprsaval
#define racoonprsawrap _bsd_racoon_racoonprsawrap
-#define prsawarning _bsd_racoon_prsawarning
-#define racoonprsaerror _bsd_racoon_racoonprsaerror
/* prsa_tok_wrapper.c */
-#define racoonprsaleng _bsd_racoon_racoonprsaleng
-#define racoonprsain _bsd_racoon_racoonprsain
-#define racoonprsaout _bsd_racoon_racoonprsaout
-#define racoonprsalineno _bsd_racoon_racoonprsalineno
+#define racoonprsa_create_buffer _bsd_racoon_racoonprsa_create_buffer
+#define racoonprsa_delete_buffer _bsd_racoon_racoonprsa_delete_buffer
#define racoonprsa_flex_debug _bsd_racoon_racoonprsa_flex_debug
-#define racoonprsatext _bsd_racoon_racoonprsatext
-#define racoonprsafree _bsd_racoon_racoonprsafree
-#define racoonprsarealloc _bsd_racoon_racoonprsarealloc
+#define racoonprsa_flush_buffer _bsd_racoon_racoonprsa_flush_buffer
+#define racoonprsa_scan_buffer _bsd_racoon_racoonprsa_scan_buffer
+#define racoonprsa_scan_bytes _bsd_racoon_racoonprsa_scan_bytes
+#define racoonprsa_scan_string _bsd_racoon_racoonprsa_scan_string
+#define racoonprsa_switch_to_buffer _bsd_racoon_racoonprsa_switch_to_buffer
#define racoonprsaalloc _bsd_racoon_racoonprsaalloc
-#define racoonprsalex_destroy _bsd_racoon_racoonprsalex_destroy
-#define racoonprsaset_debug _bsd_racoon_racoonprsaset_debug
+#define racoonprsafree _bsd_racoon_racoonprsafree
#define racoonprsaget_debug _bsd_racoon_racoonprsaget_debug
-#define racoonprsaset_out _bsd_racoon_racoonprsaset_out
-#define racoonprsaset_in _bsd_racoon_racoonprsaset_in
-#define racoonprsaset_lineno _bsd_racoon_racoonprsaset_lineno
-#define racoonprsaget_text _bsd_racoon_racoonprsaget_text
-#define racoonprsaget_leng _bsd_racoon_racoonprsaget_leng
-#define racoonprsaget_out _bsd_racoon_racoonprsaget_out
#define racoonprsaget_in _bsd_racoon_racoonprsaget_in
+#define racoonprsaget_leng _bsd_racoon_racoonprsaget_leng
#define racoonprsaget_lineno _bsd_racoon_racoonprsaget_lineno
-#define racoonprsa_scan_bytes _bsd_racoon_racoonprsa_scan_bytes
-#define racoonprsa_scan_string _bsd_racoon_racoonprsa_scan_string
-#define racoonprsa_scan_buffer _bsd_racoon_racoonprsa_scan_buffer
+#define racoonprsaget_out _bsd_racoon_racoonprsaget_out
+#define racoonprsaget_text _bsd_racoon_racoonprsaget_text
+#define racoonprsain _bsd_racoon_racoonprsain
+#define racoonprsaleng _bsd_racoon_racoonprsaleng
+#define racoonprsalex _bsd_racoon_racoonprsalex
+#define racoonprsalex_destroy _bsd_racoon_racoonprsalex_destroy
+#define racoonprsalineno _bsd_racoon_racoonprsalineno
+#define racoonprsaout _bsd_racoon_racoonprsaout
#define racoonprsapop_buffer_state _bsd_racoon_racoonprsapop_buffer_state
#define racoonprsapush_buffer_state _bsd_racoon_racoonprsapush_buffer_state
-#define racoonprsa_flush_buffer _bsd_racoon_racoonprsa_flush_buffer
-#define racoonprsa_delete_buffer _bsd_racoon_racoonprsa_delete_buffer
-#define racoonprsa_create_buffer _bsd_racoon_racoonprsa_create_buffer
-#define racoonprsa_switch_to_buffer _bsd_racoon_racoonprsa_switch_to_buffer
+#define racoonprsarealloc _bsd_racoon_racoonprsarealloc
#define racoonprsarestart _bsd_racoon_racoonprsarestart
-#define racoonprsalex _bsd_racoon_racoonprsalex
+#define racoonprsaset_debug _bsd_racoon_racoonprsaset_debug
+#define racoonprsaset_in _bsd_racoon_racoonprsaset_in
+#define racoonprsaset_lineno _bsd_racoon_racoonprsaset_lineno
+#define racoonprsaset_out _bsd_racoon_racoonprsaset_out
+#define racoonprsatext _bsd_racoon_racoonprsatext
/* remoteconf.c */
-#define script_names _bsd_racoon_script_names
-#define checkisakmpsa _bsd_racoon_checkisakmpsa
-#define dupisakmpsa _bsd_racoon_dupisakmpsa
-#define script_path_add _bsd_racoon_script_path_add
-#define newidspec _bsd_racoon_newidspec
-#define dumprmconf _bsd_racoon_dumprmconf
-#define insisakmpsa _bsd_racoon_insisakmpsa
-#define newisakmpsa _bsd_racoon_newisakmpsa
#define check_etypeok _bsd_racoon_check_etypeok
-#define rmconf_finish_reload _bsd_racoon_rmconf_finish_reload
-#define rmconf_start_reload _bsd_racoon_rmconf_start_reload
-#define initrmconf _bsd_racoon_initrmconf
-#define flushrmconf _bsd_racoon_flushrmconf
-#define remrmconf _bsd_racoon_remrmconf
-#define insrmconf _bsd_racoon_insrmconf
+#define checkisakmpsa _bsd_racoon_checkisakmpsa
#define deletypes _bsd_racoon_deletypes
-#define dupetypes _bsd_racoon_dupetypes
#define delisakmpsa _bsd_racoon_delisakmpsa
#define delrmconf _bsd_racoon_delrmconf
+#define dumprmconf _bsd_racoon_dumprmconf
+#define dupetypes _bsd_racoon_dupetypes
+#define dupidvl _bsd_racoon_dupidvl
+#define dupisakmpsa _bsd_racoon_dupisakmpsa
#define duprmconf_finish _bsd_racoon_duprmconf_finish
#define duprmconf_shallow _bsd_racoon_duprmconf_shallow
#define duprsa _bsd_racoon_duprsa
-#define dupidvl _bsd_racoon_dupidvl
-#define newrmconf _bsd_racoon_newrmconf
+#define enumrmconf _bsd_racoon_enumrmconf
+#define flushrmconf _bsd_racoon_flushrmconf
+#define getrmconf _bsd_racoon_getrmconf
#define getrmconf_by_name _bsd_racoon_getrmconf_by_name
#define getrmconf_by_ph1 _bsd_racoon_getrmconf_by_ph1
-#define getrmconf _bsd_racoon_getrmconf
-#define enumrmconf _bsd_racoon_enumrmconf
-#define rmconf_selector_from_ph1 _bsd_racoon_rmconf_selector_from_ph1
+#define initrmconf _bsd_racoon_initrmconf
+#define insisakmpsa _bsd_racoon_insisakmpsa
+#define insrmconf _bsd_racoon_insrmconf
+#define newidspec _bsd_racoon_newidspec
+#define newisakmpsa _bsd_racoon_newisakmpsa
+#define newrmconf _bsd_racoon_newrmconf
+#define remrmconf _bsd_racoon_remrmconf
+#define rmconf_finish_reload _bsd_racoon_rmconf_finish_reload
#define rmconf_match_identity _bsd_racoon_rmconf_match_identity
+#define rmconf_selector_from_ph1 _bsd_racoon_rmconf_selector_from_ph1
+#define rmconf_start_reload _bsd_racoon_rmconf_start_reload
+#define script_names _bsd_racoon_script_names
+#define script_path_add _bsd_racoon_script_path_add
/* rsalist.c */
-#define rsa_try_check_rsasign _bsd_racoon_rsa_try_check_rsasign
-#define rsa_parse_file _bsd_racoon_rsa_parse_file
-#define rsa_lookup_keys _bsd_racoon_rsa_lookup_keys
-#define rsa_list_count _bsd_racoon_rsa_list_count
#define rsa_key_dump _bsd_racoon_rsa_key_dump
-#define rsa_key_free _bsd_racoon_rsa_key_free
#define rsa_key_dup _bsd_racoon_rsa_key_dup
+#define rsa_key_free _bsd_racoon_rsa_key_free
#define rsa_key_insert _bsd_racoon_rsa_key_insert
+#define rsa_list_count _bsd_racoon_rsa_list_count
+#define rsa_lookup_keys _bsd_racoon_rsa_lookup_keys
+#define rsa_parse_file _bsd_racoon_rsa_parse_file
+#define rsa_try_check_rsasign _bsd_racoon_rsa_try_check_rsasign
/* safefile.c */
#define safefile _bsd_racoon_safefile
/* sainfo.c */
-#define save_sainfotree_restore _bsd_racoon_save_sainfotree_restore
-#define sainfo_finish_reload _bsd_racoon_sainfo_finish_reload
-#define sainfo_start_reload _bsd_racoon_sainfo_start_reload
-#define sainfo2str _bsd_racoon_sainfo2str
-#define inssainfoalg _bsd_racoon_inssainfoalg
+#define delsainfo _bsd_racoon_delsainfo
#define delsainfoalg _bsd_racoon_delsainfoalg
-#define newsainfoalg _bsd_racoon_newsainfoalg
-#define initsainfo _bsd_racoon_initsainfo
#define flushsainfo _bsd_racoon_flushsainfo
-#define remsainfo _bsd_racoon_remsainfo
+#define getsainfo _bsd_racoon_getsainfo
+#define initsainfo _bsd_racoon_initsainfo
#define inssainfo _bsd_racoon_inssainfo
-#define prisainfo _bsd_racoon_prisainfo
-#define delsainfo _bsd_racoon_delsainfo
+#define inssainfoalg _bsd_racoon_inssainfoalg
#define newsainfo _bsd_racoon_newsainfo
-#define getsainfo _bsd_racoon_getsainfo
+#define newsainfoalg _bsd_racoon_newsainfoalg
+#define prisainfo _bsd_racoon_prisainfo
+#define remsainfo _bsd_racoon_remsainfo
+#define sainfo2str _bsd_racoon_sainfo2str
+#define sainfo_finish_reload _bsd_racoon_sainfo_finish_reload
+#define sainfo_start_reload _bsd_racoon_sainfo_start_reload
+#define save_sainfotree_restore _bsd_racoon_save_sainfotree_restore
/* schedule.c */
-#define sched_init _bsd_racoon_sched_init
-#define sched_dump _bsd_racoon_sched_dump
#define sched_cancel _bsd_racoon_sched_cancel
+#define sched_dump _bsd_racoon_sched_dump
+#define sched_get_monotonic_time _bsd_racoon_sched_get_monotonic_time
+#define sched_init _bsd_racoon_sched_init
+#define sched_monotonic_to_time_t _bsd_racoon_sched_monotonic_to_time_t
#define sched_schedule _bsd_racoon_sched_schedule
#define schedular _bsd_racoon_schedular
-#define sched_monotonic_to_time_t _bsd_racoon_sched_monotonic_to_time_t
-#define sched_get_monotonic_time _bsd_racoon_sched_get_monotonic_time
/* session.c */
-#define signal_handler _bsd_racoon_signal_handler
+#define monitor_fd _bsd_racoon_monitor_fd
#define session _bsd_racoon_session
+#define signal_handler _bsd_racoon_signal_handler
#define unmonitor_fd _bsd_racoon_unmonitor_fd
-#define monitor_fd _bsd_racoon_monitor_fd
/* sockmisc.c */
-#define set_port _bsd_racoon_set_port
-#define get_port_ptr _bsd_racoon_get_port_ptr
+#define cmpsaddr _bsd_racoon_cmpsaddr
+#define dupsaddr _bsd_racoon_dupsaddr
#define extract_port _bsd_racoon_extract_port
-#define naddr_score _bsd_racoon_naddr_score
+#define get_port_ptr _bsd_racoon_get_port_ptr
+#define getlocaladdr _bsd_racoon_getlocaladdr
#define mask_sockaddr _bsd_racoon_mask_sockaddr
-#define str2saddr _bsd_racoon_str2saddr
-#define saddr2str_fromto _bsd_racoon_saddr2str_fromto
-#define naddrwop2str_fromto _bsd_racoon_naddrwop2str_fromto
+#define naddr_score _bsd_racoon_naddr_score
#define naddrwop2str _bsd_racoon_naddrwop2str
-#define saddrwop2str _bsd_racoon_saddrwop2str
-#define saddr2str _bsd_racoon_saddr2str
-#define dupsaddr _bsd_racoon_dupsaddr
+#define naddrwop2str_fromto _bsd_racoon_naddrwop2str_fromto
#define newsaddr _bsd_racoon_newsaddr
-#define setsockopt_bypass _bsd_racoon_setsockopt_bypass
-#define sendfromto _bsd_racoon_sendfromto
#define recvfromto _bsd_racoon_recvfromto
-#define getlocaladdr _bsd_racoon_getlocaladdr
-#define cmpsaddr _bsd_racoon_cmpsaddr
+#define saddr2str _bsd_racoon_saddr2str
+#define saddr2str_fromto _bsd_racoon_saddr2str_fromto
+#define saddrwop2str _bsd_racoon_saddrwop2str
+#define sendfromto _bsd_racoon_sendfromto
+#define set_port _bsd_racoon_set_port
+#define setsockopt_bypass _bsd_racoon_setsockopt_bypass
+#define str2saddr _bsd_racoon_str2saddr
/* str2val.c */
#define str2val _bsd_racoon_str2val
#define val2str _bsd_racoon_val2str
/* strnames.c */
-#define s_switch _bsd_racoon_s_switch
-#define s_idtype _bsd_racoon_s_idtype
-#define s_etype _bsd_racoon_s_etype
-#define s_doi _bsd_racoon_s_doi
-#define s_proto _bsd_racoon_s_proto
-#define s_direction _bsd_racoon_s_direction
-#define s_pfkey_satype _bsd_racoon_s_pfkey_satype
-#define s_pfkey_type _bsd_racoon_s_pfkey_type
-#define s_algtype _bsd_racoon_s_algtype
+#define num2str _bsd_racoon_num2str
#define s_algclass _bsd_racoon_s_algclass
-#define s_ipsec_level _bsd_racoon_s_ipsec_level
-#define s_oakley_attr_v _bsd_racoon_s_oakley_attr_v
-#define s_attr_isakmp_ltype _bsd_racoon_s_attr_isakmp_ltype
-#define s_attr_isakmp_group _bsd_racoon_s_attr_isakmp_group
+#define s_algtype _bsd_racoon_s_algtype
#define s_attr_isakmp_desc _bsd_racoon_s_attr_isakmp_desc
-#define s_oakley_attr_method _bsd_racoon_s_oakley_attr_method
-#define s_attr_isakmp_hash _bsd_racoon_s_attr_isakmp_hash
#define s_attr_isakmp_enc _bsd_racoon_s_attr_isakmp_enc
-#define s_oakley_attr _bsd_racoon_s_oakley_attr
-#define s_ipsecdoi_ident _bsd_racoon_s_ipsecdoi_ident
+#define s_attr_isakmp_group _bsd_racoon_s_attr_isakmp_group
+#define s_attr_isakmp_hash _bsd_racoon_s_attr_isakmp_hash
+#define s_attr_isakmp_ltype _bsd_racoon_s_attr_isakmp_ltype
+#define s_direction _bsd_racoon_s_direction
+#define s_doi _bsd_racoon_s_doi
+#define s_etype _bsd_racoon_s_etype
+#define s_idtype _bsd_racoon_s_idtype
+#define s_ipsec_level _bsd_racoon_s_ipsec_level
+#define s_ipsecdoi_attr _bsd_racoon_s_ipsecdoi_attr
#define s_ipsecdoi_attr_v _bsd_racoon_s_ipsecdoi_attr_v
#define s_ipsecdoi_auth _bsd_racoon_s_ipsecdoi_auth
#define s_ipsecdoi_encmode _bsd_racoon_s_ipsecdoi_encmode
+#define s_ipsecdoi_ident _bsd_racoon_s_ipsecdoi_ident
#define s_ipsecdoi_ltype _bsd_racoon_s_ipsecdoi_ltype
-#define s_ipsecdoi_attr _bsd_racoon_s_ipsecdoi_attr
+#define s_ipsecdoi_proto _bsd_racoon_s_ipsecdoi_proto
#define s_ipsecdoi_trns _bsd_racoon_s_ipsecdoi_trns
-#define s_ipsecdoi_trns_ipcomp _bsd_racoon_s_ipsecdoi_trns_ipcomp
-#define s_ipsecdoi_trns_esp _bsd_racoon_s_ipsecdoi_trns_esp
#define s_ipsecdoi_trns_ah _bsd_racoon_s_ipsecdoi_trns_ah
+#define s_ipsecdoi_trns_esp _bsd_racoon_s_ipsecdoi_trns_esp
+#define s_ipsecdoi_trns_ipcomp _bsd_racoon_s_ipsecdoi_trns_ipcomp
#define s_ipsecdoi_trns_isakmp _bsd_racoon_s_ipsecdoi_trns_isakmp
-#define s_ipsecdoi_proto _bsd_racoon_s_ipsecdoi_proto
-#define s_isakmp_nptype _bsd_racoon_s_isakmp_nptype
-#define s_isakmp_notify_msg _bsd_racoon_s_isakmp_notify_msg
-#define s_isakmp_etype _bsd_racoon_s_isakmp_etype
#define s_isakmp_certtype _bsd_racoon_s_isakmp_certtype
+#define s_isakmp_etype _bsd_racoon_s_isakmp_etype
+#define s_isakmp_notify_msg _bsd_racoon_s_isakmp_notify_msg
+#define s_isakmp_nptype _bsd_racoon_s_isakmp_nptype
#define s_isakmp_state _bsd_racoon_s_isakmp_state
-#define num2str _bsd_racoon_num2str
+#define s_oakley_attr _bsd_racoon_s_oakley_attr
+#define s_oakley_attr_method _bsd_racoon_s_oakley_attr_method
+#define s_oakley_attr_v _bsd_racoon_s_oakley_attr_v
+#define s_pfkey_satype _bsd_racoon_s_pfkey_satype
+#define s_pfkey_type _bsd_racoon_s_pfkey_type
+#define s_proto _bsd_racoon_s_proto
+#define s_switch _bsd_racoon_s_switch
/* vendorid.c */
+#define compute_vendorids _bsd_racoon_compute_vendorids
#define handle_vendorid _bsd_racoon_handle_vendorid
#define set_vendorid _bsd_racoon_set_vendorid
-#define compute_vendorids _bsd_racoon_compute_vendorids
#define vid_string_by_id _bsd_racoon_vid_string_by_id
/* vmbuf.c */
#define vdup _bsd_racoon_vdup
#define vfree _bsd_racoon_vfree
-#define vrealloc _bsd_racoon_vrealloc
#define vmalloc _bsd_racoon_vmalloc
+#define vrealloc _bsd_racoon_vrealloc
diff --git a/ipsec-tools/src/racoon/rtems-bsd-racoon-plog-data.h b/ipsec-tools/src/racoon/rtems-bsd-racoon-plog-data.h
index cebd3ae4..33c300f8 100644
--- a/ipsec-tools/src/racoon/rtems-bsd-racoon-plog-data.h
+++ b/ipsec-tools/src/racoon/rtems-bsd-racoon-plog-data.h
@@ -2,6 +2,6 @@
#include <rtems/linkersets.h>
#include "rtems-bsd-racoon-data.h"
/* plog.c */
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct log *logp);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static char *logfile);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct log *logp);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct plogtags ptab[]);
diff --git a/ipsec-tools/src/racoon/rtems-bsd-racoon-prsa_tok_wrapper-data.h b/ipsec-tools/src/racoon/rtems-bsd-racoon-prsa_tok_wrapper-data.h
index e40f4cf4..2ddd9823 100644
--- a/ipsec-tools/src/racoon/rtems-bsd-racoon-prsa_tok_wrapper-data.h
+++ b/ipsec-tools/src/racoon/rtems-bsd-racoon-prsa_tok_wrapper-data.h
@@ -2,15 +2,15 @@
#include <rtems/linkersets.h>
#include "rtems-bsd-racoon-data.h"
/* prsa_tok_wrapper.c */
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static size_t yy_buffer_stack_top);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static size_t yy_buffer_stack_max);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static YY_BUFFER_STATE *yy_buffer_stack);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static char yy_hold_char);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static yy_size_t yy_n_chars);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, extern yy_size_t racoonprsaleng);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static YY_BUFFER_STATE *yy_buffer_stack);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static char *yy_c_buf_p);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static char *yy_last_accepting_cpos);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static char yy_hold_char);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int yy_did_buffer_switch_on_eof);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int yy_init);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int yy_start);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int yy_did_buffer_switch_on_eof);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static size_t yy_buffer_stack_max);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static size_t yy_buffer_stack_top);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static yy_size_t yy_n_chars);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static yy_state_type yy_last_accepting_state);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static char *yy_last_accepting_cpos);
diff --git a/ipsec-tools/src/racoon/rtems-bsd-racoon-session-data.h b/ipsec-tools/src/racoon/rtems-bsd-racoon-session-data.h
index 44f60e2f..9a1b03f1 100644
--- a/ipsec-tools/src/racoon/rtems-bsd-racoon-session-data.h
+++ b/ipsec-tools/src/racoon/rtems-bsd-racoon-session-data.h
@@ -2,11 +2,11 @@
#include <rtems/linkersets.h>
#include "rtems-bsd-racoon-data.h"
/* session.c */
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static _types_fd_set preset_mask);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static _types_fd_set active_mask);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct fd_monitor fd_monitors[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct fd_monitor_list fd_monitor_tree[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static _types_fd_set preset_mask);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int nfds);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int signals[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static sig_atomic_t volatile volatile sigreq[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct fd_monitor fd_monitors[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct fd_monitor_list fd_monitor_tree[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct sched scflushsa);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int signals[]);
diff --git a/ipsec-tools/src/racoon/rtems-bsd-racoon-strnames-data.h b/ipsec-tools/src/racoon/rtems-bsd-racoon-strnames-data.h
index cdd5b3df..92d672e3 100644
--- a/ipsec-tools/src/racoon/rtems-bsd-racoon-strnames-data.h
+++ b/ipsec-tools/src/racoon/rtems-bsd-racoon-strnames-data.h
@@ -2,29 +2,29 @@
#include <rtems/linkersets.h>
#include "rtems-bsd-racoon-data.h"
/* strnames.c */
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_isakmp_certtype[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_isakmp_etype[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_isakmp_notify_msg[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_isakmp_nptype[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_ipsecdoi_proto[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_ipsecdoi_trns_isakmp[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_ipsecdoi_trns_ah[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_ipsecdoi_trns_esp[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_ipsecdoi_trns_ipcomp[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_algclass[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_attr_ipsec[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_attr_ipsec_ltype[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_attr_ipsec_encmode[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_attr_ipsec_auth[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_ipsecdoi_ident[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_oakley_attr[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_attr_isakmp_enc[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_attr_isakmp_hash[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_attr_isakmp_method[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_attr_ipsec_encmode[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_attr_ipsec_ltype[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_attr_isakmp_desc[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_attr_isakmp_enc[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_attr_isakmp_group[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_attr_isakmp_hash[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_attr_isakmp_ltype[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_attr_isakmp_method[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_direction[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_ipsec_level[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_algclass[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_pfkey_type[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_ipsecdoi_ident[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_ipsecdoi_proto[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_ipsecdoi_trns_ah[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_ipsecdoi_trns_esp[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_ipsecdoi_trns_ipcomp[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_ipsecdoi_trns_isakmp[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_isakmp_certtype[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_isakmp_etype[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_isakmp_notify_msg[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_isakmp_nptype[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_oakley_attr[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_pfkey_satype[]);
-RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_direction[]);
+RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct ksmap name_pfkey_type[]);
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);