...
 
Commits (7)
  • Balázs Meskó's avatar
    Update Hungarian translation · 073855e8
    Balázs Meskó authored
    (cherry picked from commit 0aea5611)
    073855e8
  • Balázs Úr's avatar
    Update Hungarian translation · 7c634d0d
    Balázs Úr authored
    7c634d0d
  • Xavier Claessens's avatar
    Fix openssl detection when there is no pkg-config file · 6ea390c5
    Xavier Claessens authored
    Many SDK ship openssl headers and library without the .pc file, not only
    on Windows. In that case we also need to fallback to find
    the library and its headers.
    
    Simplify the check for header files by using new syntax from Meson
    0.50.0 that can search for a library and a set of headers in one call.
    
    Fix find_library() calls by removing the 'lib' prefix, because Meson
    already prepend it automatically, so it was searching for
    bogus 'liblibcrypto.so'.
    6ea390c5
  • Milo Casagrande's avatar
    Update Italian translation · 3ec05502
    Milo Casagrande authored
    (cherry picked from commit ea94dafa)
    3ec05502
  • Kukuh Syafaat's avatar
    Update Indonesian translation · b02799e0
    Kukuh Syafaat authored
    b02799e0
  • Michael Catanzaro's avatar
    Code style fix · 4df12ad3
    Michael Catanzaro authored
    4df12ad3
  • Michael Catanzaro's avatar
    gnutls: don't call failed() when rehandshaking · f53ae599
    Michael Catanzaro authored
    A rehandshake is not a real failure and should not result in the session
    being removed from the session cache. This is causing the client to fail
    to resume the session, causing the server to request the client cert
    again for rehandshakes, which is undesirable.
    
    When refactoring this code, I wasn't sure exactly where failed() should
    be called. I noticed it was not being called in many places where it
    really should have been, and overcorrected.
    
    Note that this also moves failed() to be a vfunc of GTlsConnectionGnutls
    instead of GTlsConnectionBase, since it's no longer called from Base and
    OpenSSL doesn't implement it anywhere.
    
    Fixes #84
    f53ae599
