diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-02-09 08:37:38 +0100 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-02-09 08:37:38 +0100 |
commit | c982da6df4f1660321592094d03eae97a41640cf (patch) | |
tree | e2c91fb077d3b548b60dea869bfca3968fcf77f9 | |
parent | b9348908794d69aa0be3f29f3b32428c9f699907 (diff) | |
download | gnutls_3_0_12_x.tar.gz |
updated documentationgnutls_3_0_12_x
-rwxr-xr-x | build-aux/config.rpath | 104 | ||||
-rw-r--r-- | doc/examples/ex-client-anon.c | 2 | ||||
-rw-r--r-- | doc/examples/ex-client-dtls.c | 2 | ||||
-rw-r--r-- | doc/examples/ex-client-psk.c | 2 | ||||
-rw-r--r-- | doc/examples/ex-client-resume.c | 2 | ||||
-rw-r--r-- | doc/examples/ex-client-srp.c | 2 | ||||
-rw-r--r-- | doc/examples/ex-serv-anon.c | 2 | ||||
-rw-r--r-- | doc/examples/ex-serv-dtls.c | 2 | ||||
-rw-r--r-- | doc/examples/ex-serv-srp.c | 2 | ||||
-rw-r--r-- | doc/examples/ex-serv-x509.c | 2 | ||||
-rw-r--r-- | lib/includes/gnutls/abstract.h | 4 |
11 files changed, 54 insertions, 72 deletions
diff --git a/build-aux/config.rpath b/build-aux/config.rpath index c0d31f92af..17298f2348 100755 --- a/build-aux/config.rpath +++ b/build-aux/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2012 Free Software Foundation, Inc. +# Copyright 1996-2010 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # @@ -57,6 +57,13 @@ else aix*) wl='-Wl,' ;; + darwin*) + case $cc_basename in + xlc*) + wl='-Wl,' + ;; + esac + ;; mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) @@ -65,7 +72,9 @@ else irix5* | irix6* | nonstopux*) wl='-Wl,' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + newsos6) + ;; + linux* | k*bsd*-gnu) case $cc_basename in ecc*) wl='-Wl,' @@ -76,26 +85,17 @@ else lf95*) wl='-Wl,' ;; - nagfor*) - wl='-Wl,-Wl,,' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + pgcc | pgf77 | pgf90) wl='-Wl,' ;; ccc*) wl='-Wl,' ;; - xl* | bgxl* | bgf* | mpixl*) - wl='-Wl,' - ;; como) wl='-lopt=' ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) - wl= - ;; *Sun\ C*) wl='-Wl,' ;; @@ -103,24 +103,13 @@ else ;; esac ;; - newsos6) - ;; - *nto* | *qnx*) - ;; osf3* | osf4* | osf5*) wl='-Wl,' ;; rdos*) ;; solaris*) - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - wl='-Qoption ld ' - ;; - *) - wl='-Wl,' - ;; - esac + wl='-Wl,' ;; sunos4*) wl='-Qoption ld ' @@ -182,14 +171,15 @@ if test "$with_gnu_ld" = yes; then fi ;; amigaos*) - case "$host_cpu" in - powerpc) - ;; - m68k) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports + # that the semantics of dynamic libraries on AmigaOS, at least up + # to version 4, is to share data among multiple programs linked + # with the same dynamic library. Since this doesn't match the + # behavior of shared libraries on other platforms, we cannot use + # them. + ld_shlibs=no ;; beos*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then @@ -208,13 +198,11 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; - haiku*) - ;; interix[3-9]*) hardcode_direct=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else @@ -337,14 +325,10 @@ else fi ;; amigaos*) - case "$host_cpu" in - powerpc) - ;; - m68k) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + # see comment about different semantics on the GNU ld section + ld_shlibs=no ;; bsdi[45]*) ;; @@ -358,15 +342,24 @@ else ;; darwin* | rhapsody*) hardcode_direct=no - if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then + if test "$GCC" = yes ; then : else - ld_shlibs=no + case $cc_basename in + xlc*) + ;; + *) + ld_shlibs=no + ;; + esac fi ;; dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; + freebsd1*) + ld_shlibs=no + ;; freebsd2.2*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -427,8 +420,6 @@ else hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; - *nto* | *qnx*) - ;; openbsd*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes @@ -524,12 +515,7 @@ case "$host_os" in library_names_spec='$libname$shrext' ;; amigaos*) - case "$host_cpu" in - powerpc*) - library_names_spec='$libname$shrext' ;; - m68k) - library_names_spec='$libname.a' ;; - esac + library_names_spec='$libname.a' ;; beos*) library_names_spec='$libname$shrext' @@ -548,6 +534,8 @@ case "$host_os" in dgux*) library_names_spec='$libname$shrext' ;; + freebsd1*) + ;; freebsd* | dragonfly*) case "$host_os" in freebsd[123]*) @@ -559,9 +547,6 @@ case "$host_os" in gnu*) library_names_spec='$libname$shrext' ;; - haiku*) - library_names_spec='$libname$shrext' - ;; hpux9* | hpux10* | hpux11*) case $host_cpu in ia64*) @@ -597,7 +582,7 @@ case "$host_os" in ;; linux*oldld* | linux*aout* | linux*coff*) ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu) library_names_spec='$libname$shrext' ;; knetbsd*-gnu) @@ -609,7 +594,7 @@ case "$host_os" in newsos6) library_names_spec='$libname$shrext' ;; - *nto* | *qnx*) + nto-qnx*) library_names_spec='$libname$shrext' ;; openbsd*) @@ -640,9 +625,6 @@ case "$host_os" in sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) library_names_spec='$libname$shrext' ;; - tpf*) - library_names_spec='$libname$shrext' - ;; uts4*) library_names_spec='$libname$shrext' ;; diff --git a/doc/examples/ex-client-anon.c b/doc/examples/ex-client-anon.c index 8c06bda900..ba56934461 100644 --- a/doc/examples/ex-client-anon.c +++ b/doc/examples/ex-client-anon.c @@ -59,7 +59,7 @@ main (void) { ret = gnutls_handshake (session); } - while (gnutls_error_is_fatal (ret) == 0); + while (ret < 0 && gnutls_error_is_fatal (ret) == 0); if (ret < 0) { diff --git a/doc/examples/ex-client-dtls.c b/doc/examples/ex-client-dtls.c index 222762a0b5..7bc4f5dd11 100644 --- a/doc/examples/ex-client-dtls.c +++ b/doc/examples/ex-client-dtls.c @@ -75,7 +75,7 @@ main (void) { ret = gnutls_handshake (session); } - while (gnutls_error_is_fatal (ret) == 0); + while (ret < 0 && gnutls_error_is_fatal (ret) == 0); if (ret < 0) { diff --git a/doc/examples/ex-client-psk.c b/doc/examples/ex-client-psk.c index 7c0bd7e146..72842140f6 100644 --- a/doc/examples/ex-client-psk.c +++ b/doc/examples/ex-client-psk.c @@ -69,7 +69,7 @@ main (void) { ret = gnutls_handshake (session); } - while (gnutls_error_is_fatal (ret) == 0); + while (ret < 0 && gnutls_error_is_fatal (ret) == 0); if (ret < 0) { diff --git a/doc/examples/ex-client-resume.c b/doc/examples/ex-client-resume.c index 5aeae58c92..3e973eb654 100644 --- a/doc/examples/ex-client-resume.c +++ b/doc/examples/ex-client-resume.c @@ -67,7 +67,7 @@ main (void) { ret = gnutls_handshake (session); } - while (gnutls_error_is_fatal (ret) == 0); + while (ret < 0 && gnutls_error_is_fatal (ret) == 0); if (ret < 0) { diff --git a/doc/examples/ex-client-srp.c b/doc/examples/ex-client-srp.c index 5a753abff3..5a63d93ec6 100644 --- a/doc/examples/ex-client-srp.c +++ b/doc/examples/ex-client-srp.c @@ -82,7 +82,7 @@ main (void) gnutls_record_send (session, MSG, strlen (MSG)); ret = gnutls_record_recv (session, buffer, MAX_BUF); - if (gnutls_error_is_fatal (ret) == 1 || ret == 0) + if (gnutls_error_is_fatal (ret) != 0 || ret == 0) { if (ret == 0) { diff --git a/doc/examples/ex-serv-anon.c b/doc/examples/ex-serv-anon.c index 93c8a70fee..21efd462c4 100644 --- a/doc/examples/ex-serv-anon.c +++ b/doc/examples/ex-serv-anon.c @@ -121,7 +121,7 @@ main (void) { ret = gnutls_handshake (session); } - while (gnutls_error_is_fatal (ret) == 0); + while (ret < 0 && gnutls_error_is_fatal (ret) == 0); if (ret < 0) { diff --git a/doc/examples/ex-serv-dtls.c b/doc/examples/ex-serv-dtls.c index 355f7b9839..030d01c4b2 100644 --- a/doc/examples/ex-serv-dtls.c +++ b/doc/examples/ex-serv-dtls.c @@ -191,7 +191,7 @@ main (void) { ret = gnutls_handshake (session); } - while (gnutls_error_is_fatal (ret) == 0); + while (ret < 0 && gnutls_error_is_fatal (ret) == 0); if (ret < 0) { diff --git a/doc/examples/ex-serv-srp.c b/doc/examples/ex-serv-srp.c index 0cff30c448..a46d39ec34 100644 --- a/doc/examples/ex-serv-srp.c +++ b/doc/examples/ex-serv-srp.c @@ -122,7 +122,7 @@ main (void) { ret = gnutls_handshake (session); } - while (gnutls_error_is_fatal (ret) == 0); + while (ret < 0 && gnutls_error_is_fatal (ret) == 0); if (ret < 0) { diff --git a/doc/examples/ex-serv-x509.c b/doc/examples/ex-serv-x509.c index 5383fb3425..8b29891409 100644 --- a/doc/examples/ex-serv-x509.c +++ b/doc/examples/ex-serv-x509.c @@ -140,7 +140,7 @@ main (void) { ret = gnutls_handshake (session); } - while (gnutls_error_is_fatal (ret) == 0); + while (ret < 0 && gnutls_error_is_fatal (ret) == 0); if (ret < 0) { diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h index e0fb249103..b89da86c30 100644 --- a/lib/includes/gnutls/abstract.h +++ b/lib/includes/gnutls/abstract.h @@ -278,8 +278,8 @@ void gnutls_pcert_deinit (gnutls_pcert_st* pcert); gnutls_privkey_t *privkey); -void gnutls_certificate_set_retrieve_function2 - (gnutls_certificate_credentials_t cred, +void gnutls_certificate_set_retrieve_function2 ( + gnutls_certificate_credentials_t cred, gnutls_certificate_retrieve_function2 * func); int |