denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'clang-fixes'

Browse Source 
Fixes some warnings raised when compiling with clang. Some are cosmetically,
others are worth to fix.

This prepares the Travis build for -Werror, which will force us to fix all
warnings raised by all compilers.
This commit is contained in:
Martin Willi
2014-05-16 15:45:41 +02:00
parent 0f000cdd6c 064fe9c963
commit 9612db648a
47 changed files with 191 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/hash_burn.c
+1 -2
View File
@@ -43,8 +43,7 @@ int main(int argc, char *argv[])
limit = atoi(argv[2]);
}
alg = enum_from_name(hash_algorithm_short_names, argv[1]);
if (alg == -1)
if (!enum_from_name(hash_algorithm_short_names, argv[1], &alg))
{
fprintf(stderr, "unknown hash algorthm: %s\n", argv[1]);
return 1;
src/charon-cmd/cmd/cmd_connection.c
+2 -3
View File
@@ -460,10 +460,9 @@ static void add_ts(private_cmd_connection_t *this,
*/
static void set_profile(private_cmd_connection_t *this, char *name)
{
int profile;
profile_t profile;
profile = enum_from_name(profile_names, name);
if (profile == -1)
if (!enum_from_name(profile_names, name, &profile))
{
DBG1(DBG_CFG, "unknown connection profile: %s", name);
exit(1);
src/conftest/hooks/add_notify.c
+1 -2
View File
@@ -73,8 +73,7 @@ METHOD(listener_t, message, bool,
type = atoi(this->type);
if (!type)
{
type = enum_from_name(notify_type_names, this->type);
if (type == -1)
if (!enum_from_name(notify_type_names, this->type, &type))
{
DBG1(DBG_CFG, "unknown notify: '%s', skipped", this->type);
return TRUE;
src/conftest/hooks/add_payload.c
+1 -2
View File
@@ -77,8 +77,7 @@ METHOD(listener_t, message, bool,
type = atoi(this->type);
if (!type)
{
type = enum_from_name(payload_type_short_names, this->type);
if (type == -1)
if (!enum_from_name(payload_type_short_names, this->type, &type))
{
DBG1(DBG_CFG, "unknown payload: '%s', skipped", this->type);
return TRUE;
src/conftest/hooks/custom_proposal.c
+1 -2
View File
@@ -79,8 +79,7 @@ static linked_list_t* load_proposals(private_custom_proposal_t *this,
type = strtoul(key, &end, 10);
if (end == key || errno)
{
type = enum_from_name(transform_type_names, key);
if (type == -1)
if (!enum_from_name(transform_type_names, key, &type))
{
DBG1(DBG_CFG, "unknown transform: '%s', skipped", key);
continue;
src/conftest/hooks/set_critical.c
+1 -2
View File
@@ -65,8 +65,7 @@ METHOD(listener_t, message, bool,
type = atoi(name);
if (!type)
{
type = enum_from_name(payload_type_short_names, name);
if (type == -1)
if (!enum_from_name(payload_type_short_names, name, &type))
{
DBG1(DBG_CFG, "invalid payload name '%s'", name);
break;
src/conftest/hooks/set_length.c
+1 -2
View File
@@ -63,8 +63,7 @@ METHOD(listener_t, message, bool,
type = atoi(this->type);
if (!type)
{
type = enum_from_name(payload_type_short_names, this->type);
if (type == -1)
if (!enum_from_name(payload_type_short_names, this->type, &type))
{
DBG1(DBG_CFG, "unknown payload: '%s', skipped", this->type);
return TRUE;
src/conftest/hooks/set_reserved.c
+1 -2
View File
@@ -181,8 +181,7 @@ METHOD(listener_t, message, bool,
type = atoi(name);
if (!type)
{
type = enum_from_name(payload_type_short_names, name);
if (type == -1)
if (!enum_from_name(payload_type_short_names, name, &type))
{
DBG1(DBG_CFG, "invalid payload name '%s'", name);
break;
src/conftest/hooks/unencrypted_notify.c
+1 -2
View File
@@ -68,8 +68,7 @@ METHOD(listener_t, ike_updown, bool,
type = atoi(this->type);
if (!type)
{
type = enum_from_name(notify_type_names, this->type);
if (type == -1)
if (!enum_from_name(notify_type_names, this->type, &type))
{
DBG1(DBG_CFG, "unknown notify: '%s', skipped", this->type);
return TRUE;
src/conftest/hooks/unsort_message.c
+1 -2
View File
@@ -69,8 +69,7 @@ METHOD(listener_t, message, bool,
order = enumerator_create_token(this->order, ", ", " ");
while (order->enumerate(order, &name))
{
type = enum_from_name(payload_type_short_names, name);
if (type != -1)
if (enum_from_name(payload_type_short_names, name, &type))
{
enumerator = list->create_enumerator(list);
while (enumerator->enumerate(enumerator, &payload))
src/libcharon/plugins/coupling/coupling_validator.c
+8 -2
View File
@@ -202,6 +202,7 @@ METHOD(coupling_validator_t, destroy, void,
coupling_validator_t *coupling_validator_create()
{
private_coupling_validator_t *this;
hash_algorithm_t alg;
char *path, *hash;
INIT(this,
@@ -219,8 +220,13 @@ coupling_validator_t *coupling_validator_create()
hash = lib->settings->get_str(lib->settings,
"%s.plugins.coupling.hash", "sha1", lib->ns);
this->hasher = lib->crypto->create_hasher(lib->crypto,
enum_from_name(hash_algorithm_short_names, hash));
if (!enum_from_name(hash_algorithm_short_names, hash, &alg))
{
DBG1(DBG_CFG, "unknown coupling hash algorithm: %s", hash);
destroy(this);
return NULL;
}
this->hasher = lib->crypto->create_hasher(lib->crypto, alg);
if (!this->hasher)
{
DBG1(DBG_CFG, "unsupported coupling hash algorithm: %s", hash);
src/libcharon/plugins/eap_peap/eap_peap_avp.c
-15
View File
@@ -25,8 +25,6 @@ static const chunk_t MS_AVP_Success = chunk_from_chars(
0x80, 0x03, 0x00, 0x02, 0x00, 0x01);
static const chunk_t MS_AVP_Failure = chunk_from_chars(
0x80, 0x03, 0x00, 0x02, 0x00, 0x02);
static const chunk_t MS_SoH_Request = chunk_from_chars(
0x00, 0x01, 0x37, 0x00, 0x00, 0x00, 0x21, 0x00, 0x02, 0x00, 0x00);
typedef struct private_eap_peap_avp_t private_eap_peap_avp_t;
@@ -64,19 +62,6 @@ METHOD(eap_peap_avp_t, build, void,
writer->write_uint8(writer, EAP_MSTLV);
avp_data = (pkt->code == EAP_SUCCESS) ? MS_AVP_Success : MS_AVP_Failure;
}
/**
* Still trying to form a correct MS SoH Request
*
else if (pkt->type == EAP_MSCHAPV2)
{
code = (this->is_server) ? EAP_REQUEST : EAP_RESPONSE;
writer->write_uint8(writer, code);
writer->write_uint8(writer, pkt->identifier);
writer->write_uint16(writer, 16);
writer->write_uint8(writer, EAP_EXPANDED);
avp_data = MS_SoH_Request;
}
*/
else
{
avp_data = chunk_skip(data, 4);
src/libcharon/plugins/eap_radius/eap_radius_forward.c
+1 -2
View File
@@ -362,8 +362,7 @@ static linked_list_t* parse_selector(char *selector)
vendor = atoi(token);
token = pos;
}
type = enum_from_name(radius_attribute_type_names, token);
if (type == -1)
if (!enum_from_name(radius_attribute_type_names, token, &type))
{
type = atoi(token);
}
src/libcharon/plugins/load_tester/load_tester_creds.c
+1 -3
View File
@@ -465,7 +465,6 @@ load_tester_creds_t *load_tester_creds_create()
.private = load_issuer_key(),
.ca = load_issuer_cert(),
.cas = linked_list_create(),
.digest = enum_from_name(hash_algorithm_short_names, digest),
.psk = shared_key_create(SHARED_IKE,
chunk_clone(chunk_create(psk, strlen(psk)))),
.pwd = shared_key_create(SHARED_EAP,
@@ -477,7 +476,7 @@ load_tester_creds_t *load_tester_creds_create()
this->cas->insert_last(this->cas, this->ca->get_ref(this->ca));
}
if (this->digest == -1)
if (!enum_from_name(hash_algorithm_short_names, digest, &this->digest))
{
DBG1(DBG_CFG, "invalid load-tester digest: '%s', using sha1", digest);
this->digest = HASH_SHA1;
@@ -487,4 +486,3 @@ load_tester_creds_t *load_tester_creds_create()
return &this->public;
}
src/libcharon/plugins/stroke/stroke_socket.c
+1 -2
View File
@@ -584,8 +584,7 @@ static void stroke_loglevel(private_stroke_socket_t *this,
}
else
{
group = enum_from_name(debug_names, msg->loglevel.type);
if ((int)group < 0)
if (!enum_from_name(debug_names, msg->loglevel.type, &group))
{
fprintf(out, "unknown type '%s'!\n", msg->loglevel.type);
return;
src/libcharon/plugins/vici/vici_query.c
+1 -2
View File
@@ -729,8 +729,7 @@ CALLBACK(list_certs, vici_message_t*,
char *str;
str = request->get_str(request, "ANY", "type");
type = enum_from_name(certificate_type_names, str);
if (type == -1)
if (!enum_from_name(certificate_type_names, str, &type))
{
b = vici_builder_create();
return b->finalize(b);
src/libcharon/plugins/xauth_pam/xauth_pam_listener.h
+1 -1
View File
@@ -26,7 +26,7 @@
* @{ @ingroup xauth_pam
*/
#ifndef XAUTH_PAM_LISENER_H_
#ifndef XAUTH_PAM_LISTENER_H_
#define XAUTH_PAM_LISTENER_H_
typedef struct xauth_pam_listener_t xauth_pam_listener_t;
src/libhydra/attributes/attributes.h
+1 -1
View File
@@ -24,7 +24,7 @@
typedef enum configuration_attribute_type_t configuration_attribute_type_t;
#include <utils/enum.h>
#include <utils/utils.h>
/**
* Type of the attribute, as in IKEv2 RFC 3.15.1 or IKEv1 ModeConfig.
src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c
+1 -1
View File
@@ -823,7 +823,7 @@ static kernel_algorithm_t compression_algs[] = {
static int lookup_algorithm(transform_type_t type, int ikev2)
{
kernel_algorithm_t *list;
int alg = 0;
u_int16_t alg = 0;
switch (type)
{
src/libpts/pts/components/ita/ita_comp_tgrub.c
+2 -2
View File
@@ -125,7 +125,8 @@ METHOD(pts_component_t, verify, status_t,
pts_pcr_transform_t transform;
pts_pcr_t *pcrs;
time_t measurement_time;
chunk_t measurement, pcr_before, pcr_after;
chunk_t pcr_before, pcr_after;
chunk_t measurement __attribute__((unused));
pcrs = pts->get_pcrs(pts);
measurement = evidence->get_measurement(evidence, &extended_pcr,
@@ -205,4 +206,3 @@ pts_component_t *pts_ita_comp_tgrub_create(u_int32_t depth,
return &this->public;
}
src/libsimaka/simaka_message.h
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef SIMAKA_MESSAGE_H_
#define SIMAKA_MESSAGE_H_
#include <utils/enum.h>
#include <utils/utils.h>
#include <eap/eap.h>
#include "simaka_crypto.h"
src/libstrongswan/credentials/auth_cfg.c
+1 -1
View File
@@ -452,7 +452,7 @@ METHOD(auth_cfg_t, get, void*,
case AUTH_RULE_ECDSA_STRENGTH:
return (void*)0;
case AUTH_RULE_SIGNATURE_SCHEME:
return HASH_UNKNOWN;
return (void*)HASH_UNKNOWN;
case AUTH_RULE_CRL_VALIDATION:
case AUTH_RULE_OCSP_VALIDATION:
return (void*)VALIDATION_FAILED;
src/libstrongswan/crypto/transform.h
+1 -1
View File
@@ -23,7 +23,7 @@
typedef enum transform_type_t transform_type_t;
#include <utils/enum.h>
#include <utils/utils.h>
/**
* Type of a transform, as in IKEv2 RFC 3.3.2.
src/libstrongswan/plugins/aes/aes_crypter.c
+65 -622
View File
@@ -49,90 +49,29 @@ struct private_aes_crypter_t {
/**
* Number of words in the key input block.
*/
u_int32_t aes_Nkey;
u_int32_t aes_Nkey;
/**
* The number of cipher rounds.
*/
u_int32_t aes_Nrnd;
u_int32_t aes_Nrnd;
/**
* The encryption key schedule.
*/
u_int32_t aes_e_key[AES_KS_LENGTH];
u_int32_t aes_e_key[AES_KS_LENGTH];
/**
* The decryption key schedule.
*/
u_int32_t aes_d_key[AES_KS_LENGTH];
u_int32_t aes_d_key[AES_KS_LENGTH];
/**
* Key size of this AES cypher object.
*/
u_int32_t key_size;
u_int32_t key_size;
};
/* ugly macro stuff */
/* 1. Define UNROLL for full loop unrolling in encryption and decryption.
* 2. Define PARTIAL_UNROLL to unroll two loops in encryption and decryption.
* 3. Define FIXED_TABLES for compiled rather than dynamic tables.
* 4. Define FF_TABLES to use tables for field multiplies and inverses.
* Do not enable this without understanding stack space requirements.
* 5. Define ARRAYS to use arrays to hold the local state block. If this
* is not defined, individually declared 32-bit words are used.
* 6. Define FAST_VARIABLE if a high speed variable block implementation
* is needed (essentially three separate fixed block size code sequences)
* 7. Define either ONE_TABLE or FOUR_TABLES for a fast table driven
* version using 1 table (2 kbytes of table space) or 4 tables (8
* kbytes of table space) for higher speed.
* 8. Define either ONE_LR_TABLE or FOUR_LR_TABLES for a further speed
* increase by using tables for the last rounds but with more table
* space (2 or 8 kbytes extra).
* 9. If neither ONE_TABLE nor FOUR_TABLES is defined, a compact but
* slower version is provided.
* 10. If fast decryption key scheduling is needed define ONE_IM_TABLE
* or FOUR_IM_TABLES for higher speed (2 or 8 kbytes extra).
*/
#define UNROLL
//#define PARTIAL_UNROLL
#define FIXED_TABLES
//#define FF_TABLES
//#define ARRAYS
#define FAST_VARIABLE
//#define ONE_TABLE
#define FOUR_TABLES
//#define ONE_LR_TABLE
#define FOUR_LR_TABLES
//#define ONE_IM_TABLE
#define FOUR_IM_TABLES
#if defined(UNROLL) && defined (PARTIAL_UNROLL)
#error both UNROLL and PARTIAL_UNROLL are defined
#endif
#if defined(ONE_TABLE) && defined (FOUR_TABLES)
#error both ONE_TABLE and FOUR_TABLES are defined
#endif
#if defined(ONE_LR_TABLE) && defined (FOUR_LR_TABLES)
#error both ONE_LR_TABLE and FOUR_LR_TABLES are defined
#endif
#if defined(ONE_IM_TABLE) && defined (FOUR_IM_TABLES)
#error both ONE_IM_TABLE and FOUR_IM_TABLES are defined
#endif
#if defined(AES_BLOCK_SIZE) && AES_BLOCK_SIZE != 16 && AES_BLOCK_SIZE != 24 && AES_BLOCK_SIZE != 32
#error an illegal block size has been specified
#endif
/**
* Rotates bytes within words by n positions, moving bytes
* to higher index positions with wrap around into low positions.
@@ -179,31 +118,6 @@ struct private_aes_crypter_t {
#define const_word_out(x,v) ((const unsigned char *)(x))[0]=(v),((const unsigned char *)(x))[1]=((v)>>8),((const unsigned char *)(x))[2]=((v)>>16),((const unsigned char *)(x))[3]=((v)>>24)
#endif
// Disable at least some poor combinations of options
#if !defined(ONE_TABLE) && !defined(FOUR_TABLES)
#define FIXED_TABLES
#undef UNROLL
#undef ONE_LR_TABLE
#undef FOUR_LR_TABLES
#undef ONE_IM_TABLE
#undef FOUR_IM_TABLES
#elif !defined(FOUR_TABLES)
#ifdef FOUR_LR_TABLES
#undef FOUR_LR_TABLES
#define ONE_LR_TABLE
#endif
#ifdef FOUR_IM_TABLES
#undef FOUR_IM_TABLES
#define ONE_IM_TABLE
#endif
#elif !defined(AES_BLOCK_SIZE)
#if defined(UNROLL)
#define PARTIAL_UNROLL
#undef UNROLL
#endif
#endif
// the finite field modular polynomial and elements
#define ff_poly 0x011b
@@ -228,84 +142,6 @@ struct private_aes_crypter_t {
#define fwd_mcol(x) (f2 = FFmulX(x), f2 ^ upr(x ^ f2,3) ^ upr(x,2) ^ upr(x,1))
#if defined(FIXED_TABLES)
// the S-Box table
static const unsigned char s_box[256] =
{
0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5,
0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc,
0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a,
0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b,
0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85,
0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17,
0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88,
0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9,
0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6,
0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94,
0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68,
0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16
};
// the inverse S-Box table
static const unsigned char inv_s_box[256] =
{
0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38,
0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb,
0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,
0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb,
0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d,
0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2,
0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25,
0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16,
0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92,
0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda,
0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a,
0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06,
0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02,
0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b,
0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea,
0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85,
0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e,
0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89,
0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b,
0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20,
0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31,
0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f,
0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d,
0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef,
0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0,
0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26,
0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d
};
#define w0(p) 0x000000##p
// Number of elements required in this table for different
@@ -343,8 +179,6 @@ static const u_int32_t rcon_tab[29] =
#define w2(p) 0x00##p##0000
#define w3(p) 0x##p##000000
#if defined(FIXED_TABLES) && (defined(ONE_TABLE) || defined(FOUR_TABLES))
// data for forward tables (other than last round)
#define f_table \
@@ -486,10 +320,6 @@ static const u_int32_t rcon_tab[29] =
#undef r
#define r r0
#if defined(ONE_TABLE)
static const u_int32_t ft_tab[256] =
{ f_table };
#elif defined(FOUR_TABLES)
static const u_int32_t ft_tab[4][256] =
{ { f_table },
#undef r
@@ -502,14 +332,9 @@ static const u_int32_t ft_tab[4][256] =
#define r r3
{ f_table }
};
#endif
#undef r
#define r r0
#if defined(ONE_TABLE)
static const u_int32_t it_tab[256] =
{ i_table };
#elif defined(FOUR_TABLES)
static const u_int32_t it_tab[4][256] =
{ { i_table },
#undef r
@@ -522,13 +347,6 @@ static const u_int32_t it_tab[4][256] =
#define r r3
{ i_table }
};
#endif
#endif
#if defined(FIXED_TABLES) && (defined(ONE_LR_TABLE) || defined(FOUR_LR_TABLES))
// data for inverse tables (last round)
#define li_table \
w(52), w(09), w(6a), w(d5), w(30), w(36), w(a5), w(38),\
@@ -568,10 +386,6 @@ static const u_int32_t it_tab[4][256] =
#undef r
#define r(p,q,r,s) w0(q)
#if defined(ONE_LR_TABLE)
static const u_int32_t fl_tab[256] =
{ f_table };
#elif defined(FOUR_LR_TABLES)
static const u_int32_t fl_tab[4][256] =
{ { f_table },
#undef r
@@ -584,14 +398,9 @@ static const u_int32_t fl_tab[4][256] =
#define r(p,q,r,s) w3(q)
{ f_table }
};
#endif
#undef w
#define w w0
#if defined(ONE_LR_TABLE)
static const u_int32_t il_tab[256] =
{ li_table };
#elif defined(FOUR_LR_TABLES)
static const u_int32_t il_tab[4][256] =
{ { li_table },
#undef w
@@ -604,11 +413,6 @@ static const u_int32_t il_tab[4][256] =
#define w w3
{ li_table }
};
#endif
#endif
#if defined(FIXED_TABLES) && (defined(ONE_IM_TABLE) || defined(FOUR_IM_TABLES))
#define m_table \
r(00,00,00,00), r(0b,0d,09,0e), r(16,1a,12,1c), r(1d,17,1b,12),\
@@ -679,10 +483,6 @@ static const u_int32_t il_tab[4][256] =
#undef r
#define r r0
#if defined(ONE_IM_TABLE)
static const u_int32_t im_tab[256] =
{ m_table };
#elif defined(FOUR_IM_TABLES)
static const u_int32_t im_tab[4][256] =
{ { m_table },
#undef r
@@ -695,212 +495,6 @@ static const u_int32_t im_tab[4][256] =
#define r r3
{ m_table }
};
#endif
#endif
#else
static int tab_gen = 0;
static unsigned char s_box[256]; // the S box
static unsigned char inv_s_box[256]; // the inverse S box
static u_int32_t rcon_tab[AES_RC_LENGTH]; // table of round constants
#if defined(ONE_TABLE)
static u_int32_t ft_tab[256];
static u_int32_t it_tab[256];
#elif defined(FOUR_TABLES)
static u_int32_t ft_tab[4][256];
static u_int32_t it_tab[4][256];
#endif
#if defined(ONE_LR_TABLE)
static u_int32_t fl_tab[256];
static u_int32_t il_tab[256];
#elif defined(FOUR_LR_TABLES)
static u_int32_t fl_tab[4][256];
static u_int32_t il_tab[4][256];
#endif
#if defined(ONE_IM_TABLE)
static u_int32_t im_tab[256];
#elif defined(FOUR_IM_TABLES)
static u_int32_t im_tab[4][256];
#endif
// Generate the tables for the dynamic table option
#if !defined(FF_TABLES)
// It will generally be sensible to use tables to compute finite
// field multiplies and inverses but where memory is scarse this
// code might sometimes be better.
// return 2 ^ (n - 1) where n is the bit number of the highest bit
// set in x with x in the range 1 < x < 0x00000200. This form is
// used so that locals within FFinv can be bytes rather than words
static unsigned char hibit(const u_int32_t x)
{ unsigned char r = (unsigned char)((x >> 1) | (x >> 2));
r |= (r >> 2);
r |= (r >> 4);
return (r + 1) >> 1;
}
// return the inverse of the finite field element x
static unsigned char FFinv(const unsigned char x)
{ unsigned char p1 = x, p2 = 0x1b, n1 = hibit(x), n2 = 0x80, v1 = 1, v2 = 0;
if(x < 2) return x;
for(;;)
{
if(!n1) return v1;
while(n2 >= n1)
{
n2 /= n1; p2 ^= p1 * n2; v2 ^= v1 * n2; n2 = hibit(p2);
}
if(!n2) return v2;
while(n1 >= n2)
{
n1 /= n2; p1 ^= p2 * n1; v1 ^= v2 * n1; n1 = hibit(p1);
}
}
}
// define the finite field multiplies required for Rijndael
#define FFmul02(x) ((((x) & 0x7f) << 1) ^ ((x) & 0x80 ? 0x1b : 0))
#define FFmul03(x) ((x) ^ FFmul02(x))
#define FFmul09(x) ((x) ^ FFmul02(FFmul02(FFmul02(x))))
#define FFmul0b(x) ((x) ^ FFmul02((x) ^ FFmul02(FFmul02(x))))
#define FFmul0d(x) ((x) ^ FFmul02(FFmul02((x) ^ FFmul02(x))))
#define FFmul0e(x) FFmul02((x) ^ FFmul02((x) ^ FFmul02(x)))
#else
#define FFinv(x) ((x) ? pow[255 - log[x]]: 0)
#define FFmul02(x) (x ? pow[log[x] + 0x19] : 0)
#define FFmul03(x) (x ? pow[log[x] + 0x01] : 0)
#define FFmul09(x) (x ? pow[log[x] + 0xc7] : 0)
#define FFmul0b(x) (x ? pow[log[x] + 0x68] : 0)
#define FFmul0d(x) (x ? pow[log[x] + 0xee] : 0)
#define FFmul0e(x) (x ? pow[log[x] + 0xdf] : 0)
#endif
// The forward and inverse affine transformations used in the S-box
#define fwd_affine(x) \
(w = (u_int32_t)x, w ^= (w<<1)^(w<<2)^(w<<3)^(w<<4), 0x63^(unsigned char)(w^(w>>8)))
#define inv_affine(x) \
(w = (u_int32_t)x, w = (w<<1)^(w<<3)^(w<<6), 0x05^(unsigned char)(w^(w>>8)))
static void gen_tabs(void)
{ u_int32_t i, w;
#if defined(FF_TABLES)
unsigned char pow[512], log[256];
// log and power tables for GF(2^8) finite field with
// 0x011b as modular polynomial - the simplest primitive
// root is 0x03, used here to generate the tables
i = 0; w = 1;
do
{
pow[i] = (unsigned char)w;
pow[i + 255] = (unsigned char)w;
log[w] = (unsigned char)i++;
w ^= (w << 1) ^ (w & ff_hi ? ff_poly : 0);
}
while (w != 1);
#endif
for(i = 0, w = 1; i < AES_RC_LENGTH; ++i)
{
rcon_tab[i] = bytes2word(w, 0, 0, 0);
w = (w << 1) ^ (w & ff_hi ? ff_poly : 0);
}
for(i = 0; i < 256; ++i)
{ unsigned char b;
s_box[i] = b = fwd_affine(FFinv((unsigned char)i));
w = bytes2word(b, 0, 0, 0);
#if defined(ONE_LR_TABLE)
fl_tab[i] = w;
#elif defined(FOUR_LR_TABLES)
fl_tab[0][i] = w;
fl_tab[1][i] = upr(w,1);
fl_tab[2][i] = upr(w,2);
fl_tab[3][i] = upr(w,3);
#endif
w = bytes2word(FFmul02(b), b, b, FFmul03(b));
#if defined(ONE_TABLE)
ft_tab[i] = w;
#elif defined(FOUR_TABLES)
ft_tab[0][i] = w;
ft_tab[1][i] = upr(w,1);
ft_tab[2][i] = upr(w,2);
ft_tab[3][i] = upr(w,3);
#endif
inv_s_box[i] = b = FFinv(inv_affine((unsigned char)i));
w = bytes2word(b, 0, 0, 0);
#if defined(ONE_LR_TABLE)
il_tab[i] = w;
#elif defined(FOUR_LR_TABLES)
il_tab[0][i] = w;
il_tab[1][i] = upr(w,1);
il_tab[2][i] = upr(w,2);
il_tab[3][i] = upr(w,3);
#endif
w = bytes2word(FFmul0e(b), FFmul09(b), FFmul0d(b), FFmul0b(b));
#if defined(ONE_TABLE)
it_tab[i] = w;
#elif defined(FOUR_TABLES)
it_tab[0][i] = w;
it_tab[1][i] = upr(w,1);
it_tab[2][i] = upr(w,2);
it_tab[3][i] = upr(w,3);
#endif
#if defined(ONE_IM_TABLE)
im_tab[b] = w;
#elif defined(FOUR_IM_TABLES)
im_tab[0][b] = w;
im_tab[1][b] = upr(w,1);
im_tab[2][b] = upr(w,2);
im_tab[3][b] = upr(w,3);
#endif
}
}
#endif
#define no_table(x,box,vf,rf,c) bytes2word( \
box[bval(vf(x,0,c),rf(0,c))], \
box[bval(vf(x,1,c),rf(1,c))], \
box[bval(vf(x,2,c),rf(2,c))], \
box[bval(vf(x,3,c),rf(3,c))])
#define one_table(x,op,tab,vf,rf,c) \
( tab[bval(vf(x,0,c),rf(0,c))] \
^ op(tab[bval(vf(x,1,c),rf(1,c))],1) \
^ op(tab[bval(vf(x,2,c),rf(2,c))],2) \
^ op(tab[bval(vf(x,3,c),rf(3,c))],3))
#define four_tables(x,tab,vf,rf,c) \
( tab[0][bval(vf(x,0,c),rf(0,c))] \
@@ -912,23 +506,8 @@ static void gen_tabs(void)
#define rf1(r,c) (r)
#define rf2(r,c) ((r-c)&3)
#if defined(FOUR_LR_TABLES)
#define ls_box(x,c) four_tables(x,fl_tab,vf1,rf2,c)
#elif defined(ONE_LR_TABLE)
#define ls_box(x,c) one_table(x,upr,fl_tab,vf1,rf2,c)
#else
#define ls_box(x,c) no_table(x,s_box,vf1,rf2,c)
#endif
#if defined(FOUR_IM_TABLES)
#define inv_mcol(x) four_tables(x,im_tab,vf1,rf1,0)
#elif defined(ONE_IM_TABLE)
#define inv_mcol(x) one_table(x,upr,im_tab,vf1,rf1,0)
#else
#define inv_mcol(x) \
(f9 = (x),f2 = FFmulX(f9), f4 = FFmulX(f2), f8 = FFmulX(f4), f9 ^= f8, \
f2 ^= f4 ^ f8 ^ upr(f2 ^ f9,3) ^ upr(f4 ^ f9,2) ^ upr(f9,1))
#endif
#define nc (AES_BLOCK_SIZE/4)
@@ -954,23 +533,7 @@ static void gen_tabs(void)
#define mix(d,s) mx(d,s); mx(d,s); mx(d,s); mx(d,s); \
mx(d,s); mx(d,s); mx(d,s); mx(d,s)
#else
#define cpy(d,s) \
switch(nc) \
{ case 8: cp(d,s); cp(d,s); \
case 6: cp(d,s); cp(d,s); \
case 4: cp(d,s); cp(d,s); \
cp(d,s); cp(d,s); \
}
#define mix(d,s) \
switch(nc) \
{ case 8: mx(d,s); mx(d,s); \
case 6: mx(d,s); mx(d,s); \
case 4: mx(d,s); mx(d,s); \
mx(d,s); mx(d,s); \
}
#error bad AES_BLOCK_SIZE
#endif
// y = output word, x = input word, r = row, c = column
@@ -1072,27 +635,10 @@ switch(nc) \
#define si(y,x,k,c) s(y,c) = const_word_in(x + 4 * c) ^ k[c]
#define so(y,x,c) word_out(y + 4 * c, s(x,c))
#if defined(FOUR_TABLES)
#define fwd_rnd(y,x,k,c) s(y,c)= (k)[c] ^ four_tables(x,ft_tab,fwd_var,rf1,c)
#define inv_rnd(y,x,k,c) s(y,c)= (k)[c] ^ four_tables(x,it_tab,inv_var,rf1,c)
#elif defined(ONE_TABLE)
#define fwd_rnd(y,x,k,c) s(y,c)= (k)[c] ^ one_table(x,upr,ft_tab,fwd_var,rf1,c)
#define inv_rnd(y,x,k,c) s(y,c)= (k)[c] ^ one_table(x,upr,it_tab,inv_var,rf1,c)
#else
#define fwd_rnd(y,x,k,c) s(y,c) = fwd_mcol(no_table(x,s_box,fwd_var,rf1,c)) ^ (k)[c]
#define inv_rnd(y,x,k,c) s(y,c) = inv_mcol(no_table(x,inv_s_box,inv_var,rf1,c) ^ (k)[c])
#endif
#if defined(FOUR_LR_TABLES)
#define fwd_lrnd(y,x,k,c) s(y,c)= (k)[c] ^ four_tables(x,fl_tab,fwd_var,rf1,c)
#define inv_lrnd(y,x,k,c) s(y,c)= (k)[c] ^ four_tables(x,il_tab,inv_var,rf1,c)
#elif defined(ONE_LR_TABLE)
#define fwd_lrnd(y,x,k,c) s(y,c)= (k)[c] ^ one_table(x,ups,fl_tab,fwd_var,rf1,c)
#define inv_lrnd(y,x,k,c) s(y,c)= (k)[c] ^ one_table(x,ups,il_tab,inv_var,rf1,c)
#else
#define fwd_lrnd(y,x,k,c) s(y,c) = no_table(x,s_box,fwd_var,rf1,c) ^ (k)[c]
#define inv_lrnd(y,x,k,c) s(y,c) = no_table(x,inv_s_box,inv_var,rf1,c) ^ (k)[c]
#endif
#if AES_BLOCK_SIZE == 16
@@ -1160,175 +706,83 @@ switch(nc) \
#define round(rm,y,x,k) rm(y,x,k,0); rm(y,x,k,1); rm(y,x,k,2); rm(y,x,k,3); \
rm(y,x,k,4); rm(y,x,k,5); rm(y,x,k,6); rm(y,x,k,7)
#else
#define state_in(y,x,k) \
switch(nc) \
{ case 8: si(y,x,k,7); si(y,x,k,6); \
case 6: si(y,x,k,5); si(y,x,k,4); \
case 4: si(y,x,k,3); si(y,x,k,2); \
si(y,x,k,1); si(y,x,k,0); \
}
#define state_out(y,x) \
switch(nc) \
{ case 8: so(y,x,7); so(y,x,6); \
case 6: so(y,x,5); so(y,x,4); \
case 4: so(y,x,3); so(y,x,2); \
so(y,x,1); so(y,x,0); \
}
#if defined(FAST_VARIABLE)
#define round(rm,y,x,k) \
switch(nc) \
{ case 8: rm(y,x,k,7); rm(y,x,k,6); \
rm(y,x,k,5); rm(y,x,k,4); \
rm(y,x,k,3); rm(y,x,k,2); \
rm(y,x,k,1); rm(y,x,k,0); \
break; \
case 6: rm(y,x,k,5); rm(y,x,k,4); \
rm(y,x,k,3); rm(y,x,k,2); \
rm(y,x,k,1); rm(y,x,k,0); \
break; \
case 4: rm(y,x,k,3); rm(y,x,k,2); \
rm(y,x,k,1); rm(y,x,k,0); \
break; \
}
#else
#define round(rm,y,x,k) \
switch(nc) \
{ case 8: rm(y,x,k,7); rm(y,x,k,6); \
case 6: rm(y,x,k,5); rm(y,x,k,4); \
case 4: rm(y,x,k,3); rm(y,x,k,2); \
rm(y,x,k,1); rm(y,x,k,0); \
}
#error invalid AES_BLOCK_SIZE
#endif
#endif
#endif
/**
* Encrypt a single block of data.
*/
static void encrypt_block(const private_aes_crypter_t *this, const unsigned char in_blk[], unsigned char out_blk[])
{ u_int32_t locals(b0, b1);
const u_int32_t *kp = this->aes_e_key;
static void encrypt_block(const private_aes_crypter_t *this,
const unsigned char in_blk[], unsigned char out_blk[])
{
u_int32_t locals(b0, b1);
const u_int32_t *kp = this->aes_e_key;
#if !defined(ONE_TABLE) && !defined(FOUR_TABLES)
u_int32_t f2;
#endif
state_in(b0, in_blk, kp); kp += nc;
state_in(b0, in_blk, kp); kp += nc;
switch(this->aes_Nrnd)
{
case 14:
round(fwd_rnd, b1, b0, kp );
round(fwd_rnd, b0, b1, kp + nc ); kp += 2 * nc;
/* fall */
case 12:
round(fwd_rnd, b1, b0, kp );
round(fwd_rnd, b0, b1, kp + nc ); kp += 2 * nc;
/* fall */
case 10:
round(fwd_rnd, b1, b0, kp );
round(fwd_rnd, b0, b1, kp + nc);
round(fwd_rnd, b1, b0, kp + 2 * nc);
round(fwd_rnd, b0, b1, kp + 3 * nc);
round(fwd_rnd, b1, b0, kp + 4 * nc);
round(fwd_rnd, b0, b1, kp + 5 * nc);
round(fwd_rnd, b1, b0, kp + 6 * nc);
round(fwd_rnd, b0, b1, kp + 7 * nc);
round(fwd_rnd, b1, b0, kp + 8 * nc);
round(fwd_lrnd, b0, b1, kp + 9 * nc);
}
#if defined(UNROLL)
switch(this->aes_Nrnd)
{
case 14: round(fwd_rnd, b1, b0, kp );
round(fwd_rnd, b0, b1, kp + nc ); kp += 2 * nc;
case 12: round(fwd_rnd, b1, b0, kp );
round(fwd_rnd, b0, b1, kp + nc ); kp += 2 * nc;
case 10: round(fwd_rnd, b1, b0, kp );
round(fwd_rnd, b0, b1, kp + nc);
round(fwd_rnd, b1, b0, kp + 2 * nc);
round(fwd_rnd, b0, b1, kp + 3 * nc);
round(fwd_rnd, b1, b0, kp + 4 * nc);
round(fwd_rnd, b0, b1, kp + 5 * nc);
round(fwd_rnd, b1, b0, kp + 6 * nc);
round(fwd_rnd, b0, b1, kp + 7 * nc);
round(fwd_rnd, b1, b0, kp + 8 * nc);
round(fwd_lrnd, b0, b1, kp + 9 * nc);
}
#elif defined(PARTIAL_UNROLL)
{ u_int32_t rnd;
for(rnd = 0; rnd < (this->aes_Nrnd >> 1) - 1; ++rnd)
{
round(fwd_rnd, b1, b0, kp);
round(fwd_rnd, b0, b1, kp + nc); kp += 2 * nc;
}
round(fwd_rnd, b1, b0, kp);
round(fwd_lrnd, b0, b1, kp + nc);
}
#else
{ u_int32_t rnd;
for(rnd = 0; rnd < this->aes_Nrnd - 1; ++rnd)
{
round(fwd_rnd, b1, b0, kp);
l_copy(b0, b1); kp += nc;
}
round(fwd_lrnd, b0, b1, kp);
}
#endif
state_out(out_blk, b0);
state_out(out_blk, b0);
}
/**
* Decrypt a single block of data.
*/
static void decrypt_block(const private_aes_crypter_t *this, const unsigned char in_blk[], unsigned char out_blk[])
{ u_int32_t locals(b0, b1);
const u_int32_t *kp = this->aes_d_key;
static void decrypt_block(const private_aes_crypter_t *this,
const unsigned char in_blk[], unsigned char out_blk[])
{
u_int32_t locals(b0, b1);
const u_int32_t *kp = this->aes_d_key;
#if !defined(ONE_TABLE) && !defined(FOUR_TABLES)
u_int32_t f2, f4, f8, f9;
#endif
state_in(b0, in_blk, kp); kp += nc;
state_in(b0, in_blk, kp); kp += nc;
switch(this->aes_Nrnd)
{
case 14:
round(inv_rnd, b1, b0, kp );
round(inv_rnd, b0, b1, kp + nc ); kp += 2 * nc;
/* fall */
case 12:
round(inv_rnd, b1, b0, kp );
round(inv_rnd, b0, b1, kp + nc ); kp += 2 * nc;
/* fall */
case 10:
round(inv_rnd, b1, b0, kp );
round(inv_rnd, b0, b1, kp + nc);
round(inv_rnd, b1, b0, kp + 2 * nc);
round(inv_rnd, b0, b1, kp + 3 * nc);
round(inv_rnd, b1, b0, kp + 4 * nc);
round(inv_rnd, b0, b1, kp + 5 * nc);
round(inv_rnd, b1, b0, kp + 6 * nc);
round(inv_rnd, b0, b1, kp + 7 * nc);
round(inv_rnd, b1, b0, kp + 8 * nc);
round(inv_lrnd, b0, b1, kp + 9 * nc);
}
#if defined(UNROLL)
switch(this->aes_Nrnd)
{
case 14: round(inv_rnd, b1, b0, kp );
round(inv_rnd, b0, b1, kp + nc ); kp += 2 * nc;
case 12: round(inv_rnd, b1, b0, kp );
round(inv_rnd, b0, b1, kp + nc ); kp += 2 * nc;
case 10: round(inv_rnd, b1, b0, kp );
round(inv_rnd, b0, b1, kp + nc);
round(inv_rnd, b1, b0, kp + 2 * nc);
round(inv_rnd, b0, b1, kp + 3 * nc);
round(inv_rnd, b1, b0, kp + 4 * nc);
round(inv_rnd, b0, b1, kp + 5 * nc);
round(inv_rnd, b1, b0, kp + 6 * nc);
round(inv_rnd, b0, b1, kp + 7 * nc);
round(inv_rnd, b1, b0, kp + 8 * nc);
round(inv_lrnd, b0, b1, kp + 9 * nc);
}
#elif defined(PARTIAL_UNROLL)
{ u_int32_t rnd;
for(rnd = 0; rnd < (this->aes_Nrnd >> 1) - 1; ++rnd)
{
round(inv_rnd, b1, b0, kp);
round(inv_rnd, b0, b1, kp + nc); kp += 2 * nc;
}
round(inv_rnd, b1, b0, kp);
round(inv_lrnd, b0, b1, kp + nc);
}
#else
{ u_int32_t rnd;
for(rnd = 0; rnd < this->aes_Nrnd - 1; ++rnd)
{
round(inv_rnd, b1, b0, kp);
l_copy(b0, b1); kp += nc;
}
round(inv_lrnd, b0, b1, kp);
}
#endif
state_out(out_blk, b0);
state_out(out_blk, b0);
}
METHOD(crypter_t, decrypt, bool,
@@ -1503,14 +957,7 @@ METHOD(crypter_t, set_key, bool,
for(i = 1; i < this->aes_Nrnd; ++i)
{
#if defined(ONE_TABLE) || defined(FOUR_TABLES)
#if !defined(ONE_IM_TABLE) && !defined(FOUR_IM_TABLES)
u_int32_t f2, f4, f8, f9;
#endif
mix(kt, kf);
#else
cpy(kt, kf);
#endif
kt -= 2 * nc;
}
cpy(kt, kf);
@@ -1549,10 +996,6 @@ aes_crypter_t *aes_crypter_create(encryption_algorithm_t algo, size_t key_size)
return NULL;
}
#if !defined(FIXED_TABLES)
if(!tab_gen) { gen_tabs(); tab_gen = 1; }
#endif
INIT(this,
.public = {
.crypter = {
src/libstrongswan/plugins/pgp/pgp_builder.c
+1 -2
View File
@@ -17,7 +17,7 @@
#include "pgp_builder.h"
#include "pgp_utils.h"
#include <utils/enum.h>
#include <utils/utils.h>
#include <utils/debug.h>
#include <credentials/keys/private_key.h>
@@ -273,4 +273,3 @@ private_key_t *pgp_private_key_load(key_type_t type, va_list args)
return NULL;
}
}
src/libstrongswan/plugins/pkcs11/pkcs11_library.h
+1 -1
View File
@@ -29,7 +29,7 @@ typedef struct pkcs11_library_t pkcs11_library_t;
#include "pkcs11.h"
#include <utils/enum.h>
#include <utils/utils.h>
#include <utils/chunk.h>
#include <collections/enumerator.h>
src/libstrongswan/plugins/unbound/unbound_rr.c
+2 -2
View File
@@ -135,8 +135,8 @@ unbound_rr_t *unbound_rr_create_frm_ldns_rr(ldns_rr *rr)
return NULL;
}
this->type = ldns_rr_get_type(rr);
this->class = ldns_rr_get_class(rr);
this->type = (rr_type_t)ldns_rr_get_type(rr);
this->class = (rr_class_t)ldns_rr_get_class(rr);
this->ttl = ldns_rr_ttl(rr);
for(i = 0; i < ldns_rr_rd_count(rr); i++)
{
src/libstrongswan/plugins/x509/x509_cert.c
-5
View File
@@ -217,10 +217,6 @@ struct private_x509_cert_t {
refcount_t ref;
};
static const chunk_t ASN1_subjectAltName_oid = chunk_from_chars(
0x06, 0x03, 0x55, 0x1D, 0x11
);
/**
* Destroy a CertificateDistributionPoint
*/
@@ -2611,4 +2607,3 @@ x509_cert_t *x509_cert_gen(certificate_type_t type, va_list args)
destroy(cert);
return NULL;
}
src/libstrongswan/plugins/x509/x509_ocsp_response.c
-20
View File
@@ -129,25 +129,6 @@ typedef struct {
/* our OCSP response version implementation */
#define OCSP_BASIC_RESPONSE_VERSION 1
/* some OCSP specific prefabricated ASN.1 constants */
static const chunk_t ASN1_nonce_oid = chunk_from_chars(
0x06, 0x09,
0x2B, 0x06,
0x01, 0x05, 0x05, 0x07, 0x30, 0x01, 0x02
);
static const chunk_t ASN1_response_oid = chunk_from_chars(
0x06, 0x09,
0x2B, 0x06,
0x01, 0x05, 0x05, 0x07, 0x30, 0x01, 0x04
);
static const chunk_t ASN1_response_content = chunk_from_chars(
0x04, 0x0D,
0x30, 0x0B,
0x06, 0x09,
0x2B, 0x06,
0x01, 0x05, 0x05, 0x07, 0x30, 0x01, 0x01
);
METHOD(ocsp_response_t, get_status, cert_validation_t,
private_x509_ocsp_response_t *this, x509_t *subject, x509_t *issuer,
time_t *revocation_time, crl_reason_t *revocation_reason,
@@ -889,4 +870,3 @@ x509_ocsp_response_t *x509_ocsp_response_load(certificate_type_t type,
}
return NULL;
}
src/libstrongswan/tests/suites/test_enum.c
+30 -22
View File
@@ -15,7 +15,6 @@
#include "test_suite.h"
#include <utils/enum.h>
#include <utils/utils.h>
/*******************************************************************************
@@ -121,41 +120,50 @@ END_TEST
*/
static struct {
bool found;
int val;
char *str;
} enum_tests_cont[] = {
{CONT1, "CONT1"},
{CONT2, "CONT2"},
{CONT2, "CoNt2"},
{CONT3, "CONT3"},
{CONT4, "CONT4"},
{CONT5, "CONT5"},
{-1, "asdf"},
{-1, ""},
{-1, NULL},
{TRUE, CONT1, "CONT1"},
{TRUE, CONT2, "CONT2"},
{TRUE, CONT2, "CoNt2"},
{TRUE, CONT3, "CONT3"},
{TRUE, CONT4, "CONT4"},
{TRUE, CONT5, "CONT5"},
{FALSE, 0, "asdf"},
{FALSE, 0, ""},
{FALSE, 0, NULL},
}, enum_tests_split[] = {
{SPLIT1, "SPLIT1"},
{SPLIT1, "split1"},
{SPLIT2, "SPLIT2"},
{SPLIT2, "SpLiT2"},
{SPLIT3, "SPLIT3"},
{SPLIT4, "SPLIT4"},
{SPLIT5, "SPLIT5"},
{-1, "asdf"},
{-1, ""},
{-1, NULL},
{TRUE, SPLIT1, "SPLIT1"},
{TRUE, SPLIT1, "split1"},
{TRUE, SPLIT2, "SPLIT2"},
{TRUE, SPLIT2, "SpLiT2"},
{TRUE, SPLIT3, "SPLIT3"},
{TRUE, SPLIT4, "SPLIT4"},
{TRUE, SPLIT5, "SPLIT5"},
{FALSE, 0, "asdf"},
{FALSE, 0, ""},
{FALSE, 0, NULL},
};
START_TEST(test_enum_from_name_cont)
{
int val = enum_from_name(test_enum_cont_names, enum_tests_cont[_i].str);
int val = 0;
bool found;
found = enum_from_name(test_enum_cont_names, enum_tests_cont[_i].str, &val);
ck_assert(enum_tests_cont[_i].found == found);
ck_assert_int_eq(val, enum_tests_cont[_i].val);
}
END_TEST
START_TEST(test_enum_from_name_split)
{
int val = enum_from_name(test_enum_split_names, enum_tests_split[_i].str);
int val = 0;
bool found;
found = enum_from_name(test_enum_split_names, enum_tests_split[_i].str, &val);
ck_assert(enum_tests_split[_i].found == found);
ck_assert_int_eq(val, enum_tests_split[_i].val);
}
END_TEST
src/libstrongswan/utils/debug.h
+1 -1
View File
@@ -26,7 +26,7 @@ typedef enum level_t level_t;
#include <stdio.h>
#include "utils/enum.h"
#include <utils/utils.h>
/**
* Debug message group.
src/libstrongswan/utils/enum.c
+5 -3
View File
@@ -17,6 +17,7 @@
#include <stdio.h>
#include <library.h>
#include <utils/utils.h>
#include "enum.h"
@@ -39,7 +40,7 @@ char *enum_to_name(enum_name_t *e, int val)
/**
* See header.
*/
int enum_from_name(enum_name_t *e, char *name)
bool enum_from_name_as_int(enum_name_t *e, const char *name, int *val)
{
do
{
@@ -49,12 +50,13 @@ int enum_from_name(enum_name_t *e, char *name)
{
if (name && strcaseeq(name, e->names[i]))
{
return e->first + i;
*val = e->first + i;
return TRUE;
}
}
}
while ((e = e->next));
return -1;
return FALSE;
}
/**
src/libstrongswan/utils/enum.h
+23 -2
View File
@@ -120,9 +120,30 @@ char *enum_to_name(enum_name_t *e, int val);
*
* @param e enum names for this enum value
* @param name name to get enum value for
* @return enum value, -1 if not found
* @þaram valp variable sized pointer receiving value
* @return TRUE if enum name found, FALSE otherwise
*/
int enum_from_name(enum_name_t *e, char *name);
#define enum_from_name(e, name, valp) ({ \
int _val; \
int _found = enum_from_name_as_int(e, name, &_val); \
if (_found) \
{ \
*(valp) = _val; \
} \
_found; })
/**
* Convert a enum string back to its enum value, integer pointer variant.
*
* This variant takes integer pointer only, use enum_from_name() to pass
* enum type pointers for the result.
*
* @param e enum names for this enum value
* @param name name to get enum value for
* @þaram val integer pointer receiving value
* @return TRUE if enum name found, FALSE otherwise
*/
bool enum_from_name_as_int(enum_name_t *e, const char *name, int *val);
/**
* printf hook function for enum_names_t.
src/libstrongswan/utils/utils.h
+3 -3
View File
@@ -29,9 +29,6 @@
#include <arpa/inet.h>
#include <string.h>
#include "enum.h"
#include "utils/strerror.h"
/**
* strongSwan program return codes
*/
@@ -73,6 +70,9 @@
# define TRUE true
#endif /* TRUE */
#include "enum.h"
#include "utils/strerror.h"
/**
* Helper function that compares two strings for equality
*/
src/libtls/tls.c
+5 -5
View File
@@ -171,15 +171,15 @@ struct private_tls_t {
*/
size_t outpos;
/**
* Partial TLS record header received
*/
tls_record_t head;
/**
* Position in partially received record header
*/
size_t headpos;
/**
* Partial TLS record header received
*/
tls_record_t head;
};
/**
src/libtls/tls_crypto.c
+2 -2
View File
@@ -959,8 +959,8 @@ static void filter_specific_config_suites(private_tls_crypto_t *this,
enumerator = enumerator_create_token(config, ",", " ");
while (enumerator->enumerate(enumerator, &token))
{
suite = enum_from_name(tls_cipher_suite_names, token);
if (suite == suites[i].suite)
if (enum_from_name(tls_cipher_suite_names, token, &suite) &&
suite == suites[i].suite)
{
suites[remaining++] = suites[i];
break;
src/libtnccs/plugins/tnc_imv/tnc_imv_manager.c
+7 -6
View File
@@ -432,7 +432,7 @@ METHOD(imv_manager_t, destroy, void,
imv_manager_t* tnc_imv_manager_create(void)
{
private_tnc_imv_manager_t *this;
recommendation_policy_t policy;
char *polname;
INIT(this,
.public = {
@@ -458,11 +458,12 @@ imv_manager_t* tnc_imv_manager_create(void)
.next_imv_id = 1,
);
policy = enum_from_name(recommendation_policy_names,
lib->settings->get_str(lib->settings,
"%s.plugins.tnc-imv.recommendation_policy",
"default", lib->ns));
this->policy = (policy != -1) ? policy : RECOMMENDATION_POLICY_DEFAULT;
polname = lib->settings->get_str(lib->settings,
"%s.plugins.tnc-imv.recommendation_policy", "default", lib->ns);
if (!enum_from_name(recommendation_policy_names, polname, &this->policy))
{
this->policy = RECOMMENDATION_POLICY_DEFAULT;
}
DBG1(DBG_TNC, "TNC recommendation policy is '%N'",
recommendation_policy_names, this->policy);
src/libtnccs/plugins/tnccs_11/messages/tnccs_error_msg.c
+2 -3
View File
@@ -128,9 +128,8 @@ tnccs_msg_t *tnccs_error_msg_create_from_node(xmlNodePtr node)
error_type_name = xmlGetProp(node, "type");
if (error_type_name)
{
this->error_type = enum_from_name(tnccs_error_type_names,
error_type_name);
if (this->error_type == -1)
if (!enum_from_name(tnccs_error_type_names, error_type_name,
&this->error_type))
{
this->error_type = TNCCS_ERROR_OTHER;
}
src/libtnccs/plugins/tnccs_11/messages/tnccs_msg.c
+3 -3
View File
@@ -41,7 +41,7 @@ tnccs_msg_t* tnccs_msg_create_from_node(xmlNodePtr node, linked_list_t *errors)
char *error_msg, buf[BUF_LEN];
tnccs_error_type_t error_type = TNCCS_ERROR_MALFORMED_BATCH;
tnccs_msg_t *msg;
tnccs_msg_type_t type = IMC_IMV_MSG;
tnccs_msg_type_t type = IMC_IMV_MSG, nametype;
if (streq((char*)node->name, "IMC-IMV-Message"))
{
@@ -103,7 +103,8 @@ tnccs_msg_t* tnccs_msg_create_from_node(xmlNodePtr node, linked_list_t *errors)
error_msg = "node is not in the TNCCS message namespace";
goto fatal;
}
if (type != enum_from_name(tnccs_msg_type_names, (char*)cur->name))
if (!enum_from_name(tnccs_msg_type_names, cur->name, &nametype) ||
type != nametype)
{
error_msg = buf;
snprintf(buf, BUF_LEN, "expected '%N' node but was '%s'",
@@ -137,4 +138,3 @@ fatal:
errors->insert_last(errors, msg);
return NULL;
}
src/pki/commands/acert.c
+1 -2
View File
@@ -53,8 +53,7 @@ static int acert()
case 'h':
goto usage;
case 'g':
digest = enum_from_name(hash_algorithm_short_names, arg);
if (digest == -1)
if (!enum_from_name(hash_algorithm_short_names, arg, &digest))
{
error = "invalid --digest type";
goto usage;
src/pki/commands/issue.c
+1 -2
View File
@@ -106,8 +106,7 @@ static int issue()
}
continue;
case 'g':
digest = enum_from_name(hash_algorithm_short_names, arg);
if (digest == -1)
if (!enum_from_name(hash_algorithm_short_names, arg, &digest))
{
error = "invalid --digest type";
goto usage;
src/pki/commands/req.c
+1 -2
View File
@@ -64,8 +64,7 @@ static int req()
}
continue;
case 'g':
digest = enum_from_name(hash_algorithm_short_names, arg);
if (digest == -1)
if (!enum_from_name(hash_algorithm_short_names, arg, &digest))
{
error = "invalid --digest type";
goto usage;
src/pki/commands/self.c
+1 -2
View File
@@ -95,8 +95,7 @@ static int self()
}
continue;
case 'g':
digest = enum_from_name(hash_algorithm_short_names, arg);
if (digest == -1)
if (!enum_from_name(hash_algorithm_short_names, arg, &digest))
{
error = "invalid --digest type";
goto usage;
src/pki/commands/signcrl.c
+1 -2
View File
@@ -142,8 +142,7 @@ static int sign_crl()
case 'h':
goto usage;
case 'g':
digest = enum_from_name(hash_algorithm_short_names, arg);
if (digest == -1)
if (!enum_from_name(hash_algorithm_short_names, arg, &digest))
{
error = "invalid --digest type";
goto usage;
src/scepclient/scepclient.c
+1 -1
View File
@@ -896,7 +896,7 @@ int main(int argc, char **argv)
}
hash = hasher_algorithm_from_integrity(token->algorithm,
NULL);
if (hash == OID_UNKNOWN)
if (hash == (hash_algorithm_t)OID_UNKNOWN)
{
usage("invalid algorithm specified");
}
src/swanctl/commands/install.c
+1 -1
View File
@@ -23,7 +23,7 @@ static int manage_policy(vici_conn_t *conn, char *label)
vici_res_t *res;
bool raw = FALSE;
char *arg, *child = NULL;
int ret;
int ret = 0;
while (TRUE)
{
src/swanctl/commands/list_certs.c
+3 -3
View File
@@ -556,10 +556,10 @@ CALLBACK(list_cb, void,
bool has_privkey;
buf = vici_find(res, &len, "data");
type = enum_from_name(certificate_type_names,
vici_find_str(res, "ANY", "type"));
has_privkey = streq(vici_find_str(res, "no", "has_privkey"), "yes");
if (type != -1 && type != CERT_ANY && buf)
if (enum_from_name(certificate_type_names,
vici_find_str(res, "ANY", "type"), &type) &&
type != CERT_ANY && buf)
{
cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, type,
BUILD_BLOB_ASN1_DER, chunk_create(buf, len),