......@@ -2,7 +2,7 @@ project(
'glib-networking', 'c',
version: '2.60.2',
license: 'LGPL2.1+',
meson_version: '>= 0.47.0',
meson_version: '>= 0.50.0',
default_options: ['c_std=c11']
)
......@@ -83,44 +83,38 @@ if openssl_option.disabled()
openssl_dep = []
else
# XXX: https://github.com/mesonbuild/meson/issues/2945
openssl_dep = dependency('openssl', required: openssl_option.enabled() and cc.get_id() != 'msvc')
openssl_dep = dependency('openssl', required: false)
if openssl_dep.found()
backends += ['openssl']
elif cc.get_id() == 'msvc' and not openssl_option.disabled()
else
# MSVC builds of OpenSSL does not generate pkg-config files,
# so we check for it manually here in this case, if we can't find those files
# Based on the CMake check for OpenSSL in CURL's CMakeLists.txt,
# on which headers we should check for
have_openssl = true
openssl_headers = []
foreach h : ['crypto.h', 'engine.h', 'err.h', 'pem.h',
'rsa.h', 'ssl.h', 'x509.h', 'rand.h', 'tls1.h']
header = 'openssl/' + h
if not cc.has_header(header)
have_openssl = false
if openssl_option.enabled()
error('openssl module is enabled and @0@ not found'.format(header))
endif
endif
openssl_headers += 'openssl/' + h
endforeach
# OpenSSL 1.1.x and 1.0.x (or earlier) have different .lib names,
# so we need to look for the correct pair
# Find either libcrypto.lib (1.1.x) or libeay32.lib (1.0.x or earlier) first
libcrypto_dep = cc.find_library('libcrypto', required: false)
libcrypto_dep = cc.find_library('crypto', required: false)
if libcrypto_dep.found()
libssl = 'libssl'
libssl = 'ssl'
else
libcrypto_dep = cc.find_library('libeay32', required: openssl_option)
libcrypto_dep = cc.find_library('eay32', required: openssl_option)
libssl = 'ssleay32'
endif
if libcrypto_dep.found()
# Find the corresponding SSL library depending on which crypto .lib we found
libssl_dep = cc.find_library(libssl, required: openssl_option)
libssl_dep = cc.find_library(libssl, required: openssl_option, has_headers: openssl_headers)
endif
if libcrypto_dep.found() and have_openssl
if libcrypto_dep.found() and libssl_dep.found()
openssl_dep = [libcrypto_dep, libssl_dep]
backends += ['openssl']
endif
......
......@@ -3,191 +3,185 @@
# This file is distributed under the same license as the glib-networking package.
#
# Gabor Kelemen <kelemeng at gnome dot hu>, 2011, 2012.
# Balázs Úr <urbalazs at gmail dot com>, 2012, 2017, 2018, 2019.
# Balázs Úr <ur.balazs at fsf dot hu>, 2012, 2017, 2018, 2019.
msgid ""
msgstr ""
"Project-Id-Version: glib-networking master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib-networking/"
"issues\n"
"POT-Creation-Date: 2019-03-02 02:19+0000\n"
"PO-Revision-Date: 2019-03-03 20:37+0100\n"
"Last-Translator: Meskó Balázs <mesko.balazs@fsf.hu>\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib-networking/issues\n"
"POT-Creation-Date: 2019-06-01 11:13+0000\n"
"PO-Revision-Date: 2019-06-01 17:02+0200\n"
"Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n"
"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.2.1\n"
"X-Generator: Lokalize 18.12.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: proxy/libproxy/glibproxyresolver.c:159
msgid "Proxy resolver internal error."
msgstr "Proxyfeloldó belső hiba."
#: tls/base/gtlsconnection-base.c:282 tls/base/gtlsinputstream-base.c:74
#: tls/base/gtlsoutputstream-base.c:74 tls/gnutls/gtlsconnection-gnutls.c:740
#: tls/gnutls/gtlsinputstream-gnutls.c:78
#: tls/gnutls/gtlsinputstream-gnutls.c:141
#: tls/gnutls/gtlsoutputstream-gnutls.c:78
#: tls/gnutls/gtlsoutputstream-gnutls.c:143
#: tls/base/gtlsconnection-base.c:481 tls/base/gtlsinputstream.c:78
#: tls/base/gtlsinputstream.c:141 tls/base/gtlsoutputstream.c:78
#: tls/base/gtlsoutputstream.c:143
msgid "Connection is closed"
msgstr "A kapcsolat lezárva"
#: tls/base/gtlsconnection-base.c:355 tls/base/gtlsconnection-base.c:1015
msgid "Operation would block"
msgstr "A művelet blokkoló lenne"
#. Cannot perform a blocking operation during a handshake on the
#. * same thread that triggered the handshake. The only way this can
#. * occur is if the application is doing something weird in its
#. * accept-certificate callback. Allowing a blocking op would stall
#. * the handshake (forever, if there's no timeout). Even a close
#. * op would deadlock here.
#.
#: tls/base/gtlsconnection-base.c:551
msgid "Cannot perform blocking operation during TLS handshake"
msgstr "A blokkoló művelet nem végezhető el a TLS-kézfogás alatt"
#: tls/base/gtlsconnection-base.c:809
#: tls/gnutls/gtlsclientconnection-gnutls.c:454
#: tls/base/gtlsconnection-base.c:614 tls/base/gtlsconnection-base.c:1137
msgid "Socket I/O timed out"
msgstr "A foglalat túllépte az I/O időkorlátot"
#: tls/base/gtlsconnection-base.c:1393
msgid "Server required TLS certificate"
msgstr "A kiszolgáló TLS-tanúsítványt kért"
#: tls/base/gtlsconnection-base.c:1488 tls/gnutls/gtlsconnection-gnutls.c:412
#: tls/openssl/gtlsconnection-openssl.c:172
#, c-format
msgid "Unacceptable TLS certificate"
msgstr "Elfogadhatatlan TLS-tanúsítvány"
#: tls/base/gtlsconnection-base.c:1895
#, c-format
msgid "Receive flags are not supported"
msgstr "A fogadási jelzők nem támogatottak"
#: tls/base/gtlsconnection-base.c:2030
#, c-format
msgid "Send flags are not supported"
msgstr "A küldési jelzők nem támogatottak"
#: tls/gnutls/gtlscertificate-gnutls.c:178
#: tls/openssl/gtlscertificate-openssl.c:177
#: tls/openssl/gtlscertificate-openssl.c:170
#, c-format
msgid "Could not parse DER certificate: %s"
msgstr "A DER tanúsítvány nem dolgozható fel: %s"
#: tls/gnutls/gtlscertificate-gnutls.c:199
#: tls/openssl/gtlscertificate-openssl.c:197
#: tls/openssl/gtlscertificate-openssl.c:190
#, c-format
msgid "Could not parse PEM certificate: %s"
msgstr "A PEM tanúsítvány nem dolgozható fel: %s"
#: tls/gnutls/gtlscertificate-gnutls.c:230
#: tls/openssl/gtlscertificate-openssl.c:216
#: tls/openssl/gtlscertificate-openssl.c:209
#, c-format
msgid "Could not parse DER private key: %s"
msgstr "A DER személyes kulcs nem dolgozható fel: %s"
#: tls/gnutls/gtlscertificate-gnutls.c:261
#: tls/openssl/gtlscertificate-openssl.c:235
#: tls/openssl/gtlscertificate-openssl.c:228
#, c-format
msgid "Could not parse PEM private key: %s"
msgstr "A PEM személyes kulcs nem dolgozható fel: %s"
#: tls/gnutls/gtlscertificate-gnutls.c:297
#: tls/openssl/gtlscertificate-openssl.c:273
#: tls/openssl/gtlscertificate-openssl.c:263
msgid "No certificate data provided"
msgstr "Nincsenek megadva tanúsítványadatok"
#: tls/gnutls/gtlsconnection-gnutls.c:405
#: tls/openssl/gtlsclientconnection-openssl.c:536
#: tls/openssl/gtlsserverconnection-openssl.c:425
#: tls/gnutls/gtlsconnection-gnutls.c:224
#: tls/openssl/gtlsclientconnection-openssl.c:522
#: tls/openssl/gtlsserverconnection-openssl.c:399
#, c-format
msgid "Could not create TLS connection: %s"
msgstr "Nem sikerült létrehozni TLS-kapcsolatot: %s"
#. Cannot perform a blocking operation during a handshake on the
#. * same thread that triggered the handshake. The only way this can
#. * occur is if the application is doing something weird in its
#. * accept-certificate callback. Allowing a blocking op would stall
#. * the handshake (forever, if there's no timeout). Even a close
#. * op would deadlock here.
#.
#: tls/gnutls/gtlsconnection-gnutls.c:811
msgid "Cannot perform blocking operation during TLS handshake"
msgstr "A blokkoló művelet nem végezhető el a TLS-kézfogás alatt"
#: tls/gnutls/gtlsconnection-gnutls.c:874
#: tls/gnutls/gtlsconnection-gnutls.c:1484
msgid "Socket I/O timed out"
msgstr "A foglalat túllépte az I/O időkorlátot"
msgstr "Nem sikerült létrehozni a TLS-kapcsolatot: %s"
#: tls/gnutls/gtlsconnection-gnutls.c:1019
#: tls/gnutls/gtlsconnection-gnutls.c:1052
#: tls/openssl/gtlsconnection-openssl.c:150
#: tls/gnutls/gtlsconnection-gnutls.c:357
#: tls/gnutls/gtlsconnection-gnutls.c:381
#: tls/openssl/gtlsconnection-openssl.c:139
msgid "Peer failed to perform TLS handshake"
msgstr "A partner nem tudta végrehajtani a TLS-kézfogást"
#: tls/gnutls/gtlsconnection-gnutls.c:1037
#: tls/openssl/gtlsconnection-openssl.c:238
#: tls/gnutls/gtlsconnection-gnutls.c:368
#: tls/openssl/gtlsconnection-openssl.c:248
msgid "Peer requested illegal TLS rehandshake"
msgstr "A partner illegális ismételt TLS-kézfogást kért"
#: tls/gnutls/gtlsconnection-gnutls.c:1058
#: tls/gnutls/gtlsconnection-gnutls.c:389
msgid "TLS connection closed unexpectedly"
msgstr "A TLS-kapcsolat váratlanul befejeződött"
#: tls/gnutls/gtlsconnection-gnutls.c:1068
#: tls/openssl/gtlsconnection-openssl.c:175
#: tls/gnutls/gtlsconnection-gnutls.c:404
#: tls/openssl/gtlsconnection-openssl.c:164
msgid "TLS connection peer did not send a certificate"
msgstr "A TLS kapcsolat partner nem küldött tanúsítványt"
#: tls/gnutls/gtlsconnection-gnutls.c:1074
#: tls/gnutls/gtlsconnection-gnutls.c:2176
#: tls/openssl/gtlsconnection-openssl.c:420
#, c-format
msgid "Unacceptable TLS certificate"
msgstr "Elfogadhatatlan TLS-tanúsítvány"
#: tls/gnutls/gtlsconnection-gnutls.c:1080
#: tls/gnutls/gtlsconnection-gnutls.c:420
#, c-format
msgid "Peer sent fatal TLS alert: %s"
msgstr "A partner végzetes TLS riasztást küldött: %s"
#: tls/gnutls/gtlsconnection-gnutls.c:1092
#: tls/gnutls/gtlsconnection-gnutls.c:430
msgid "Protocol version downgrade attack detected"
msgstr "Protokoll verzió visszaminősítéses támadás észlelve"
#: tls/gnutls/gtlsconnection-gnutls.c:1099
#: tls/gnutls/gtlsconnection-gnutls.c:439
#, c-format
msgid "Message is too large for DTLS connection; maximum is %u byte"
msgid_plural "Message is too large for DTLS connection; maximum is %u bytes"
msgstr[0] "Az üzenet túl nagy a DTLS kapcsolathoz; legfeljebb %u bájt lehet"
msgstr[1] "Az üzenet túl nagy a DTLS kapcsolathoz; legfeljebb %u bájt lehet"
#: tls/gnutls/gtlsconnection-gnutls.c:1106
#: tls/gnutls/gtlsconnection-gnutls.c:448
msgid "The operation timed out"
msgstr "A művelet túllépte az időkorlátot"
#: tls/gnutls/gtlsconnection-gnutls.c:1997
msgid "Peer does not support safe renegotiation"
msgstr "A partner nem támogatja a biztonságos újratárgyalást"
#: tls/gnutls/gtlsconnection-gnutls.c:770
#, c-format
msgid "Error performing TLS handshake: %s"
msgstr "Hiba a TLS-kézfogás végrehajtásakor: %s"
#: tls/gnutls/gtlsconnection-gnutls.c:2024
#: tls/gnutls/gtlsconnection-gnutls.c:2074
#: tls/gnutls/gtlsconnection-gnutls.c:873
#: tls/openssl/gtlsconnection-openssl.c:257
#: tls/openssl/gtlsconnection-openssl.c:307
msgid "Error performing TLS handshake"
msgstr "Hiba a TLS-kézfogás végrehajtásakor"
#: tls/gnutls/gtlsconnection-gnutls.c:2526
#: tls/gnutls/gtlsconnection-gnutls.c:2618
#: tls/gnutls/gtlsconnection-gnutls.c:919
#: tls/gnutls/gtlsconnection-gnutls.c:980
#: tls/openssl/gtlsconnection-openssl.c:414
msgid "Error reading data from TLS socket"
msgstr "Hiba az adatok olvasásakor a TLS-foglalatból"
#: tls/gnutls/gtlsconnection-gnutls.c:2648
#, c-format
msgid "Receive flags are not supported"
msgstr "A fogadási jelzők nem támogatottak"
#. flags
#: tls/gnutls/gtlsconnection-gnutls.c:2725
#: tls/gnutls/gtlsconnection-gnutls.c:2797
#: tls/gnutls/gtlsconnection-gnutls.c:1003
#: tls/gnutls/gtlsconnection-gnutls.c:1068
#: tls/openssl/gtlsconnection-openssl.c:459
msgid "Error writing data to TLS socket"
msgstr "Hiba az adatok TLS-foglalatba írásakor"
#: tls/gnutls/gtlsconnection-gnutls.c:2767
#: tls/gnutls/gtlsconnection-gnutls.c:1038
#, c-format
msgid "Message of size %lu byte is too large for DTLS connection"
msgid_plural "Message of size %lu bytes is too large for DTLS connection"
msgstr[0] "A(z) %lu bájt méretű üzenet túl nagy a DTLS kapcsolathoz"
msgstr[1] "A(z) %lu bájt méretű üzenet túl nagy a DTLS kapcsolathoz"
#: tls/gnutls/gtlsconnection-gnutls.c:2769
#: tls/gnutls/gtlsconnection-gnutls.c:1040
#, c-format
msgid "(maximum is %u byte)"
msgid_plural "(maximum is %u bytes)"
msgstr[0] "(legfeljebb %u bájt)"
msgstr[1] "(legfeljebb %u bájt)"
#: tls/gnutls/gtlsconnection-gnutls.c:2828
#: tls/gnutls/gtlsconnection-gnutls.c:1088
#, c-format
msgid "Send flags are not supported"
msgstr "A küldési jelzők nem támogatottak"
#: tls/gnutls/gtlsconnection-gnutls.c:2931
msgid "Error performing TLS close"
msgstr "Hiba a TLS-lezárás végrehajtásakor"
msgid "Error performing TLS close: %s"
msgstr "Hiba a TLS-lezárás végrehajtásakor: %s"
#: tls/gnutls/gtlsdatabase-gnutls.c:553
msgid ""
......@@ -197,59 +191,52 @@ msgstr ""
"Nem sikerült betölteni a rendszer megbízhatósági tárát: a GnuTLS nem "
"rendszer megbízhatósággal lett beállítva"
#: tls/gnutls/gtlsdatabase-gnutls.c:558
#: tls/gnutls/gtlsdatabase-gnutls.c:558 tls/openssl/gtlsdatabase-openssl.c:187
#, c-format
msgid "Failed to load system trust store: %s"
msgstr "Nem sikerült betölteni a rendszer megbízhatósági tárát: %s"
#: tls/gnutls/gtlsserverconnection-gnutls.c:137
#: tls/openssl/gtlsserverconnection-openssl.c:91
#: tls/openssl/gtlsserverconnection-openssl.c:90
msgid "Certificate has no private key"
msgstr "A tanúsítványnak nincs személyes kulcsa"
#: tls/openssl/gtlsclientconnection-openssl.c:417
#: tls/openssl/gtlsclientconnection-openssl.c:483
#: tls/openssl/gtlsserverconnection-openssl.c:305
#: tls/openssl/gtlsserverconnection-openssl.c:365
#: tls/openssl/gtlsclientconnection-openssl.c:412
#: tls/openssl/gtlsclientconnection-openssl.c:469
#: tls/openssl/gtlsserverconnection-openssl.c:288
#: tls/openssl/gtlsserverconnection-openssl.c:339
#, c-format
msgid "Could not create TLS context: %s"
msgstr "Nem sikerült létrehozni TLS-környezetet: %s"
#: tls/openssl/gtlsconnection-openssl.c:183
msgid "Digest too big for RSA key"
msgstr "A kivonat túl nagy az RSA kulcshoz"
#: tls/openssl/gtlsconnection-openssl.c:247
#: tls/openssl/gtlsconnection-openssl.c:380
#: tls/openssl/gtlsconnection-openssl.c:180
#, c-format
msgid "Error performing TLS handshake: %s"
msgstr "Hiba a TLS-kézfogás végrehajtásakor: %s"
msgid "Unacceptable TLS certificate authority"
msgstr "Elfogadhatatlan TLS hitelesítésszolgáltató"
#: tls/openssl/gtlsconnection-openssl.c:390
msgid "Server did not return a valid TLS certificate"
msgstr "A kiszolgáló nem adott vissza érvényes TLS-tanúsítványt"
#: tls/openssl/gtlsconnection-openssl.c:188
msgid "Digest too big for RSA key"
msgstr "A kivonat túl nagy az RSA kulcshoz"
#: tls/openssl/gtlsconnection-openssl.c:504
#, c-format
msgid "Error reading data from TLS socket: %s"
msgstr "Hiba az adatok olvasásakor a TLS-foglalatból: %s"
#: tls/openssl/gtlsconnection-openssl.c:497
msgid "Error performing TLS close"
msgstr "Hiba a TLS-lezárás végrehajtásakor"
#: tls/openssl/gtlsconnection-openssl.c:530
#, c-format
msgid "Error writing data to TLS socket: %s"
msgstr "Hiba az adatok TLS-foglalatba írásakor: %s"
#: tls/openssl/gtlsdatabase-openssl.c:227
msgid "Could not create CA store"
msgstr "Nem sikerült létrehozni a CA-tárat"
#: tls/openssl/gtlsconnection-openssl.c:556
#: tls/openssl/gtlsfiledatabase-openssl.c:454
#, c-format
msgid "Error performing TLS close: %s"
msgstr "Hiba a TLS-lezárás végrehajtásakor: %s"
msgid "Failed to load file path: %s"
msgstr "Nem sikerült betölteni a fájlútvonalat: %s"
#: tls/openssl/gtlsserverconnection-openssl.c:102
#: tls/openssl/gtlsserverconnection-openssl.c:101
#, c-format
msgid "There is a problem with the certificate: %s"
msgstr "Probléma van a tanúsítvánnyal: %s"
#: tls/openssl/gtlsserverconnection-openssl.c:110
#: tls/openssl/gtlsserverconnection-openssl.c:109
#, c-format
msgid "There is a problem with the certificate private key: %s"
msgstr "Probléma van a tanúsítvány személyes kulcsával: %s"
......@@ -10,8 +10,8 @@ msgstr ""
"Project-Id-Version: glib-networking master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib-networking/"
"issues\n"
"POT-Creation-Date: 2019-04-29 12:17+0000\n"
"PO-Revision-Date: 2019-05-03 17:29+0700\n"
"POT-Creation-Date: 2019-06-06 11:17+0000\n"
"PO-Revision-Date: 2019-06-07 21:55+0700\n"
"Last-Translator: Kukuh Syafaat <kukuhsyafaat@gnome.org>\n"
"Language-Team: Indonesian <gnome@i15n.org>\n"
"Language: id\n"
......@@ -25,170 +25,165 @@ msgstr ""
msgid "Proxy resolver internal error."
msgstr "Galat internal resolver proksi."
#: tls/base/gtlsconnection-base.c:282 tls/base/gtlsinputstream-base.c:74
#: tls/base/gtlsoutputstream-base.c:74 tls/gnutls/gtlsconnection-gnutls.c:740
#: tls/gnutls/gtlsinputstream-gnutls.c:78
#: tls/gnutls/gtlsinputstream-gnutls.c:141
#: tls/gnutls/gtlsoutputstream-gnutls.c:78
#: tls/gnutls/gtlsoutputstream-gnutls.c:143
#: tls/base/gtlsconnection-base.c:481 tls/base/gtlsinputstream.c:78
#: tls/base/gtlsinputstream.c:141 tls/base/gtlsoutputstream.c:78
#: tls/base/gtlsoutputstream.c:143
msgid "Connection is closed"
msgstr "Koneksi ditutup"
#: tls/base/gtlsconnection-base.c:355 tls/base/gtlsconnection-base.c:1015
msgid "Operation would block"
msgstr "Operasi akan memblokir"
#. Cannot perform a blocking operation during a handshake on the
#. * same thread that triggered the handshake. The only way this can
#. * occur is if the application is doing something weird in its
#. * accept-certificate callback. Allowing a blocking op would stall
#. * the handshake (forever, if there's no timeout). Even a close
#. * op would deadlock here.
#.
#: tls/base/gtlsconnection-base.c:551
msgid "Cannot perform blocking operation during TLS handshake"
msgstr "Tak bisa melakukan operasi pemblokiran selama jabat tangan TLS"
#: tls/base/gtlsconnection-base.c:809
#: tls/gnutls/gtlsclientconnection-gnutls.c:454
#: tls/base/gtlsconnection-base.c:614 tls/base/gtlsconnection-base.c:1137
msgid "Socket I/O timed out"
msgstr "I/O soket kehabisan waktu"
#: tls/base/gtlsconnection-base.c:1393
msgid "Server required TLS certificate"
msgstr "Server memerlukan sertifikat TLS"
#: tls/base/gtlsconnection-base.c:1488 tls/gnutls/gtlsconnection-gnutls.c:412
#: tls/openssl/gtlsconnection-openssl.c:172
#, c-format
msgid "Unacceptable TLS certificate"
msgstr "Sertifikat TLS tak dapat diterima"
#: tls/base/gtlsconnection-base.c:1895
#, c-format
msgid "Receive flags are not supported"
msgstr "Menerima tanda tidak didukung"
#: tls/base/gtlsconnection-base.c:2030
#, c-format
msgid "Send flags are not supported"
msgstr "Mengirim tanda tidak didukung"
#: tls/gnutls/gtlscertificate-gnutls.c:178
#: tls/openssl/gtlscertificate-openssl.c:177
#: tls/openssl/gtlscertificate-openssl.c:170
#, c-format
msgid "Could not parse DER certificate: %s"
msgstr "Tak bisa mengurai sertifikat DER: %s"
#: tls/gnutls/gtlscertificate-gnutls.c:199
#: tls/openssl/gtlscertificate-openssl.c:197
#: tls/openssl/gtlscertificate-openssl.c:190
#, c-format
msgid "Could not parse PEM certificate: %s"
msgstr "Tak bisa mengurai sertifikat PEM: %s"
#: tls/gnutls/gtlscertificate-gnutls.c:230
#: tls/openssl/gtlscertificate-openssl.c:216
#: tls/openssl/gtlscertificate-openssl.c:209
#, c-format
msgid "Could not parse DER private key: %s"
msgstr "Tak bisa mengurai kunci privat DER: %s"
#: tls/gnutls/gtlscertificate-gnutls.c:261
#: tls/openssl/gtlscertificate-openssl.c:235
#: tls/openssl/gtlscertificate-openssl.c:228
#, c-format
msgid "Could not parse PEM private key: %s"
msgstr "Tak bisa mengurai kunci privat PEM: %s"
#: tls/gnutls/gtlscertificate-gnutls.c:297
#: tls/openssl/gtlscertificate-openssl.c:273
#: tls/openssl/gtlscertificate-openssl.c:263
msgid "No certificate data provided"
msgstr "Data sertifikat tak disediakan"
#: tls/gnutls/gtlsconnection-gnutls.c:405
#: tls/openssl/gtlsclientconnection-openssl.c:536
#: tls/openssl/gtlsserverconnection-openssl.c:425
#: tls/gnutls/gtlsconnection-gnutls.c:224
#: tls/openssl/gtlsclientconnection-openssl.c:522
#: tls/openssl/gtlsserverconnection-openssl.c:399
#, c-format
msgid "Could not create TLS connection: %s"
msgstr "Tak bisa membuat koneksi TLS: %s"
#. Cannot perform a blocking operation during a handshake on the
#. * same thread that triggered the handshake. The only way this can
#. * occur is if the application is doing something weird in its
#. * accept-certificate callback. Allowing a blocking op would stall
#. * the handshake (forever, if there's no timeout). Even a close
#. * op would deadlock here.
#.
#: tls/gnutls/gtlsconnection-gnutls.c:811
msgid "Cannot perform blocking operation during TLS handshake"
msgstr "Tak bisa melakukan operasi pemblokiran selama jabat tangan TLS"
#: tls/gnutls/gtlsconnection-gnutls.c:874
#: tls/gnutls/gtlsconnection-gnutls.c:1488
msgid "Socket I/O timed out"
msgstr "I/O soket kehabisan waktu"
#: tls/gnutls/gtlsconnection-gnutls.c:1019
#: tls/gnutls/gtlsconnection-gnutls.c:1052
#: tls/openssl/gtlsconnection-openssl.c:150
#: tls/gnutls/gtlsconnection-gnutls.c:357
#: tls/gnutls/gtlsconnection-gnutls.c:381
#: tls/openssl/gtlsconnection-openssl.c:139
msgid "Peer failed to perform TLS handshake"
msgstr "Peer gagal melakukan jabat tangan TLS"
#: tls/gnutls/gtlsconnection-gnutls.c:1037
#: tls/openssl/gtlsconnection-openssl.c:238
#: tls/gnutls/gtlsconnection-gnutls.c:368
#: tls/openssl/gtlsconnection-openssl.c:248
msgid "Peer requested illegal TLS rehandshake"
msgstr "Peer meminta jabat tangan ulang TLS yang ilegal"
#: tls/gnutls/gtlsconnection-gnutls.c:1058
#: tls/gnutls/gtlsconnection-gnutls.c:389
msgid "TLS connection closed unexpectedly"
msgstr "Koneksi TLS tertutup tak disangka-sangka"
#: tls/gnutls/gtlsconnection-gnutls.c:1072
#: tls/openssl/gtlsconnection-openssl.c:175
#: tls/gnutls/gtlsconnection-gnutls.c:404
#: tls/openssl/gtlsconnection-openssl.c:164
msgid "TLS connection peer did not send a certificate"
msgstr "Pasangan koneksi TLS tak mengembalikan sertifikat"
#: tls/gnutls/gtlsconnection-gnutls.c:1078
#: tls/gnutls/gtlsconnection-gnutls.c:2169
#: tls/openssl/gtlsconnection-openssl.c:420
#, c-format
msgid "Unacceptable TLS certificate"
msgstr "Sertifikat TLS tak dapat diterima"
#: tls/gnutls/gtlsconnection-gnutls.c:1084
#: tls/gnutls/gtlsconnection-gnutls.c:420
#, c-format
msgid "Peer sent fatal TLS alert: %s"
msgstr "Peer mengirim peringatan TLS yang fatal: %s"
#: tls/gnutls/gtlsconnection-gnutls.c:1096
#: tls/gnutls/gtlsconnection-gnutls.c:430
msgid "Protocol version downgrade attack detected"
msgstr "Serangan versi penurunan protokol terdeteksi"
#: tls/gnutls/gtlsconnection-gnutls.c:1103
#: tls/gnutls/gtlsconnection-gnutls.c:439
#, c-format
msgid "Message is too large for DTLS connection; maximum is %u byte"
msgid_plural "Message is too large for DTLS connection; maximum is %u bytes"
msgstr[0] "Pesan terlalu besar untuk koneksi DTLS; maksimum adalah %u byte"
msgstr[1] "Pesan terlalu besar untuk koneksi DTLS; maksimum adalah %u byte"
#: tls/gnutls/gtlsconnection-gnutls.c:1110
#: tls/gnutls/gtlsconnection-gnutls.c:448
msgid "The operation timed out"
msgstr "Waktu operasi habis"
#: tls/gnutls/gtlsconnection-gnutls.c:1990
msgid "Peer does not support safe renegotiation"
msgstr "Peer tidak mendukung renegosiasi yang aman"
#: tls/gnutls/gtlsconnection-gnutls.c:770
#, c-format
msgid "Error performing TLS handshake: %s"
msgstr "Galat melakukan jabat tangan TLS: %s"
#: tls/gnutls/gtlsconnection-gnutls.c:2017
#: tls/gnutls/gtlsconnection-gnutls.c:2067
#: tls/gnutls/gtlsconnection-gnutls.c:873
#: tls/openssl/gtlsconnection-openssl.c:257
#: tls/openssl/gtlsconnection-openssl.c:307
msgid "Error performing TLS handshake"
msgstr "Galat melakukan jabat tangan TLS"
#: tls/gnutls/gtlsconnection-gnutls.c:2519
#: tls/gnutls/gtlsconnection-gnutls.c:2611
#: tls/gnutls/gtlsconnection-gnutls.c:919
#: tls/gnutls/gtlsconnection-gnutls.c:980
#: tls/openssl/gtlsconnection-openssl.c:414
msgid "Error reading data from TLS socket"
msgstr "Galat saat membaca data dari soket TLS"
#: tls/gnutls/gtlsconnection-gnutls.c:2641
#, c-format
msgid "Receive flags are not supported"
msgstr "Menerima tanda tidak didukung"
#. flags
#: tls/gnutls/gtlsconnection-gnutls.c:2718
#: tls/gnutls/gtlsconnection-gnutls.c:2790
#: tls/gnutls/gtlsconnection-gnutls.c:1003
#: tls/gnutls/gtlsconnection-gnutls.c:1068
#: tls/openssl/gtlsconnection-openssl.c:459
msgid "Error writing data to TLS socket"
msgstr "Galat saat menulis data ke soket TLS"
#: tls/gnutls/gtlsconnection-gnutls.c:2760
#: tls/gnutls/gtlsconnection-gnutls.c:1038
#, c-format
msgid "Message of size %lu byte is too large for DTLS connection"
msgid_plural "Message of size %lu bytes is too large for DTLS connection"
msgstr[0] "Pesan ukuran %lu byte terlalu besar untuk koneksi DTLS"
msgstr[1] "Pesan ukuran %lu byte terlalu besar untuk koneksi DTLS"
#: tls/gnutls/gtlsconnection-gnutls.c:2762
#: tls/gnutls/gtlsconnection-gnutls.c:1040
#, c-format
msgid "(maximum is %u byte)"
msgid_plural "(maximum is %u bytes)"
msgstr[0] "(maksimum adalah %u byte)"
msgstr[1] "(maksimum adalah %u byte)"
#: tls/gnutls/gtlsconnection-gnutls.c:2821
#: tls/gnutls/gtlsconnection-gnutls.c:1088
#, c-format
msgid "Send flags are not supported"
msgstr "Mengirim tanda tidak didukung"
#: tls/gnutls/gtlsconnection-gnutls.c:2924
msgid "Error performing TLS close"
msgstr "Galat melaksanakan penutupan TLS"
msgid "Error performing TLS close: %s"
msgstr "Galat melaksanakan penutupan TLS: %s"
#: tls/gnutls/gtlsdatabase-gnutls.c:553
msgid ""
......@@ -198,72 +193,71 @@ msgstr ""
"Gagal memuat penyimpanan terpercaya sistem: GnuTLS tidak dikonfigurasi "
"dengan kepercayaan sistem"
#: tls/gnutls/gtlsdatabase-gnutls.c:558 tls/openssl/gtlsdatabase-openssl.c:186
#: tls/gnutls/gtlsdatabase-gnutls.c:558 tls/openssl/gtlsdatabase-openssl.c:187
#, c-format
msgid "Failed to load system trust store: %s"
msgstr "Gagal memuat penyimpanan terpercaya sistem: %s"
#: tls/gnutls/gtlsserverconnection-gnutls.c:137
#: tls/openssl/gtlsserverconnection-openssl.c:91
#: tls/openssl/gtlsserverconnection-openssl.c:90
msgid "Certificate has no private key"
msgstr "Sertifikatnya tidak memiliki kunci privat"
#: tls/openssl/gtlsclientconnection-openssl.c:417
#: tls/openssl/gtlsclientconnection-openssl.c:483
#: tls/openssl/gtlsserverconnection-openssl.c:305
#: tls/openssl/gtlsserverconnection-openssl.c:365
#: tls/openssl/gtlsclientconnection-openssl.c:412
#: tls/openssl/gtlsclientconnection-openssl.c:469
#: tls/openssl/gtlsserverconnection-openssl.c:288
#: tls/openssl/gtlsserverconnection-openssl.c:339
#, c-format
msgid "Could not create TLS context: %s"
msgstr "Tak bisa membuat konteks TLS: %s"
#: tls/openssl/gtlsconnection-openssl.c:183
msgid "Digest too big for RSA key"
msgstr "Digest terlalu besar untuk kunci RSA"
#: tls/openssl/gtlsconnection-openssl.c:247
#: tls/openssl/gtlsconnection-openssl.c:380
#, c-format
msgid "Error performing TLS handshake: %s"
msgstr "Galat melakukan jabat tangan TLS: %s"
#: tls/openssl/gtlsconnection-openssl.c:390
msgid "Server did not return a valid TLS certificate"
msgstr "Server tak mengembalikan sertifikat TLS yang valid"
#: tls/openssl/gtlsconnection-openssl.c:504
#: tls/openssl/gtlsconnection-openssl.c:180
#, c-format
msgid "Error reading data from TLS socket: %s"
msgstr "Galat saat membaca data dari soket TLS: %s"
msgid "Unacceptable TLS certificate authority"
msgstr "Otoritas sertifikat TLS tak dapat diterima"
#: tls/openssl/gtlsconnection-openssl.c:530
#, c-format
msgid "Error writing data to TLS socket: %s"
msgstr "Galat saat menulis data ke soket TLS: %s"
#: tls/openssl/gtlsconnection-openssl.c:188
msgid "Digest too big for RSA key"
msgstr "Digest terlalu besar untuk kunci RSA"
#: tls/openssl/gtlsconnection-openssl.c:556
#, c-format
msgid "Error performing TLS close: %s"
msgstr "Galat melaksanakan penutupan TLS: %s"
#: tls/openssl/gtlsconnection-openssl.c:497
msgid "Error performing TLS close"
msgstr "Galat melaksanakan penutupan TLS"
#: tls/openssl/gtlsdatabase-openssl.c:226
#: tls/openssl/gtlsdatabase-openssl.c:227
msgid "Could not create CA store"
msgstr "Tak bisa membuat penyimpanan CA"
#: tls/openssl/gtlsfiledatabase-openssl.c:483
#: tls/openssl/gtlsfiledatabase-openssl.c:454
#, c-format
msgid "Failed to load file path: %s"
msgstr "Gagal memuat path berkas: %s"
#: tls/openssl/gtlsserverconnection-openssl.c:102
#: tls/openssl/gtlsserverconnection-openssl.c:101
#, c-format
msgid "There is a problem with the certificate: %s"
msgstr "Ada masalah dengan sertifikat: %s"
#: tls/openssl/gtlsserverconnection-openssl.c:110
#: tls/openssl/gtlsserverconnection-openssl.c:109
#, c-format
msgid "There is a problem with the certificate private key: %s"
msgstr "Ada masalah dengan kunci privat sertifikat: %s"
#~ msgid "Operation would block"
#~ msgstr "Operasi akan memblokir"
#~ msgid "Peer does not support safe renegotiation"
#~ msgstr "Peer tidak mendukung renegosiasi yang aman"
#~ msgid "Server did not return a valid TLS certificate"
#~ msgstr "Server tak mengembalikan sertifikat TLS yang valid"
#~ msgid "Error reading data from TLS socket: %s"
#~ msgstr "Galat saat membaca data dari soket TLS: %s"
#~ msgid "Error writing data to TLS socket: %s"
#~ msgstr "Galat saat menulis data ke soket TLS: %s"
#~ msgid ""
#~ "This is the last chance to enter the PIN correctly before the token is "
#~ "locked."
......
......@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: glib-networking\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib-networking/issues\n"
"POT-Creation-Date: 2019-03-02 02:19+0000\n"
"PO-Revision-Date: 2019-03-04 09:43+0100\n"
"POT-Creation-Date: 2019-06-01 11:12+0000\n"
"PO-Revision-Date: 2019-06-06 13:10+0200\n"
"Last-Translator: Milo Casagrande <milo@milo.name>\n"
"Language-Team: Italiano <gnome-it-list@gnome.org>\n"
"Language: it\n"
......@@ -90,7 +90,7 @@ msgid "Cannot perform blocking operation during TLS handshake"
msgstr "Impossibile eseguire un'operazione bloccante durante l'handshake TLS"
#: tls/gnutls/gtlsconnection-gnutls.c:874
#: tls/gnutls/gtlsconnection-gnutls.c:1484
#: tls/gnutls/gtlsconnection-gnutls.c:1488
msgid "Socket I/O timed out"
msgstr "I/O sul socket scaduto"
......@@ -109,28 +109,28 @@ msgstr "Il nodo ha richesto un re-handshake non lecito"
msgid "TLS connection closed unexpectedly"
msgstr "La connessione TLS si è chiusa in modo inatteso"
#: tls/gnutls/gtlsconnection-gnutls.c:1068
#: tls/gnutls/gtlsconnection-gnutls.c:1072
#: tls/openssl/gtlsconnection-openssl.c:175
msgid "TLS connection peer did not send a certificate"
msgstr "Il nodo di connessione TLS non ha inviato un certificato"
#: tls/gnutls/gtlsconnection-gnutls.c:1074
#: tls/gnutls/gtlsconnection-gnutls.c:2176
#: tls/gnutls/gtlsconnection-gnutls.c:1078
#: tls/gnutls/gtlsconnection-gnutls.c:2179
#: tls/openssl/gtlsconnection-openssl.c:420
#, c-format
msgid "Unacceptable TLS certificate"
msgstr "Certificato TLS inammissibile"
#: tls/gnutls/gtlsconnection-gnutls.c:1080
#: tls/gnutls/gtlsconnection-gnutls.c:1084
#, c-format
msgid "Peer sent fatal TLS alert: %s"
msgstr "Il nodo ha inviato un avviso TLS fatale: %s"
#: tls/gnutls/gtlsconnection-gnutls.c:1092
#: tls/gnutls/gtlsconnection-gnutls.c:1096
msgid "Protocol version downgrade attack detected"
msgstr "Rilevato attacco di declassamento del protocollo di versione"
#: tls/gnutls/gtlsconnection-gnutls.c:1099
#: tls/gnutls/gtlsconnection-gnutls.c:1103
#, c-format
msgid "Message is too large for DTLS connection; maximum is %u byte"
msgid_plural "Message is too large for DTLS connection; maximum is %u bytes"
......@@ -139,55 +139,55 @@ msgstr[0] ""
msgstr[1] ""
"Il messaggio è troppo grande per una connessione DTLS (massimo %u byte)"
#: tls/gnutls/gtlsconnection-gnutls.c:1106
#: tls/gnutls/gtlsconnection-gnutls.c:1110
msgid "The operation timed out"
msgstr "Tempo esaurito per l'operazione"
#: tls/gnutls/gtlsconnection-gnutls.c:1997
#: tls/gnutls/gtlsconnection-gnutls.c:2000
msgid "Peer does not support safe renegotiation"
msgstr "Il nodo non supporto la rinegoziazione sicura"
#: tls/gnutls/gtlsconnection-gnutls.c:2024
#: tls/gnutls/gtlsconnection-gnutls.c:2074
#: tls/gnutls/gtlsconnection-gnutls.c:2027
#: tls/gnutls/gtlsconnection-gnutls.c:2077
msgid "Error performing TLS handshake"
msgstr "Errore nell'eseguire l'handshake TLS"
#: tls/gnutls/gtlsconnection-gnutls.c:2526
#: tls/gnutls/gtlsconnection-gnutls.c:2618
#: tls/gnutls/gtlsconnection-gnutls.c:2529
#: tls/gnutls/gtlsconnection-gnutls.c:2621
msgid "Error reading data from TLS socket"
msgstr "Errore nel leggere dati dal socket TLS"
#: tls/gnutls/gtlsconnection-gnutls.c:2648
#: tls/gnutls/gtlsconnection-gnutls.c:2651
#, c-format
msgid "Receive flags are not supported"
msgstr "I flag di ricezione non sono supportati"
#. flags
#: tls/gnutls/gtlsconnection-gnutls.c:2725
#: tls/gnutls/gtlsconnection-gnutls.c:2797
#: tls/gnutls/gtlsconnection-gnutls.c:2728
#: tls/gnutls/gtlsconnection-gnutls.c:2800
msgid "Error writing data to TLS socket"
msgstr "Errore nello scrivere dati sul socket TLS"
#: tls/gnutls/gtlsconnection-gnutls.c:2767
#: tls/gnutls/gtlsconnection-gnutls.c:2770
#, c-format
msgid "Message of size %lu byte is too large for DTLS connection"
msgid_plural "Message of size %lu bytes is too large for DTLS connection"
msgstr[0] "Un messaggio di %lu byte è troppo grande per la connessione DTLS"
msgstr[1] "Un messaggio di %lu byte è troppo grande per la connessione DTLS"
#: tls/gnutls/gtlsconnection-gnutls.c:2769
#: tls/gnutls/gtlsconnection-gnutls.c:2772
#, c-format
msgid "(maximum is %u byte)"
msgid_plural "(maximum is %u bytes)"
msgstr[0] "(massimo %u byte)"
msgstr[1] "(massimo %u byte)"
#: tls/gnutls/gtlsconnection-gnutls.c:2828
#: tls/gnutls/gtlsconnection-gnutls.c:2831
#, c-format
msgid "Send flags are not supported"
msgstr "I flag di invio non sono supportati"
#: tls/gnutls/gtlsconnection-gnutls.c:2931
#: tls/gnutls/gtlsconnection-gnutls.c:2934
msgid "Error performing TLS close"
msgstr "Errore nell'eseguire la chiusura TLS"
......@@ -199,7 +199,7 @@ msgstr ""
"Caricamento dell'archivio di attendibilità di sistema non riuscito: GnuTLS "
"non è stato configurato con un archivio di attendibilità di sistema"
#: tls/gnutls/gtlsdatabase-gnutls.c:558
#: tls/gnutls/gtlsdatabase-gnutls.c:558 tls/openssl/gtlsdatabase-openssl.c:186
#, c-format
msgid "Failed to load system trust store: %s"
msgstr "Caricamento dell'archivio di attendibilità di sistema non riuscito: %s"
......@@ -246,6 +246,15 @@ msgstr "Errore nello scrivere dati sul socket TLS: %s"
msgid "Error performing TLS close: %s"
msgstr "Errore nell'eseguire la chiusura TLS: %s"
#: tls/openssl/gtlsdatabase-openssl.c:226
msgid "Could not create CA store"
msgstr "Impossibile creare l'archivio CA"
#: tls/openssl/gtlsfiledatabase-openssl.c:483
#, c-format
msgid "Failed to load file path: %s"
msgstr "Caricamento del percorso del file non riuscito: %s"
#: tls/openssl/gtlsserverconnection-openssl.c:102
#, c-format
msgid "There is a problem with the certificate: %s"
......
......@@ -709,10 +709,10 @@ g_tls_connection_base_real_pop_io (GTlsConnectionBase *tls,
GError **error)
{
GTlsConnectionBasePrivate *priv = g_tls_connection_base_get_instance_private (tls);
GTlsConnectionBaseClass *tls_class = G_TLS_CONNECTION_BASE_GET_CLASS (tls);
GError *my_error = NULL;
/* This function MAY or MAY NOT set error when it fails! */
if (direction & G_IO_IN)
{
priv->read_cancellable = NULL;
......@@ -752,9 +752,6 @@ g_tls_connection_base_real_pop_io (GTlsConnectionBase *tls,
else if (my_error)
g_propagate_error (error, my_error);
if (tls_class->failed)
tls_class->failed (tls);
return G_TLS_CONNECTION_BASE_ERROR;
}
......
......@@ -84,8 +84,6 @@ struct _GTlsConnectionBaseClass
gboolean success,
GError **error);
void (*failed) (GTlsConnectionBase *tls);
GTlsConnectionBaseStatus (*read_fn) (GTlsConnectionBase *tls,
void *buffer,
gsize count,
......
......@@ -309,7 +309,7 @@ g_tls_backend_gnutls_register (GIOModule *module)
if (module == NULL)
g_io_extension_point_register (G_TLS_BACKEND_EXTENSION_POINT_NAME);
g_io_extension_point_implement (G_TLS_BACKEND_EXTENSION_POINT_NAME,
g_tls_backend_gnutls_get_type(),
g_tls_backend_gnutls_get_type (),
"gnutls",
0);
}
......@@ -397,9 +397,9 @@ g_tls_client_connection_gnutls_clear_session_data (GTlsClientConnectionGnutls *g
}
static void
g_tls_client_connection_gnutls_failed (GTlsConnectionBase *tls)
g_tls_client_connection_gnutls_failed (GTlsConnectionGnutls *gnutls)
{
g_tls_client_connection_gnutls_clear_session_data (G_TLS_CLIENT_CONNECTION_GNUTLS (tls));
g_tls_client_connection_gnutls_clear_session_data (G_TLS_CLIENT_CONNECTION_GNUTLS (gnutls));
}
static void
......@@ -494,6 +494,7 @@ g_tls_client_connection_gnutls_class_init (GTlsClientConnectionGnutlsClass *klas
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GTlsConnectionBaseClass *base_class = G_TLS_CONNECTION_BASE_CLASS (klass);
GTlsConnectionGnutlsClass *gnutls_class = G_TLS_CONNECTION_GNUTLS_CLASS (klass);
gobject_class->get_property = g_tls_client_connection_gnutls_get_property;
gobject_class->set_property = g_tls_client_connection_gnutls_set_property;
......@@ -501,7 +502,8 @@ g_tls_client_connection_gnutls_class_init (GTlsClientConnectionGnutlsClass *klas
base_class->prepare_handshake = g_tls_client_connection_gnutls_prepare_handshake;
base_class->complete_handshake = g_tls_client_connection_gnutls_complete_handshake;
base_class->failed = g_tls_client_connection_gnutls_failed;
gnutls_class->failed = g_tls_client_connection_gnutls_failed;
g_object_class_override_property (gobject_class, PROP_VALIDATION_FLAGS, "validation-flags");
g_object_class_override_property (gobject_class, PROP_SERVER_IDENTITY, "server-identity");
......
......@@ -468,7 +468,10 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls,
#define END_GNUTLS_IO(gnutls, direction, ret, status, errmsg, err) \
status = end_gnutls_io (gnutls, direction, ret, err, errmsg); \
} while (status == G_TLS_CONNECTION_BASE_TRY_AGAIN);
} while (status == G_TLS_CONNECTION_BASE_TRY_AGAIN); \
\
if (status == G_TLS_CONNECTION_BASE_ERROR) \
G_TLS_CONNECTION_GNUTLS_GET_CLASS (gnutls)->failed (gnutls);
static void
set_gnutls_error (GTlsConnectionGnutls *gnutls,
......
......@@ -40,6 +40,8 @@ G_DECLARE_DERIVABLE_TYPE (GTlsConnectionGnutls, g_tls_connection_gnutls, G, TLS_
struct _GTlsConnectionGnutlsClass
{
GTlsConnectionBaseClass parent_class;
void (*failed) (GTlsConnectionGnutls *tls);
};
gnutls_certificate_credentials_t g_tls_connection_gnutls_get_credentials (GTlsConnectionGnutls *connection);
......
......@@ -204,9 +204,9 @@ g_tls_server_connection_gnutls_retrieve_function (gnutls_session_t
}
static void
g_tls_server_connection_gnutls_failed (GTlsConnectionBase *tls)
g_tls_server_connection_gnutls_failed (GTlsConnectionGnutls *gnutls)
{
gnutls_db_remove_session (g_tls_connection_gnutls_get_session (G_TLS_CONNECTION_GNUTLS (tls)));
gnutls_db_remove_session (g_tls_connection_gnutls_get_session (gnutls));
}
static void
......@@ -238,7 +238,6 @@ g_tls_server_connection_gnutls_prepare_handshake (GTlsConnectionBase *tls,
}
/* Session cache management */
static int
g_tls_server_connection_gnutls_db_store (void *user_data,
gnutls_datum_t key,
......@@ -300,13 +299,15 @@ g_tls_server_connection_gnutls_class_init (GTlsServerConnectionGnutlsClass *klas
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GTlsConnectionBaseClass *base_class = G_TLS_CONNECTION_BASE_CLASS (klass);
GTlsConnectionGnutlsClass *gnutls_class = G_TLS_CONNECTION_GNUTLS_CLASS (klass);
gobject_class->finalize = g_tls_server_connection_gnutls_finalize;
gobject_class->get_property = g_tls_server_connection_gnutls_get_property;
gobject_class->set_property = g_tls_server_connection_gnutls_set_property;
base_class->prepare_handshake = g_tls_server_connection_gnutls_prepare_handshake;
base_class->failed = g_tls_server_connection_gnutls_failed;
gnutls_class->failed = g_tls_server_connection_gnutls_failed;
g_object_class_override_property (gobject_class, PROP_AUTHENTICATION_MODE, "authentication-mode");
}
......
......@@ -248,7 +248,7 @@ g_tls_backend_openssl_register (GIOModule *module)
if (!module)
g_io_extension_point_register (G_TLS_BACKEND_EXTENSION_POINT_NAME);
g_io_extension_point_implement (G_TLS_BACKEND_EXTENSION_POINT_NAME,
g_tls_backend_openssl_get_type(),
g_tls_backend_openssl_get_type (),
"openssl",
-1);
}