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

renamed OAKLEY_ECDSA_512 to OAKLEY_ECDSA_512

Browse Source
This commit is contained in:
Andreas Steffen
2009-06-13 15:16:49 +02:00
parent 1930cb22ff
commit c71f212627
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pluto/connections.c
+2 -2
View File
@@ -3317,7 +3317,7 @@ refine_host_connection(const struct state *st, const struct id *peer_id
case OAKLEY_RSA_SIG: case OAKLEY_RSA_SIG:
case OAKLEY_ECDSA_256: case OAKLEY_ECDSA_256:
case OAKLEY_ECDSA_384: case OAKLEY_ECDSA_384:
case OAKLEY_ECDSA_512: case OAKLEY_ECDSA_521:
auth_policy = POLICY_PUBKEY; auth_policy = POLICY_PUBKEY;
break; break;
case XAUTHInitRSA: case XAUTHInitRSA:
@@ -3406,7 +3406,7 @@ refine_host_connection(const struct state *st, const struct id *peer_id
case OAKLEY_RSA_SIG: case OAKLEY_RSA_SIG:
case OAKLEY_ECDSA_256: case OAKLEY_ECDSA_256:
case OAKLEY_ECDSA_384: case OAKLEY_ECDSA_384:
case OAKLEY_ECDSA_512: case OAKLEY_ECDSA_521:
case XAUTHInitRSA: case XAUTHInitRSA:
case XAUTHRespRSA: case XAUTHRespRSA:
/* /*
src/pluto/constants.c
+12 -12
View File
@@ -848,17 +848,17 @@ enum_names oakley_hash_names =
/* Oakley Authentication Method attribute */ /* Oakley Authentication Method attribute */
static const char *const oakley_auth_name1[] = { static const char *const oakley_auth_name1[] = {
"PRESHARED_KEY", "pre-shared key",
"DSS_SIG", "DSS signature",
"RSA_SIG", "RSA_signatue",
"RSA_ENC", "RSA encryption",
"RSA_ENC_REV", "RSA encryption revised",
"ELGAMAL_ENC", "ElGamal encryption",
"ELGAMAL_ENC_REV", "ELGamal encryption revised",
"ECDSA_SIG", "ECDSA signature",
"ECDSA_256_SIG", "ECDSA-256 signature",
"ECDSA_384_SIG", "ECDSA-384 signature",
"ECDSA_512_SIG", "ECDSA-521-signature",
}; };
static const char *const oakley_auth_name2[] = { static const char *const oakley_auth_name2[] = {
@@ -882,7 +882,7 @@ static const char *const oakley_auth_name3[] = {
}; };
static enum_names oakley_auth_names1 = static enum_names oakley_auth_names1 =
{ OAKLEY_PRESHARED_KEY, OAKLEY_ECDSA_512 { OAKLEY_PRESHARED_KEY, OAKLEY_ECDSA_521
, oakley_auth_name1, NULL }; , oakley_auth_name1, NULL };
static enum_names oakley_auth_names2 = static enum_names oakley_auth_names2 =
src/pluto/constants.h
+1 -1
View File
@@ -981,7 +981,7 @@ extern enum_names oakley_auth_names;
#define OAKLEY_ECDSA_SIG 8 #define OAKLEY_ECDSA_SIG 8
#define OAKLEY_ECDSA_256 9 #define OAKLEY_ECDSA_256 9
#define OAKLEY_ECDSA_384 10 #define OAKLEY_ECDSA_384 10
#define OAKLEY_ECDSA_512 11 #define OAKLEY_ECDSA_521 11
#define OAKLEY_AUTH_ROOF 12 /* roof on auth values THAT WE SUPPORT */ #define OAKLEY_AUTH_ROOF 12 /* roof on auth values THAT WE SUPPORT */
src/pluto/crypto.c
+1 -1
View File
@@ -271,7 +271,7 @@ signature_scheme_t oakley_to_signature_scheme(int method)
return SIGN_RSA_EMSA_PKCS1_NULL; return SIGN_RSA_EMSA_PKCS1_NULL;
case OAKLEY_ECDSA_256: case OAKLEY_ECDSA_256:
case OAKLEY_ECDSA_384: case OAKLEY_ECDSA_384:
case OAKLEY_ECDSA_512: case OAKLEY_ECDSA_521:
return SIGN_ECDSA_WITH_NULL; return SIGN_ECDSA_WITH_NULL;
default: default:
return SIGN_UNKNOWN; return SIGN_UNKNOWN;
src/pluto/demux.c
+1 -1
View File
@@ -190,7 +190,7 @@ struct state_microcode {
#define SMF_PSK_AUTH LELEM(OAKLEY_PRESHARED_KEY) #define SMF_PSK_AUTH LELEM(OAKLEY_PRESHARED_KEY)
#define SMF_DS_AUTH (LELEM(OAKLEY_DSS_SIG) | LELEM(OAKLEY_RSA_SIG) | \ #define SMF_DS_AUTH (LELEM(OAKLEY_DSS_SIG) | LELEM(OAKLEY_RSA_SIG) | \
LELEM(OAKLEY_ECDSA_SIG) | LELEM(OAKLEY_ECDSA_256) | \ LELEM(OAKLEY_ECDSA_SIG) | LELEM(OAKLEY_ECDSA_256) | \
LELEM(OAKLEY_ECDSA_384) | LELEM(OAKLEY_ECDSA_512)) LELEM(OAKLEY_ECDSA_384) | LELEM(OAKLEY_ECDSA_521))
#define SMF_PKE_AUTH (LELEM(OAKLEY_RSA_ENC) | LELEM(OAKLEY_ELGAMAL_ENC)) #define SMF_PKE_AUTH (LELEM(OAKLEY_RSA_ENC) | LELEM(OAKLEY_ELGAMAL_ENC))
#define SMF_RPKE_AUTH (LELEM(OAKLEY_RSA_ENC_REV) | LELEM(OAKLEY_ELGAMAL_ENC_REV)) #define SMF_RPKE_AUTH (LELEM(OAKLEY_RSA_ENC_REV) | LELEM(OAKLEY_ELGAMAL_ENC_REV))
src/pluto/ike_alg.c
+1 -1
View File
@@ -214,7 +214,7 @@ struct db_context *ike_alg_db_new(struct connection *c, lset_t policy)
auth_method = OAKLEY_ECDSA_384; auth_method = OAKLEY_ECDSA_384;
break; break;
case 66: case 66:
auth_method = OAKLEY_ECDSA_512; auth_method = OAKLEY_ECDSA_521;
break; break;
default: default:
continue; continue;
src/pluto/ipsec_doi.c
+4 -4
View File
@@ -1210,7 +1210,7 @@ static bool generate_skeyids_iv(struct state *st)
case OAKLEY_RSA_SIG: case OAKLEY_RSA_SIG:
case OAKLEY_ECDSA_256: case OAKLEY_ECDSA_256:
case OAKLEY_ECDSA_384: case OAKLEY_ECDSA_384:
case OAKLEY_ECDSA_512: case OAKLEY_ECDSA_521:
case XAUTHInitRSA: case XAUTHInitRSA:
case XAUTHRespRSA: case XAUTHRespRSA:
if (!skeyid_digisig(st)) if (!skeyid_digisig(st))
@@ -1377,7 +1377,7 @@ static bool generate_skeyids_iv(struct state *st)
case OAKLEY_ECDSA_384: case OAKLEY_ECDSA_384:
prf_alg = PRF_HMAC_SHA2_384; prf_alg = PRF_HMAC_SHA2_384;
break; break;
case OAKLEY_ECDSA_512: case OAKLEY_ECDSA_521:
prf_alg = PRF_HMAC_SHA2_512; prf_alg = PRF_HMAC_SHA2_512;
break; break;
default: default:
@@ -2797,7 +2797,7 @@ static bool uses_pubkey_auth(int auth)
case OAKLEY_ECDSA_SIG: case OAKLEY_ECDSA_SIG:
case OAKLEY_ECDSA_256: case OAKLEY_ECDSA_256:
case OAKLEY_ECDSA_384: case OAKLEY_ECDSA_384:
case OAKLEY_ECDSA_512: case OAKLEY_ECDSA_521:
case XAUTHInitRSA: case XAUTHInitRSA:
case XAUTHRespRSA: case XAUTHRespRSA:
return TRUE; return TRUE;
@@ -3667,7 +3667,7 @@ main_id_and_auth(struct msg_digest *md
case OAKLEY_ECDSA_256: case OAKLEY_ECDSA_256:
case OAKLEY_ECDSA_384: case OAKLEY_ECDSA_384:
case OAKLEY_ECDSA_512: case OAKLEY_ECDSA_521:
r = check_signature(KEY_ECDSA, &peer, st, hash, r = check_signature(KEY_ECDSA, &peer, st, hash,
&md->chain[ISAKMP_NEXT_SIG]->pbs, &md->chain[ISAKMP_NEXT_SIG]->pbs,
#ifdef USE_KEYRR #ifdef USE_KEYRR
src/pluto/spdb.c
+2 -2
View File
@@ -796,7 +796,7 @@ parse_isakmp_policy(pb_stream *proposal_pbs
case OAKLEY_RSA_SIG: case OAKLEY_RSA_SIG:
case OAKLEY_ECDSA_256: case OAKLEY_ECDSA_256:
case OAKLEY_ECDSA_384: case OAKLEY_ECDSA_384:
case OAKLEY_ECDSA_512: case OAKLEY_ECDSA_521:
*policy |= POLICY_PUBKEY; *policy |= POLICY_PUBKEY;
break; break;
case XAUTHInitPreShared: case XAUTHInitPreShared:
@@ -1014,7 +1014,7 @@ parse_isakmp_sa_body(u_int32_t ipsecdoisit
case OAKLEY_RSA_SIG: case OAKLEY_RSA_SIG:
case OAKLEY_ECDSA_256: case OAKLEY_ECDSA_256:
case OAKLEY_ECDSA_384: case OAKLEY_ECDSA_384:
case OAKLEY_ECDSA_512: case OAKLEY_ECDSA_521:
if ((iap & POLICY_PUBKEY) == LEMPTY) if ((iap & POLICY_PUBKEY) == LEMPTY)
{ {
ugh = "policy does not allow public key authentication"; ugh = "policy does not allow public key authentication";