Skip to content
Snippets Groups Projects
Commit 3fc24faf authored by Stepan Salenikovich's avatar Stepan Salenikovich Committed by gerrit2
Browse files

tlsmethodmodel: remove SSLv3

This encryption type is no longer supported.

Change-Id: If74633ecc8df17b7515fe080620009489a9fb54e
Tuleap: #831
parent 67624a8d
No related branches found
No related tags found
No related merge requests found
...@@ -40,7 +40,6 @@ public: ...@@ -40,7 +40,6 @@ public:
constexpr static const char* TLSv1 = "TLSv1" ; constexpr static const char* TLSv1 = "TLSv1" ;
constexpr static const char* TLSv1_1 = "TLSv1.1"; constexpr static const char* TLSv1_1 = "TLSv1.1";
constexpr static const char* TLSv1_2 = "TLSv1.2"; constexpr static const char* TLSv1_2 = "TLSv1.2";
constexpr static const char* SSLv3 = "SSLv3" ;
}; };
...@@ -50,7 +49,6 @@ public: ...@@ -50,7 +49,6 @@ public:
constexpr static const char* TLSv1 = "TLSv1" ; constexpr static const char* TLSv1 = "TLSv1" ;
constexpr static const char* TLSv1_1 = "TLSv1.1"; constexpr static const char* TLSv1_1 = "TLSv1.1";
constexpr static const char* TLSv1_2 = "TLSv1.2"; constexpr static const char* TLSv1_2 = "TLSv1.2";
constexpr static const char* SSLv3 = "SSLv3" ;
}; };
static const char* toDaemonName(TlsMethodModel::Type type); static const char* toDaemonName(TlsMethodModel::Type type);
...@@ -112,16 +110,18 @@ QVariant TlsMethodModel::data( const QModelIndex& index, int role) const ...@@ -112,16 +110,18 @@ QVariant TlsMethodModel::data( const QModelIndex& index, int role) const
return TlsMethodModelPrivate::Name::TLSv1_1; return TlsMethodModelPrivate::Name::TLSv1_1;
case TlsMethodModel::Type::TLSv1_2: case TlsMethodModel::Type::TLSv1_2:
return TlsMethodModelPrivate::Name::TLSv1_2; return TlsMethodModelPrivate::Name::TLSv1_2;
case TlsMethodModel::Type::SSLv3: case TlsMethodModel::Type::COUNT__:
return TlsMethodModelPrivate::Name::SSLv3; break;
}; };
} }
return QVariant(); return QVariant();
} }
int TlsMethodModel::rowCount( const QModelIndex& parent ) const int TlsMethodModel::rowCount( const QModelIndex& parent ) const
{ {
return parent.isValid()?0: d_ptr->isRing ? 1 : 4; // In the RING case, only the "default" encryption type can be used
return parent.isValid() ? 0 : d_ptr->isRing ? 1 : static_cast<int>(TlsMethodModel::Type::COUNT__);
} }
Qt::ItemFlags TlsMethodModel::flags( const QModelIndex& index ) const Qt::ItemFlags TlsMethodModel::flags( const QModelIndex& index ) const
...@@ -181,8 +181,9 @@ const char* TlsMethodModelPrivate::toDaemonName(TlsMethodModel::Type type) ...@@ -181,8 +181,9 @@ const char* TlsMethodModelPrivate::toDaemonName(TlsMethodModel::Type type)
return TlsMethodModelPrivate::DaemonName::TLSv1_1; return TlsMethodModelPrivate::DaemonName::TLSv1_1;
case TlsMethodModel::Type::TLSv1_2: case TlsMethodModel::Type::TLSv1_2:
return TlsMethodModelPrivate::DaemonName::TLSv1_2; return TlsMethodModelPrivate::DaemonName::TLSv1_2;
case TlsMethodModel::Type::SSLv3: case TlsMethodModel::Type::COUNT__:
return TlsMethodModelPrivate::DaemonName::SSLv3; // default
break;
}; };
return TlsMethodModelPrivate::DaemonName::DEFAULT; return TlsMethodModelPrivate::DaemonName::DEFAULT;
} }
...@@ -198,8 +199,6 @@ TlsMethodModel::Type TlsMethodModelPrivate::fromDaemonName(const QString& name) ...@@ -198,8 +199,6 @@ TlsMethodModel::Type TlsMethodModelPrivate::fromDaemonName(const QString& name)
return TlsMethodModel::Type::TLSv1_1; return TlsMethodModel::Type::TLSv1_1;
else if (name == TlsMethodModelPrivate::DaemonName::TLSv1_2) else if (name == TlsMethodModelPrivate::DaemonName::TLSv1_2)
return TlsMethodModel::Type::TLSv1_2; return TlsMethodModel::Type::TLSv1_2;
else if (name == TlsMethodModelPrivate::DaemonName::SSLv3)
return TlsMethodModel::Type::SSLv3;
qDebug() << "Unknown TLS method" << name; qDebug() << "Unknown TLS method" << name;
return TlsMethodModel::Type::DEFAULT; return TlsMethodModel::Type::DEFAULT;
} }
......
...@@ -46,7 +46,7 @@ public: ...@@ -46,7 +46,7 @@ public:
TLSv1_0 = 1, TLSv1_0 = 1,
TLSv1_1 = 2, TLSv1_1 = 2,
TLSv1_2 = 3, TLSv1_2 = 3,
SSLv3 = 4, COUNT__
}; };
//Private constructor, can only be called by 'Account' //Private constructor, can only be called by 'Account'
...@@ -70,4 +70,3 @@ private: ...@@ -70,4 +70,3 @@ private:
}; };
Q_DECLARE_METATYPE(TlsMethodModel*) Q_DECLARE_METATYPE(TlsMethodModel*)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment