gnutls_*_get_algo() renamed to gnutls_*_get() (suggested by Simon Josefsson)

diff --git a/NEWS b/NEWS
index 8a06caa51959a13d711b723f53a217075f95a2f0..ba4bd04860a2fb2616266698c0c70a5579f1b32e 100644 (file)
--- 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 761a532b7e2c8b6562ac052110a96e7b214d9760..9e9745544bc9951a405f4ac0e1605f6856038a8d 100644 (file)
--- 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 4e07171c635711fae98662965f026adbb866996e..b06da5402ad5d736ccfc49ebee8d02e7d033dc58 100644 (file)
--- 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 ae12f2251e3fbc150833f084d6983389503c6bac..0e2ae0a39c26b41917adf8d55f44395fd1966cea 100644 (file)
--- 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 19f09b5c872dc03107118194dc05db396450476d..2d41d5bdd4dfd624e031ddb1053008abd47675ad 100644 (file)
--- 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 192896ffa5f793eb93cebf9a4691f1c0bc20e3b3..1452d8245660403374036b9e691663aa184c0ae1 100644 (file)
--- 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 fbad0e4ddc1b91bb5462688a6af97379ab5fe0e1..40ea5134995f8ec233fcbd50f35d4398865e3bc8 100644 (file)
--- 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 d602267ebed77110cb31b5e44dfbfb754623351d..58a7bd589e6d27fdfa9836bc27d3470d0ba99db0 100644 (file)
--- 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 4c8868d2cc88d3464cc78355005ea6b0a088f2af..2c1e92c70f125f84a8e6c4d6f55e02cde215c0cf 100644 (file)
--- 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 e3554f8f623b421e246db989928f86ebe8f962ed..1438a3a7aa9d4e699fd8686231d10853d4d7e4a9 100644 (file)
--- 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, "<p>Connected as user '%s'.</p>\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, "<p> Connect using anonymous DH (prime of %d bits)</p>\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: <b>%s</b><br>\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: <b>%s</b><br>\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 <b>%d</b> bits.<br>\n",
                                gnutls_dh_get_bits( state));
        }
                        
        tmp =
            gnutls_compression_get_name
-           (gnutls_compression_get_algo(state));
+           (gnutls_compression_get(state));
        sprintf(tmp2, "Compression: <b>%s</b><br>\n", tmp);
        
-       tmp = gnutls_cipher_get_name(gnutls_cipher_get_algo(state));
+       tmp = gnutls_cipher_get_name(gnutls_cipher_get(state));
        sprintf(tmp2, "Cipher: <b>%s</b><br>\n", tmp);
        
-       tmp = gnutls_mac_get_name(gnutls_mac_get_algo(state));
+       tmp = gnutls_mac_get_name(gnutls_mac_get(state));
        sprintf(tmp2, "MAC: <b>%s</b><br>\n", tmp);
 
        strcat( http_buffer, "</P>\n");