Replace 'inacceptable' with the more common 'unacceptable'
authorTobias Brunner <tobias@strongswan.org>
Tue, 29 May 2018 16:27:16 +0000 (18:27 +0200)
committerTobias Brunner <tobias@strongswan.org>
Thu, 28 Jun 2018 16:46:42 +0000 (18:46 +0200)
12 files changed:
src/libcharon/sa/ikev1/tasks/xauth.c
src/libcharon/sa/ikev2/tasks/child_create.c
src/libcharon/sa/ikev2/tasks/ike_auth.c
src/libcharon/sa/ikev2/tasks/ike_init.c
src/libcharon/sa/ikev2/tasks/ike_rekey.c
src/libpttls/pt_tls_client.c
src/libtls/tls_peer.c
src/libtls/tls_server.c
testing/tests/ikev2/multi-level-ca-ldap/evaltest.dat
testing/tests/ikev2/multi-level-ca/evaltest.dat
testing/tests/swanctl/multi-level-ca/evaltest.dat
testing/tests/swanctl/ocsp-multi-level/evaltest.dat

index 968b438..bec2cfe 100644 (file)
@@ -226,7 +226,7 @@ static bool select_compliant_config(private_xauth_t *this)
        {       /* current config is fine */
                return TRUE;
        }
-       DBG1(DBG_CFG, "selected peer config '%s' inacceptable",
+       DBG1(DBG_CFG, "selected peer config '%s' unacceptable",
                 old->get_name(old));
        aggressive = old->use_aggressive(old);
 
index 15bd624..c7eb0c8 100644 (file)
@@ -499,8 +499,8 @@ static linked_list_t* narrow_ts(private_child_create_t *this, bool local,
 /**
  * Install a CHILD_SA for usage, return value:
  * - FAILED: no acceptable proposal
- * - INVALID_ARG: diffie hellman group inacceptable
- * - NOT_FOUND: TS inacceptable
+ * - INVALID_ARG: diffie hellman group unacceptable
+ * - NOT_FOUND: TS unacceptable
  */
 static status_t select_and_install(private_child_create_t *this,
                                                                   bool no_dh, bool ike_auth)
@@ -561,7 +561,7 @@ static status_t select_and_install(private_child_create_t *this,
                if (this->proposal->get_algorithm(this->proposal, DIFFIE_HELLMAN_GROUP,
                                                                                  &group, NULL))
                {
-                       DBG1(DBG_IKE, "DH group %N inacceptable, requesting %N",
+                       DBG1(DBG_IKE, "DH group %N unacceptable, requesting %N",
                                 diffie_hellman_group_names, this->dh_group,
                                 diffie_hellman_group_names, group);
                        this->dh_group = group;
@@ -1358,7 +1358,7 @@ METHOD(task_t, build_r, status_t,
        }
        if (this->config == NULL)
        {
-               DBG1(DBG_IKE, "traffic selectors %#R === %#R inacceptable",
+               DBG1(DBG_IKE, "traffic selectors %#R === %#R unacceptable",
                         this->tsr, this->tsi);
                charon->bus->alert(charon->bus, ALERT_TS_MISMATCH, this->tsi, this->tsr);
                message->add_notify(message, FALSE, TS_UNACCEPTABLE, chunk_empty);
index 96405f2..5e284bc 100644 (file)
@@ -382,7 +382,7 @@ static bool update_cfg_candidates(private_ike_auth_t *this, bool strict)
                        {
                                break;
                        }
-                       DBG1(DBG_CFG, "selected peer config '%s' inacceptable: %s",
+                       DBG1(DBG_CFG, "selected peer config '%s' unacceptable: %s",
                                 this->peer_cfg->get_name(this->peer_cfg), comply_error);
                        this->peer_cfg->destroy(this->peer_cfg);
                }
@@ -616,7 +616,7 @@ METHOD(task_t, process_r, status_t,
                                        (uintptr_t)cand->get(cand, AUTH_RULE_EAP_TYPE) == EAP_NAK &&
                                        (uintptr_t)cand->get(cand, AUTH_RULE_EAP_VENDOR) == 0))
                        {       /* peer requested EAP, but current config does not match */
-                               DBG1(DBG_IKE, "peer requested EAP, config inacceptable");
+                               DBG1(DBG_IKE, "peer requested EAP, config unacceptable");
                                this->peer_cfg->destroy(this->peer_cfg);
                                this->peer_cfg = NULL;
                                if (!update_cfg_candidates(this, FALSE))
index 09744a7..295d4e9 100644 (file)
@@ -742,7 +742,7 @@ METHOD(task_t, build_r, status_t,
        if (this->proposal == NULL ||
                this->other_nonce.len == 0 || this->my_nonce.len == 0)
        {
-               DBG1(DBG_IKE, "received proposals inacceptable");
+               DBG1(DBG_IKE, "received proposals unacceptable");
                message->add_notify(message, TRUE, NO_PROPOSAL_CHOSEN, chunk_empty);
                return FAILED;
        }
@@ -771,7 +771,7 @@ METHOD(task_t, build_r, status_t,
                if (this->proposal->get_algorithm(this->proposal, DIFFIE_HELLMAN_GROUP,
                                                                                  &group, NULL))
                {
-                       DBG1(DBG_IKE, "DH group %N inacceptable, requesting %N",
+                       DBG1(DBG_IKE, "DH group %N unacceptable, requesting %N",
                                 diffie_hellman_group_names, this->dh_group,
                                 diffie_hellman_group_names, group);
                        this->dh_group = group;
index 11123b4..57f9a79 100644 (file)
@@ -259,7 +259,7 @@ METHOD(task_t, build_r, status_t,
        }
        if (this->new_sa == NULL)
        {
-               /* IKE_SA/a CHILD_SA is in an inacceptable state, deny rekeying */
+               /* IKE_SA/a CHILD_SA is in an unacceptable state, deny rekeying */
                message->add_notify(message, TRUE, NO_PROPOSAL_CHOSEN, chunk_empty);
                return SUCCESS;
        }
index 1679188..265a4a0 100644 (file)
@@ -225,7 +225,7 @@ static status_t do_sasl(private_pt_tls_client_t *this, sasl_mechanism_t *sasl)
                                                                reader->destroy(reader);
                                                                return SUCCESS;
                                                        case NEED_MORE:
-                                                               /* inacceptable, it won't get more. FALL */
+                                                               /* unacceptable, it won't get more. FALL */
                                                        case FAILED:
                                                        default:
                                                                reader->destroy(reader);
index 2ba6dd2..1f2439c 100644 (file)
@@ -188,7 +188,7 @@ static status_t process_server_hello(private_tls_peer_t *this,
                suite = cipher;
                if (!this->crypto->select_cipher_suite(this->crypto, &suite, 1, KEY_ANY))
                {
-                       DBG1(DBG_TLS, "received TLS cipher suite %N inacceptable",
+                       DBG1(DBG_TLS, "received TLS cipher suite %N unacceptable",
                                 tls_cipher_suite_names, suite);
                        this->alert->add(this->alert, TLS_FATAL, TLS_HANDSHAKE_FAILURE);
                        return NEED_MORE;
index 422211a..70d17f2 100644 (file)
@@ -190,7 +190,7 @@ static bool select_suite_and_key(private_tls_server_t *this,
                                                                                        suites, count, type);
                if (!this->suite)
                {
-                       DBG1(DBG_TLS, "received cipher suites inacceptable");
+                       DBG1(DBG_TLS, "received cipher suites unacceptable");
                        return FALSE;
                }
                this->server_auth->destroy(this->server_auth);
@@ -199,7 +199,7 @@ static bool select_suite_and_key(private_tls_server_t *this,
                                                                                this->server_auth);
                if (!key)
                {
-                       DBG1(DBG_TLS, "received cipher suites inacceptable");
+                       DBG1(DBG_TLS, "received cipher suites unacceptable");
                        return FALSE;
                }
        }
index 4abcde1..49271bd 100644 (file)
@@ -10,7 +10,7 @@ carol::cat /var/log/daemon.log::received TS_UNACCEPTABLE notify, no CHILD_SA bui
 carol::ipsec status 2> /dev/null::venus.*INSTALLED::NO
 moon:: ipsec status 2> /dev/null::venus.*ESTABLISHED.*moon.strongswan.org.*carol@strongswan.org::NO
 moon:: cat /var/log/daemon.log::constraint check failed: peer not authenticated by.*Research CA::YES
-moon:: cat /var/log/daemon.log::selected peer config.*alice.*inacceptable::YES
+moon:: cat /var/log/daemon.log::selected peer config.*alice.*unacceptable::YES
 moon:: cat /var/log/daemon.log::switching to peer config.*venus::YES
 dave:: ipsec status 2> /dev/null::venus.*INSTALLED, TUNNEL::YES
 moon:: ipsec status 2> /dev/null::venus.*ESTABLISHED.*moon.strongswan.org.*dave@strongswan.org::YES
index e1c5be4..10da97f 100644 (file)
@@ -10,7 +10,7 @@ carol::cat /var/log/daemon.log::received TS_UNACCEPTABLE notify, no CHILD_SA bui
 carol::ipsec status 2> /dev/null::venus.*INSTALLED::NO
 moon:: ipsec status 2> /dev/null::venus.*ESTABLISHED.*carol@strongswan.org::NO
 moon:: cat /var/log/daemon.log::constraint check failed: peer not authenticated by.*Research CA::YES
-moon:: cat /var/log/daemon.log::selected peer config.*alice.*inacceptable::YES
+moon:: cat /var/log/daemon.log::selected peer config.*alice.*unacceptable::YES
 moon:: cat /var/log/daemon.log::switching to peer config.*venus::YES
 dave:: ipsec status 2> /dev/null::venus.*INSTALLED, TUNNEL::YES
 moon:: ipsec status 2> /dev/null::venus.*ESTABLISHED.*dave@strongswan.org::YES
index 050a35d..e6ec6b2 100644 (file)
@@ -11,7 +11,7 @@ carol::swanctl --list-sas --raw 2> /dev/null::home.*version=2 state=ESTABLISHED.
 moon:: swanctl --list-sas --raw 2> /dev/null::sales.*version=2 state=ESTABLISHED.*remote-host=192.168.0.100 remote-port=4500 remote-id=carol@strongswan.org.*child-sas.*venus.*state=INSTALLED::NO
 dave:: cat /var/log/daemon.log::received TS_UNACCEPTABLE notify, no CHILD_SA built::YES
 moon:: cat /var/log/daemon.log::constraint check failed: peer not authenticated by.*Research CA::YES
-moon:: cat /var/log/daemon.log::selected peer config.*research.*inacceptable::YES
+moon:: cat /var/log/daemon.log::selected peer config.*research.*unacceptable::YES
 moon:: cat /var/log/daemon.log::switching to peer config.*sales::YES
 dave:: swanctl --list-sas --raw 2> /dev/null::home.*version=2 state=ESTABLISHED.*child-sas.*alice.*state=INSTALLED::NO
 moon:: swanctl --list-sas --raw 2> /dev/null::research.*version=2 state=ESTABLISHED.*remote-host=192.168.0.100 remote-port=4500 remote-id=dave@strongswan.org.*child-sas.*alice.*state=INSTALLED::NO
index 2f3c346..87ef431 100644 (file)
@@ -18,7 +18,7 @@ carol::swanctl --list-sas --raw 2> /dev/null::home.*version=2 state=ESTABLISHED.
 moon:: swanctl --list-sas --raw 2> /dev/null::sales.*version=2 state=ESTABLISHED.*remote-host=192.168.0.100 remote-port=4500 remote-id=carol@strongswan.org.*child-sas.*venus.*state=INSTALLED::NO
 dave:: cat /var/log/daemon.log::received TS_UNACCEPTABLE notify, no CHILD_SA built::YES
 moon:: cat /var/log/daemon.log::constraint check failed: peer not authenticated by.*Research CA::YES
-moon:: cat /var/log/daemon.log::selected peer config.*research.*inacceptable::YES
+moon:: cat /var/log/daemon.log::selected peer config.*research.*unacceptable::YES
 moon:: cat /var/log/daemon.log::switching to peer config.*sales::YES
 dave:: swanctl --list-sas --raw 2> /dev/null::home.*version=2 state=ESTABLISHED.*child-sas.*alice.*state=INSTALLED::NO
 moon:: swanctl --list-sas --raw 2> /dev/null::research.*version=2 state=ESTABLISHED.*remote-host=192.168.0.100 remote-port=4500 remote-id=dave@strongswan.org.*child-sas.*alice.*state=INSTALLED::NO