diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2007-03-06 13:49:07 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2007-03-06 13:49:07 +0000 |
| commit | b7b8eb498c5b7e0099b969fddbbb5385e40c5be7 (patch) | |
| tree | eefa85a9f759b1891bb817ce3d94ad4a1e82c300 /net-im/silc-server/files | |
| parent | typo (diff) | |
| download | gentoo-2-b7b8eb498c5b7e0099b969fddbbb5385e40c5be7.tar.gz gentoo-2-b7b8eb498c5b7e0099b969fddbbb5385e40c5be7.tar.bz2 gentoo-2-b7b8eb498c5b7e0099b969fddbbb5385e40c5be7.zip | |
Revbump wrt security bug 169599
(Portage version: 2.1.2.1)
Diffstat (limited to 'net-im/silc-server/files')
| -rw-r--r-- | net-im/silc-server/files/digest-silc-server-1.0.2-r1 | 3 | ||||
| -rw-r--r-- | net-im/silc-server/files/silc-server-1.0.2-join-hmac.patch | 84 |
2 files changed, 87 insertions, 0 deletions
diff --git a/net-im/silc-server/files/digest-silc-server-1.0.2-r1 b/net-im/silc-server/files/digest-silc-server-1.0.2-r1 new file mode 100644 index 000000000000..34466545eb0e --- /dev/null +++ b/net-im/silc-server/files/digest-silc-server-1.0.2-r1 @@ -0,0 +1,3 @@ +MD5 a55b86783cc6b502e80fcbe73e698329 silc-server-1.0.2.tar.bz2 890357 +RMD160 9108b64761e01f7e3877f6c9a207ae45046cab21 silc-server-1.0.2.tar.bz2 890357 +SHA256 37812c18a7221fe4ff87ef31a28ba9de97a3b722d7507c14ed0552cee20559b3 silc-server-1.0.2.tar.bz2 890357 diff --git a/net-im/silc-server/files/silc-server-1.0.2-join-hmac.patch b/net-im/silc-server/files/silc-server-1.0.2-join-hmac.patch new file mode 100644 index 000000000000..b5e6061c1590 --- /dev/null +++ b/net-im/silc-server/files/silc-server-1.0.2-join-hmac.patch @@ -0,0 +1,84 @@ +diff -ur silc-server-1.0.2.orig/apps/silcd/command.c silc-server-1.0.2/apps/silcd/command.c +--- silc-server-1.0.2.orig/apps/silcd/command.c 2007-03-06 11:21:40.000000000 +0100 ++++ silc-server-1.0.2/apps/silcd/command.c 2007-03-06 13:33:28.000000000 +0100 +@@ -2441,10 +2441,22 @@ + channel = silc_server_create_new_channel(server, server->id, cipher, + hmac, channel_name, TRUE); + if (!channel) { +- silc_server_command_send_status_data( +- cmd, SILC_COMMAND_JOIN, +- SILC_STATUS_ERR_UNKNOWN_ALGORITHM, +- 0, 2, cipher, strlen(cipher)); ++ if (cipher) { ++ silc_server_command_send_status_data( ++ cmd, SILC_COMMAND_JOIN, ++ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, ++ 0, 2, cipher, strlen(cipher)); ++ } else if (hmac) { ++ silc_server_command_send_status_data( ++ cmd, SILC_COMMAND_JOIN, ++ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, ++ 0, 2, hmac, strlen(hmac)); ++ } else { ++ silc_server_command_send_status_reply( ++ cmd, SILC_COMMAND_JOIN, ++ SILC_STATUS_ERR_RESOURCE_LIMIT, ++ 0); ++ } + silc_free(client_id); + goto out; + } +@@ -2505,10 +2517,22 @@ + channel = silc_server_create_new_channel(server, server->id, cipher, + hmac, channel_name, TRUE); + if (!channel) { +- silc_server_command_send_status_data( +- cmd, SILC_COMMAND_JOIN, +- SILC_STATUS_ERR_UNKNOWN_ALGORITHM, 0, +- 2, cipher, strlen(cipher)); ++ if (cipher) { ++ silc_server_command_send_status_data( ++ cmd, SILC_COMMAND_JOIN, ++ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, ++ 0, 2, cipher, strlen(cipher)); ++ } else if (hmac) { ++ silc_server_command_send_status_data( ++ cmd, SILC_COMMAND_JOIN, ++ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, ++ 0, 2, hmac, strlen(hmac)); ++ } else { ++ silc_server_command_send_status_reply( ++ cmd, SILC_COMMAND_JOIN, ++ SILC_STATUS_ERR_RESOURCE_LIMIT, ++ 0); ++ } + silc_free(client_id); + goto out; + } +@@ -2541,10 +2565,22 @@ + channel = silc_server_create_new_channel(server, server->id, cipher, + hmac, channel_name, TRUE); + if (!channel) { +- silc_server_command_send_status_data( +- cmd, SILC_COMMAND_JOIN, +- SILC_STATUS_ERR_UNKNOWN_ALGORITHM, 0, +- 2, cipher, strlen(cipher)); ++ if (cipher) { ++ silc_server_command_send_status_data( ++ cmd, SILC_COMMAND_JOIN, ++ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, ++ 0, 2, cipher, strlen(cipher)); ++ } else if (hmac) { ++ silc_server_command_send_status_data( ++ cmd, SILC_COMMAND_JOIN, ++ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, ++ 0, 2, hmac, strlen(hmac)); ++ } else { ++ silc_server_command_send_status_reply( ++ cmd, SILC_COMMAND_JOIN, ++ SILC_STATUS_ERR_RESOURCE_LIMIT, ++ 0); ++ } + silc_free(client_id); + goto out; + } |