From: Nikos Mavrogiannopoulos Date: Fri, 25 Jan 2002 22:41:10 +0000 (+0000) Subject: gnutls_*_get_algo() renamed to gnutls_*_get() (suggested by Simon Josefsson) X-Git-Tag: gnutls_0_3_90~187 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87b48d5093f312e45c19d669c789820b1e4475f1;p=thirdparty%2Fgnutls.git gnutls_*_get_algo() renamed to gnutls_*_get() (suggested by Simon Josefsson) --- diff --git a/NEWS b/NEWS index 8a06caa519..ba4bd04860 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,7 @@ Version ?.?.? - Handshake messages are not kept in memory any more. Now we use less memory during a handshake - Added check for the requested TLS extensions +- gnutls_*_get_algo() renamed to gnutls_*_get() Version 0.3.5 (25/01/2002) - Corrected the RSA key exchange method, to avoid attacks against diff --git a/doc/tex/ex3.tex b/doc/tex/ex3.tex index 761a532b7e..9e9745544b 100644 --- a/doc/tex/ex3.tex +++ b/doc/tex/ex3.tex @@ -25,7 +25,7 @@ int print_info(GNUTLS_STATE state) /* print the key exchange's algorithm name */ - kx = gnutls_kx_get_algo(state); + kx = gnutls_kx_get(state); tmp = gnutls_kx_get_name(kx); printf("- Key Exchange: %s\n", tmp); @@ -118,13 +118,13 @@ int print_info(GNUTLS_STATE state) tmp = gnutls_protocol_get_name(gnutls_protocol_get_version(state)); printf("- Version: %s\n", tmp); - tmp = gnutls_compression_get_name(gnutls_compression_get_algo(state)); + tmp = gnutls_compression_get_name(gnutls_compression_get(state)); printf("- Compression: %s\n", tmp); - tmp = gnutls_cipher_get_name(gnutls_cipher_get_algo(state)); + tmp = gnutls_cipher_get_name(gnutls_cipher_get(state)); printf("- Cipher: %s\n", tmp); - tmp = gnutls_mac_get_name(gnutls_mac_get_algo(state)); + tmp = gnutls_mac_get_name(gnutls_mac_get(state)); printf("- MAC: %s\n", tmp); return 0; diff --git a/doc/tex/serv1.tex b/doc/tex/serv1.tex index 4e07171c63..b06da5402a 100644 --- a/doc/tex/serv1.tex +++ b/doc/tex/serv1.tex @@ -89,18 +89,18 @@ void print_info(GNUTLS_STATE state) tmp = gnutls_protocol_get_name(gnutls_protocol_get_version(state)); printf("- Version: %s\n", tmp); - tmp = gnutls_kx_get_name(gnutls_kx_get_algo(state)); + tmp = gnutls_kx_get_name(gnutls_kx_get(state)); printf("- Key Exchange: %s\n", tmp); tmp = gnutls_compression_get_name - (gnutls_compression_get_algo(state)); + (gnutls_compression_get(state)); printf("- Compression: %s\n", tmp); - tmp = gnutls_cipher_get_name(gnutls_cipher_get_algo(state)); + tmp = gnutls_cipher_get_name(gnutls_cipher_get(state)); printf("- Cipher: %s\n", tmp); - tmp = gnutls_mac_get_name(gnutls_mac_get_algo(state)); + tmp = gnutls_mac_get_name(gnutls_mac_get(state)); printf("- MAC: %s\n", tmp); } diff --git a/lib/auth_x509.c b/lib/auth_x509.c index ae12f2251e..0e2ae0a39c 100644 --- a/lib/auth_x509.c +++ b/lib/auth_x509.c @@ -593,7 +593,7 @@ int _gnutls_proc_x509_server_certificate(GNUTLS_STATE state, opaque * data, if ((ret = _gnutls_check_x509pki_key_usage(&peer_certificate_list[0], - gnutls_kx_get_algo(state))) + gnutls_kx_get(state))) < 0) { gnutls_assert(); CLEAR_CERTS; diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in index 19f09b5c87..2d41d5bdd4 100644 --- a/lib/gnutls.h.in.in +++ b/lib/gnutls.h.in.in @@ -93,10 +93,10 @@ int gnutls_alert_send( GNUTLS_STATE, GNUTLS_AlertLevel, GNUTLS_AlertDescripti int gnutls_alert_send_appropriate( GNUTLS_STATE state, int err); /* get information on the current state */ -GNUTLS_BulkCipherAlgorithm gnutls_cipher_get_algo( GNUTLS_STATE state); -GNUTLS_KXAlgorithm gnutls_kx_get_algo( GNUTLS_STATE state); -GNUTLS_MACAlgorithm gnutls_mac_get_algo( GNUTLS_STATE state); -GNUTLS_CompressionMethod gnutls_compression_get_algo( GNUTLS_STATE state); +GNUTLS_BulkCipherAlgorithm gnutls_cipher_get( GNUTLS_STATE state); +GNUTLS_KXAlgorithm gnutls_kx_get( GNUTLS_STATE state); +GNUTLS_MACAlgorithm gnutls_mac_get( GNUTLS_STATE state); +GNUTLS_CompressionMethod gnutls_compression_get( GNUTLS_STATE state); /* the name of the specified algorithms */ const char *gnutls_cipher_get_name( GNUTLS_BulkCipherAlgorithm); diff --git a/lib/gnutls_int_compat.c b/lib/gnutls_int_compat.c index 192896ffa5..1452d82456 100644 --- a/lib/gnutls_int_compat.c +++ b/lib/gnutls_int_compat.c @@ -3,6 +3,10 @@ /* This file contains functions needed only for binary compatibility * with previous versions. */ +#define GNUTLS_BACKWARDS_COMPATIBLE + + +#ifdef GNUTLS_BACKWARDS_COMPATIBLE /* used in 0.3.x */ int gnutls_anon_set_server_cred( GNUTLS_ANON_SERVER_CREDENTIALS res, int dh_bits) { @@ -35,3 +39,20 @@ int gnutls_anon_client_get_dh_bits(GNUTLS_STATE state) int gnutls_set_max_handshake_data_buffer_size( GNUTLS_STATE state) { return 0; } + +GNUTLS_BulkCipherAlgorithm gnutls_cipher_get_algo( GNUTLS_STATE state) { + return gnutls_cipher_get( state); +} +GNUTLS_KXAlgorithm gnutls_kx_get_algo( GNUTLS_STATE state) { + return gnutls_kx_get( state); +} + +GNUTLS_MACAlgorithm gnutls_mac_get_algo( GNUTLS_STATE state) { + return gnutls_mac_get( state); +} + +GNUTLS_CompressionMethod gnutls_compression_get_algo( GNUTLS_STATE state) { + return gnutls_compression_get( state); +} + +#endif /* GNUTLS_BACKWARDS_COMPATIBLE */ diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c index fbad0e4ddc..40ea513499 100644 --- a/lib/gnutls_record.c +++ b/lib/gnutls_record.c @@ -982,42 +982,42 @@ ssize_t gnutls_recv_int( GNUTLS_STATE state, ContentType type, HandshakeType hty } /** - * gnutls_cipher_get_algo - Returns the currently used cipher. + * gnutls_cipher_get - Returns the currently used cipher. * @state: is a &GNUTLS_STATE structure. * * Returns the currently used cipher. **/ -GNUTLS_BulkCipherAlgorithm gnutls_cipher_get_algo( GNUTLS_STATE state) { +GNUTLS_BulkCipherAlgorithm gnutls_cipher_get( GNUTLS_STATE state) { return state->security_parameters.read_bulk_cipher_algorithm; } /** - * gnutls_kx_get_algo - Returns the key exchange algorithm. + * gnutls_kx_get - Returns the key exchange algorithm. * @state: is a &GNUTLS_STATE structure. * * Returns the key exchange algorithm used in the last handshake. **/ -GNUTLS_KXAlgorithm gnutls_kx_get_algo( GNUTLS_STATE state) { +GNUTLS_KXAlgorithm gnutls_kx_get( GNUTLS_STATE state) { return state->security_parameters.kx_algorithm; } /** - * gnutls_mac_get_algo - Returns the currently used mac algorithm. + * gnutls_mac_get - Returns the currently used mac algorithm. * @state: is a &GNUTLS_STATE structure. * * Returns the currently used mac algorithm. **/ -GNUTLS_MACAlgorithm gnutls_mac_get_algo( GNUTLS_STATE state) { +GNUTLS_MACAlgorithm gnutls_mac_get( GNUTLS_STATE state) { return state->security_parameters.read_mac_algorithm; } /** - * gnutls_compression_get_algo - Returns the currently used compression algorithm. + * gnutls_compression_get - Returns the currently used compression algorithm. * @state: is a &GNUTLS_STATE structure. * * Returns the currently used compression method. **/ -GNUTLS_CompressionMethod gnutls_compression_get_algo( GNUTLS_STATE state) { +GNUTLS_CompressionMethod gnutls_compression_get( GNUTLS_STATE state) { return state->security_parameters.read_compression_algorithm; } diff --git a/lib/gnutls_record.h b/lib/gnutls_record.h index d602267ebe..58a7bd589e 100644 --- a/lib/gnutls_record.h +++ b/lib/gnutls_record.h @@ -1,4 +1,4 @@ -KXAlgorithm gnutls_kx_get_algo( GNUTLS_STATE state); +KXAlgorithm gnutls_kx_get( GNUTLS_STATE state); ssize_t gnutls_send_int( GNUTLS_STATE state, ContentType type, HandshakeType htype, const void* data, size_t sizeofdata); ssize_t gnutls_recv_int( GNUTLS_STATE state, ContentType type, HandshakeType, char* data, size_t sizeofdata); ssize_t _gnutls_send_change_cipher_spec( GNUTLS_STATE state, int again); diff --git a/src/common.h b/src/common.h index 4c8868d2cc..2c1e92c70f 100644 --- a/src/common.h +++ b/src/common.h @@ -22,7 +22,7 @@ GNUTLS_KXAlgorithm kx; /* print the key exchange's algorithm name */ - kx = gnutls_kx_get_algo(state); + kx = gnutls_kx_get(state); tmp = gnutls_kx_get_name( kx); printf("- Key Exchange: %s\n", tmp); @@ -120,13 +120,13 @@ GNUTLS_KXAlgorithm kx; tmp = gnutls_protocol_get_name(gnutls_protocol_get_version(state)); printf("- Version: %s\n", tmp); - tmp = gnutls_compression_get_name(gnutls_compression_get_algo( state)); + tmp = gnutls_compression_get_name(gnutls_compression_get( state)); printf("- Compression: %s\n", tmp); - tmp = gnutls_cipher_get_name(gnutls_cipher_get_algo( state)); + tmp = gnutls_cipher_get_name(gnutls_cipher_get( state)); printf("- Cipher: %s\n", tmp); - tmp = gnutls_mac_get_name(gnutls_mac_get_algo( state)); + tmp = gnutls_mac_get_name(gnutls_mac_get( state)); printf("- MAC: %s\n", tmp); return 0; diff --git a/src/serv.c b/src/serv.c index e3554f8f62..1438a3a7aa 100644 --- a/src/serv.c +++ b/src/serv.c @@ -126,12 +126,12 @@ void peer_print_info( GNUTLS_STATE state) */ /* print srp specific data */ - if (gnutls_kx_get_algo(state) == GNUTLS_KX_SRP) { + if (gnutls_kx_get(state) == GNUTLS_KX_SRP) { sprintf(tmp2, "

Connected as user '%s'.

\n", gnutls_srp_server_get_username( state)); } - if (gnutls_kx_get_algo(state) == GNUTLS_KX_ANON_DH) { + if (gnutls_kx_get(state) == GNUTLS_KX_ANON_DH) { sprintf(tmp2, "

Connect using anonymous DH (prime of %d bits)

\n", gnutls_dh_get_bits( state)); } @@ -142,23 +142,23 @@ void peer_print_info( GNUTLS_STATE state) tmp = gnutls_protocol_get_name(gnutls_protocol_get_version(state)); sprintf(tmp2, "Protocol version: %s
\n", tmp); - tmp = gnutls_kx_get_name(gnutls_kx_get_algo(state)); + tmp = gnutls_kx_get_name(gnutls_kx_get(state)); sprintf(tmp2, "Key Exchange: %s
\n", tmp); - if (gnutls_kx_get_algo(state) == GNUTLS_KX_DHE_RSA || gnutls_kx_get_algo(state) == GNUTLS_KX_DHE_DSS) { + if (gnutls_kx_get(state) == GNUTLS_KX_DHE_RSA || gnutls_kx_get(state) == GNUTLS_KX_DHE_DSS) { sprintf(tmp2, "Ephemeral DH using prime of %d bits.
\n", gnutls_dh_get_bits( state)); } tmp = gnutls_compression_get_name - (gnutls_compression_get_algo(state)); + (gnutls_compression_get(state)); sprintf(tmp2, "Compression: %s
\n", tmp); - tmp = gnutls_cipher_get_name(gnutls_cipher_get_algo(state)); + tmp = gnutls_cipher_get_name(gnutls_cipher_get(state)); sprintf(tmp2, "Cipher: %s
\n", tmp); - tmp = gnutls_mac_get_name(gnutls_mac_get_algo(state)); + tmp = gnutls_mac_get_name(gnutls_mac_get(state)); sprintf(tmp2, "MAC: %s
\n", tmp); strcat( http_buffer, "

\n");