diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-12-28 16:24:18 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-12-28 16:44:44 +0200 |
commit | 76f2856a51f4cae238aa3117e03ac7a8204dff9f (patch) | |
tree | 70948a63ddc3669fe3d06b6958c8f0401e8e0abb | |
parent | 78bf1de9b111485037388893bf2ccc766f8d167d (diff) | |
download | gnutls-76f2856a51f4cae238aa3117e03ac7a8204dff9f.tar.gz |
gnutls_atfork was no longer in use.
-rw-r--r-- | lib/extras/randomart.c | 2 | ||||
-rw-r--r-- | lib/system.c | 22 | ||||
-rw-r--r-- | lib/system.h | 2 | ||||
-rw-r--r-- | lib/x509/output.c | 3 |
4 files changed, 2 insertions, 27 deletions
diff --git a/lib/extras/randomart.c b/lib/extras/randomart.c index c2ce08f4b0..cf8d72edf7 100644 --- a/lib/extras/randomart.c +++ b/lib/extras/randomart.c @@ -74,7 +74,7 @@ key_fingerprint_randomart (uint8_t * dgst_raw, u_int dgst_raw_len, uint8_t field[FLDSIZE_X][FLDSIZE_Y]; u_int i, b; int x, y; - const size_t len = sizeof(augmentation_string) - 1; + const size_t len = sizeof(augmentation_string) - 2; retval = gnutls_calloc (1, (FLDSIZE_X + 3) * (FLDSIZE_Y + 2)); if (retval == NULL) diff --git a/lib/system.c b/lib/system.c index 88468d6594..e5440fec20 100644 --- a/lib/system.c +++ b/lib/system.c @@ -185,14 +185,6 @@ gnutls_system_mutex_unlock (void **priv) return 0; } -int -_gnutls_atfork (void (*prepare) (void), void (*parent) (void), - void (*child) (void)) -{ - return 0; -} - - #endif /* WIN32_LOCKS */ #ifdef HAVE_PTHREAD_LOCKS @@ -251,13 +243,6 @@ gnutls_system_mutex_unlock (void **priv) return 0; } -int -_gnutls_atfork (void (*prepare) (void), void (*parent) (void), - void (*child) (void)) -{ - return pthread_atfork (prepare, parent, child); -} - #endif /* PTHREAD_LOCKS */ #ifdef HAVE_NO_LOCKS @@ -286,13 +271,6 @@ gnutls_system_mutex_unlock (void **priv) return 0; } -int -_gnutls_atfork (void (*prepare) (void), void (*parent) (void), - void (*child) (void)) -{ - return 0; -} - #endif /* NO_LOCKS */ gnutls_time_func gnutls_time = time; diff --git a/lib/system.h b/lib/system.h index 7029c9c6b1..e3b47b8bdc 100644 --- a/lib/system.h +++ b/lib/system.h @@ -34,8 +34,6 @@ ssize_t system_read_peek (gnutls_transport_ptr_t ptr, void *data, #endif #endif -int _gnutls_atfork (void (*prepare) (void), void (*parent) (void), - void (*child) (void)); extern gnutls_time_func gnutls_time; static inline void millisleep(unsigned int ms) diff --git a/lib/x509/output.c b/lib/x509/output.c index 894f56a112..204c7bd18f 100644 --- a/lib/x509/output.c +++ b/lib/x509/output.c @@ -1381,7 +1381,7 @@ print_fingerprint (gnutls_buffer_st * str, gnutls_x509_crt_t cert, adds (str, _("\trandomart:\n")); adds (str, p); - adds (str, "\n"); + adds (str, "\n\n"); gnutls_free(p); } @@ -1410,7 +1410,6 @@ print_other (gnutls_buffer_st * str, gnutls_x509_crt_t cert, int notsigned) { if (!notsigned) { - print_fingerprint (str, cert, GNUTLS_DIG_MD5); print_fingerprint (str, cert, GNUTLS_DIG_SHA1); } print_keyid (str, cert); |