aboutsummaryrefslogtreecommitdiff
path: root/id/server/doc/handbook/config/config.html
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-05-09 12:31:39 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-05-09 12:31:39 +0200
commit408246a7cd0f8931f224d9d4d8e4469ab7bc6a21 (patch)
tree9726e6807e9cc0ca4b7603068f314a31a14349d1 /id/server/doc/handbook/config/config.html
parentbb06ad890498e2428c3f4268ae2f732a0f75bd77 (diff)
parent719b06ae04a8d96bf24268a4e25a0cd7b0768e95 (diff)
downloadmoa-id-spss-408246a7cd0f8931f224d9d4d8e4469ab7bc6a21.tar.gz
moa-id-spss-408246a7cd0f8931f224d9d4d8e4469ab7bc6a21.tar.bz2
moa-id-spss-408246a7cd0f8931f224d9d4d8e4469ab7bc6a21.zip
merge SSO interfederation into Snapshot branch
Conflicts: id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
Diffstat (limited to 'id/server/doc/handbook/config/config.html')
-rw-r--r--id/server/doc/handbook/config/config.html10
1 files changed, 10 insertions, 0 deletions
diff --git a/id/server/doc/handbook/config/config.html b/id/server/doc/handbook/config/config.html
index 21d146b4d..57ed9a760 100644
--- a/id/server/doc/handbook/config/config.html
+++ b/id/server/doc/handbook/config/config.html
@@ -713,6 +713,16 @@ https://&lt;host&gt;:&lt;port&gt;/moa-id-auth/MonitoringServlet</pre>
<td>password</td>
<td>Passwort des Schl&uuml;ssels mit dem die PVP 2.1 Assertion durch MOA-ID-Auth unterschieben wird</td>
</tr>
+ <tr>
+ <td>protocols.pvp2.sp.ks.assertion.encryption.alias</td>
+ <td>pvp_encryption</td>
+ <td>Name des Schl&uuml;ssels mit dem PVP 2.1 Assertion f&uuml;r MOA-ID-Auth als Service Provider durch einen weiteren IDP Verschl&uuml;sselt werden sollen (siehe Kapitel <a href="./../interfederation/interfederation.html">Interfederation</a>)</td>
+ </tr>
+ <tr>
+ <td>protocols.pvp2.sp.ks.assertion.encryption.keypassword</td>
+ <td>password</td>
+ <td>Passwort des Schl&uuml;ssels mit dem PVP 2.1 Assertion f&uuml;r MOA-ID-Auth als Service Provider durch einen weiteren IDP Verschl&uuml;sselt werden sollen (siehe Kapitel <a href="./../interfederation/interfederation.html">Interfederation</a>)</td>
+ </tr>
</table>
<p>&nbsp;</p>
<h5><a name="basisconfig_moa_id_auth_param_protocol_openid" id="uebersicht_bekanntmachung11"></a>2.2.2.3.2 OpenID Connect</h5>