*** empty log message ***

diff --git a/doc/tex/Makefile.am b/doc/tex/Makefile.am
index f2d1686d7ad59a73e00c933d32abb5f4256b3761..69ec34f88702a40764898950773e6d4b857e03d5 100644 (file)
--- a/doc/tex/Makefile.am
+++ b/doc/tex/Makefile.am
@@ -2,7 +2,7 @@ EXTRA_DIST = gnutls.tex gnutls.ps gnutls.html  \
        ex1.tex ex2.tex ex3.tex srp1.tex serv1.tex gnutls.css \
        nx_grp_g.png  prev_g.png  up_g.png fdl.tex macros.tex \
        cover.tex.in img1.png  img3.png  img5.png img2.png img4.png \
-       img6.png gnutls-logo.ps layers.ps
+       img6.png img7.png gnutls-logo.ps layers.ps
 
 TEX_OBJECTS = gnutls.tex ../../lib/gnutls-api.tex serv1.tex ex1.tex ex2.tex ex3.tex fdl.tex \
        macros.tex cover.tex ciphersuites.tex resumedb.tex translayer.tex asn1.tex ../../lib/asn1-api.tex \

diff --git a/doc/tex/errors.tex b/doc/tex/errors.tex
index b3d20c454c5e7ea266fd40ba8237e6901e0b55c2..e69d55e016af9d8b7822c37f038304beb47a0b0e 100644 (file)
--- a/doc/tex/errors.tex
+++ b/doc/tex/errors.tex
@@ -12,7 +12,7 @@ a fatal error code is GNUTLS\_E\_MAC\_FAILED. Non-fatal errors
 may warn about something (ie a warning alert was received), or
 indicate the some action has to be taken. This is the case with
 the error code GNUTLS\_E\_REHANDSHAKE returned by 
-\hyperref{gnutls\_record\_read()}{gnutls\_record\_read() (see Section }{)}{gnutls_record_read}.
+\hyperref{gnutls\_record\_recv()}{gnutls\_record\_recv() (see Section }{)}{gnutls_record_recv}.
 This error code indicates that the server requests a rehandshake. The client
 may ignore this request, or may reply with an alert.
 You can test if an error code is a fatal one by using the

diff --git a/doc/tex/ex1.tex b/doc/tex/ex1.tex
index 5833ba2418794e3ed1c8ce0a8a30a0f2f6cb6c13..3ab3d9c8c2224ecadec148b9052299850abf6df9 100644 (file)
--- a/doc/tex/ex1.tex
+++ b/doc/tex/ex1.tex
@@ -130,9 +130,9 @@ int main()
        */
       print_info(state);
 
-      gnutls_record_write( state, MSG, strlen(MSG));
+      gnutls_record_send( state, MSG, strlen(MSG));
 
