renamed OAKLEY_ECDSA_512 to OAKLEY_ECDSA_512
authorAndreas Steffen <andreas.steffen@strongswan.org>
Sat, 13 Jun 2009 13:16:49 +0000 (15:16 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Sat, 13 Jun 2009 13:16:49 +0000 (15:16 +0200)
src/pluto/connections.c
src/pluto/constants.c
src/pluto/constants.h
src/pluto/crypto.c
src/pluto/demux.c
src/pluto/ike_alg.c
src/pluto/ipsec_doi.c
src/pluto/spdb.c

index 5e2ed39..4deb722 100644 (file)
@@ -3317,7 +3317,7 @@ refine_host_connection(const struct state *st, const struct id *peer_id
        case OAKLEY_RSA_SIG:
        case OAKLEY_ECDSA_256:
        case OAKLEY_ECDSA_384:
-       case OAKLEY_ECDSA_512:
+       case OAKLEY_ECDSA_521:
                auth_policy = POLICY_PUBKEY;
                break;
        case XAUTHInitRSA:
@@ -3406,7 +3406,7 @@ refine_host_connection(const struct state *st, const struct id *peer_id
                        case OAKLEY_RSA_SIG:
                        case OAKLEY_ECDSA_256:
                        case OAKLEY_ECDSA_384:
-                       case OAKLEY_ECDSA_512:
+                       case OAKLEY_ECDSA_521:
                        case XAUTHInitRSA:
                        case XAUTHRespRSA:
                                /*
index f96134b..5421590 100644 (file)
@@ -848,17 +848,17 @@ enum_names oakley_hash_names =
 /* Oakley Authentication Method attribute */
 
 static const char *const oakley_auth_name1[] = {
-       "PRESHARED_KEY",
-       "DSS_SIG",
-       "RSA_SIG",
-       "RSA_ENC",
-       "RSA_ENC_REV",
-       "ELGAMAL_ENC",
-       "ELGAMAL_ENC_REV",
-       "ECDSA_SIG",
-       "ECDSA_256_SIG",
-       "ECDSA_384_SIG",
-       "ECDSA_512_SIG",   
+       "pre-shared key",
+       "DSS signature",
+       "RSA_signatue",
+       "RSA encryption",
+       "RSA encryption revised",
+       "ElGamal encryption",
+       "ELGamal encryption revised",
+       "ECDSA signature",
+       "ECDSA-256 signature",
+       "ECDSA-384 signature",
+       "ECDSA-521-signature",   
 };
 
 static const char *const oakley_auth_name2[] = {
@@ -882,7 +882,7 @@ static const char *const oakley_auth_name3[] = {
 };
 
 static enum_names oakley_auth_names1 =
-       { OAKLEY_PRESHARED_KEY, OAKLEY_ECDSA_512
+       { OAKLEY_PRESHARED_KEY, OAKLEY_ECDSA_521
                , oakley_auth_name1, NULL };
 
 static enum_names oakley_auth_names2 =
index 84c7b1d..5fe936e 100644 (file)
@@ -981,7 +981,7 @@ extern enum_names oakley_auth_names;
 #define OAKLEY_ECDSA_SIG           8
 #define OAKLEY_ECDSA_256           9
 #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 */
 
index 8140030..d463473 100644 (file)
@@ -271,7 +271,7 @@ signature_scheme_t oakley_to_signature_scheme(int method)
                        return SIGN_RSA_EMSA_PKCS1_NULL;
                case OAKLEY_ECDSA_256:
                case OAKLEY_ECDSA_384:
-               case OAKLEY_ECDSA_512:
+               case OAKLEY_ECDSA_521:
                        return SIGN_ECDSA_WITH_NULL;
                default:
                        return SIGN_UNKNOWN;
index 83bcffb..3cfc909 100644 (file)
@@ -190,7 +190,7 @@ struct state_microcode {
 #define SMF_PSK_AUTH    LELEM(OAKLEY_PRESHARED_KEY)
 #define SMF_DS_AUTH     (LELEM(OAKLEY_DSS_SIG)   | LELEM(OAKLEY_RSA_SIG)   | \
                                                 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_RPKE_AUTH   (LELEM(OAKLEY_RSA_ENC_REV) | LELEM(OAKLEY_ELGAMAL_ENC_REV))
 
index 17f9991..ee923c0 100644 (file)
@@ -214,7 +214,7 @@ struct db_context *ike_alg_db_new(struct connection *c, lset_t policy)
                                                        auth_method = OAKLEY_ECDSA_384;
                                                        break;
                                                case 66:
-                                                       auth_method = OAKLEY_ECDSA_512;
+                                                       auth_method = OAKLEY_ECDSA_521;
                                                        break;
                                                default:
                                                        continue;
index fd97ddd..929768e 100644 (file)
@@ -1210,7 +1210,7 @@ static bool generate_skeyids_iv(struct state *st)
                case OAKLEY_RSA_SIG:
                case OAKLEY_ECDSA_256:
                case OAKLEY_ECDSA_384:
-               case OAKLEY_ECDSA_512:
+               case OAKLEY_ECDSA_521:
                case XAUTHInitRSA:
                case XAUTHRespRSA:
                        if (!skeyid_digisig(st))
@@ -1377,7 +1377,7 @@ static bool generate_skeyids_iv(struct state *st)
                case OAKLEY_ECDSA_384:
                        prf_alg = PRF_HMAC_SHA2_384;
                        break;
-               case OAKLEY_ECDSA_512:
+               case OAKLEY_ECDSA_521:
                        prf_alg = PRF_HMAC_SHA2_512;
                        break;
                default:
@@ -2797,7 +2797,7 @@ static bool uses_pubkey_auth(int auth)
                case OAKLEY_ECDSA_SIG:
                case OAKLEY_ECDSA_256:
                case OAKLEY_ECDSA_384:
-               case OAKLEY_ECDSA_512:
+               case OAKLEY_ECDSA_521:
                case XAUTHInitRSA:
                case XAUTHRespRSA:
                        return TRUE;
@@ -3667,7 +3667,7 @@ main_id_and_auth(struct msg_digest *md
 
        case OAKLEY_ECDSA_256:
        case OAKLEY_ECDSA_384:
-       case OAKLEY_ECDSA_512:
+       case OAKLEY_ECDSA_521:
                r = check_signature(KEY_ECDSA, &peer, st, hash,
                                                        &md->chain[ISAKMP_NEXT_SIG]->pbs,
 #ifdef USE_KEYRR
index 630c7f8..b8f4a3c 100644 (file)
@@ -796,7 +796,7 @@ parse_isakmp_policy(pb_stream *proposal_pbs
                                case OAKLEY_RSA_SIG:
                                case OAKLEY_ECDSA_256:
                                case OAKLEY_ECDSA_384:
-                               case OAKLEY_ECDSA_512:
+                               case OAKLEY_ECDSA_521:
                                        *policy |= POLICY_PUBKEY;
                                        break;
                                case XAUTHInitPreShared:
@@ -1014,7 +1014,7 @@ parse_isakmp_sa_body(u_int32_t ipsecdoisit
                                        case OAKLEY_RSA_SIG:
                                        case OAKLEY_ECDSA_256:
                                        case OAKLEY_ECDSA_384:
-                                       case OAKLEY_ECDSA_512:
+                                       case OAKLEY_ECDSA_521:
                                                if ((iap & POLICY_PUBKEY) == LEMPTY)
                                                {
                                                        ugh = "policy does not allow public key authentication";