-      ret = gnutls_record_read( state, buffer, MAX_BUF);
+      ret = gnutls_record_recv( state, buffer, MAX_BUF);
       if (gnutls_error_is_fatal(ret) == 1 || ret == 0) {
          if (ret == 0) {
             printf("- Peer has closed the GNUTLS connection\n");

diff --git a/doc/tex/ex2.tex b/doc/tex/ex2.tex
index 9409f03376f58649e4f2491f606e5569bc0d0db5..46f0a051ce928114c4ad4fdd95073681c301403d 100644 (file)
--- a/doc/tex/ex2.tex
+++ b/doc/tex/ex2.tex
@@ -102,9 +102,9 @@ int main()
       printf("- Handshake was completed\n");
    }
 
-   gnutls_record_write( state, MSG, strlen(MSG));
+   gnutls_record_send( state, MSG, strlen(MSG));
 
-   ret = gnutls_record_read( state, buffer, MAX_BUF);
+   ret = gnutls_record_recv( state, buffer, MAX_BUF);
    if (gnutls_error_is_fatal(ret) == 1 || ret == 0) {
       if (ret == 0) {
          printf("- Peer has closed the GNUTLS connection\n");

diff --git a/doc/tex/layers.tex b/doc/tex/layers.tex
index 6c7485d054604751c73bda429c758cfac6c8ec1a..e5c6edd630d8e3d751c30112e9a3dd78ee7176cc 100644 (file)
--- a/doc/tex/layers.tex
+++ b/doc/tex/layers.tex
@@ -6,8 +6,8 @@ the Handshake Protocol and the Alert Protocol. The Record Protocol
 is to serve all other protocols and is above the transport layer.
 The Record protocol offers symmetric encryption, and data authenticity.
 In \gnutls{} the record protocol is accessed using the 
-\hyperref{gnutls\_record\_read()}{gnutls\_record\_read() (see Section }{)}{gnutls_record_read} and
-\hyperref{gnutls\_record\_write()}{gnutls\_record\_write() (see Section }{)}{gnutls_record_write}
+\hyperref{gnutls\_record\_recv()}{gnutls\_record\_recv() (see Section }{)}{gnutls_record_recv} and
+\hyperref{gnutls\_record\_send()}{gnutls\_record\_send() (see Section }{)}{gnutls_record_send}
 functions.
 
 \par

diff --git a/doc/tex/serv1.tex b/doc/tex/serv1.tex
index bb6d7b1b522ac711133bc456abd5c362e1da332c..cbbb84d6b9526cf48f3564971e6db59d162aec7f 100644 (file)
--- a/doc/tex/serv1.tex
+++ b/doc/tex/serv1.tex
@@ -210,7 +210,7 @@ int main()
       i = 0;
       for (;;) {
          bzero(buffer, MAX_BUF + 1);
-         ret = gnutls_record_read( state, buffer, MAX_BUF);
+         ret = gnutls_record_recv( state, buffer, MAX_BUF);
 
          if (gnutls_error_is_fatal(ret) == 1 || ret == 0) {
             if (ret == 0) {
@@ -228,7 +228,7 @@ int main()
          if (ret > 0) {
             /* echo data back to the client
              */
-            gnutls_record_write( state, buffer,
+            gnutls_record_send( state, buffer,
                          strlen(buffer));
          }
          if (ret == GNUTLS_E_WARNING_ALERT_RECEIVED || ret == GNUTLS_E_FATAL_ALERT_RECEIVED) {

diff --git a/doc/tex/srp1.tex b/doc/tex/srp1.tex
index d9e5c68d8ca1d149ff1d4cbabf626bc3c45f9e1e..ee6103b3cb4d0a41f8fc2fa4f09b9da16f5fa4da 100644 (file)
--- a/doc/tex/srp1.tex
+++ b/doc/tex/srp1.tex
@@ -99,9 +99,9 @@ int main()
       printf("- Handshake was completed\n");
    }
 
-   gnutls_record_write( state, MSG, strlen(MSG));
+   gnutls_record_send( state, MSG, strlen(MSG));
 
-   ret = gnutls_record_read( state, buffer, MAX_BUF);
+   ret = gnutls_record_recv( state, buffer, MAX_BUF);
    if (gnutls_error_is_fatal(ret) == 1 || ret == 0) {
       if (ret == 0) {
          printf("- Peer has closed the GNUTLS connection\n");

diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in
index b02ffd27be46bec484a9d2328aca14fbe1de4e9a..2872175a981f9d2ce68571ec1f80fea7661df550 100644 (file)
--- a/lib/gnutls.h.in.in
+++ b/lib/gnutls.h.in.in
@@ -127,10 +127,10 @@ int gnutls_error_is_fatal( int error);
 void gnutls_perror( int error);
 const char* gnutls_strerror( int error);
 
-ssize_t gnutls_record_write( GNUTLS_STATE state, void *data, size_t sizeofdata);
-ssize_t gnutls_record_read( GNUTLS_STATE state, void *data, size_t sizeofdata);
-#define gnutls_read gnutls_record_read
-#define gnutls_write gnutls_record_write
+ssize_t gnutls_record_send( GNUTLS_STATE state, void *data, size_t sizeofdata);
+ssize_t gnutls_record_recv( GNUTLS_STATE state, void *data, size_t sizeofdata);
+#define gnutls_read gnutls_record_recv
+#define gnutls_write gnutls_record_send
 
 /* functions to set priority of cipher suites */
 int gnutls_cipher_set_priority( GNUTLS_STATE state, GNUTLS_LIST);

diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index 809c5c65ecdef38085dabe0caee70fc4548f7baf..3ffba7331db8dd2c3b4529b012d19b087b619230 100644 (file)
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -906,7 +906,7 @@ gnutls_check_version( const char *req_version )
 
 
 /**
-  * gnutls_record_write - sends to the peer the specified data
+  * gnutls_record_send - sends to the peer the specified data
   * @state: is a &GNUTLS_STATE structure.
   * @data: contains the data to send
   * @sizeofdata: is the length of the data
@@ -924,12 +924,12 @@ gnutls_check_version( const char *req_version )
   * Returns the number of bytes sent, or a negative error code.
   *
   **/
-ssize_t gnutls_record_write( GNUTLS_STATE state, const void *data, size_t sizeofdata) {
+ssize_t gnutls_record_send( GNUTLS_STATE state, const void *data, size_t sizeofdata) {
        return gnutls_send_int( state, GNUTLS_APPLICATION_DATA, -1, data, sizeofdata);
 }
 
 /**
-  * gnutls_record_read - reads data from the TLS record protocol
+  * gnutls_record_recv - reads data from the TLS record protocol
   * @state: is a &GNUTLS_STATE structure.
   * @data: contains the data to send
   * @sizeofdata: is the length of the data
@@ -944,7 +944,7 @@ ssize_t gnutls_record_write( GNUTLS_STATE state, const void *data, size_t sizeof
   * or perform a handshake again. (only a client may receive this message)
   *
   **/
-ssize_t gnutls_record_read( GNUTLS_STATE state, void *data, size_t sizeofdata) {
+ssize_t gnutls_record_recv( GNUTLS_STATE state, void *data, size_t sizeofdata) {
        return gnutls_recv_int( state, GNUTLS_APPLICATION_DATA, -1, data, sizeofdata);
 }
 

diff --git a/src/cli.c b/src/cli.c
index c6eb42356ba2b44fc8c6835c5636f6b6d17103f2..730e90994165df3893d5ade155dcdaf8bba81fa3 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -351,7 +351,7 @@ int main(int argc, char **argv)
                if (FD_ISSET(sd, &rset)) {
                        bzero(buffer, MAX_BUF + 1);
                        do {
-                               ret = gnutls_read(state, buffer, MAX_BUF);
+                               ret = gnutls_record_recv(state, buffer, MAX_BUF);
                        } while (ret == GNUTLS_E_INTERRUPTED
                                 || ret == GNUTLS_E_AGAIN);
                        /* remove new line */
@@ -426,7 +426,7 @@ int main(int argc, char **argv)
                        }
                        do {
                                ret =
-                                   gnutls_write(state, buffer,
+                                   gnutls_record_send(state, buffer,
                                                 strlen(buffer));
                        } while (ret == GNUTLS_E_AGAIN
                                 || ret == GNUTLS_E_INTERRUPTED);

diff --git a/src/serv.c b/src/serv.c
index defc1e558eaf98f3d449b3d483ddfa1a7e43be0d..6020011fbd2bbc346f03bcd3876258b43bfe0499 100644 (file)
--- a/src/serv.c
+++ b/src/serv.c
@@ -249,7 +249,7 @@ int read_request(GNUTLS_STATE state, char *data, int data_size, int rnl)
        ptr = data;
        for (n = 1; n < data_size; n++) {
                do {
-                       rc = gnutls_read(state, &c, 1);
+                       rc = gnutls_record_recv(state, &c, 1);
                } while (rc == GNUTLS_E_INTERRUPTED
                         || rc == GNUTLS_E_AGAIN);
 
@@ -453,7 +453,7 @@ int main(int argc, char **argv)
                                             strlen(buffer));
                                        do {
                                                ret =
-                                                   gnutls_write(state,
+                                                   gnutls_record_send(state,
                                                                 buffer,
                                                                 strlen
                                                                 (buffer));
@@ -469,7 +469,7 @@ int main(int argc, char **argv)
                                        strcat(http_buffer, HTTP_END);
                                        do {
                                                ret =
-                                                   gnutls_write(state,
+                                                   gnutls_record_send(state,
                                                                 http_buffer,
                                                                 strlen
                                                                 (http_buffer));