diff options
author | Simon Josefsson <simon@josefsson.org> | 2009-04-21 14:14:49 +0200 |
---|---|---|
committer | Simon Josefsson <simon@josefsson.org> | 2009-04-21 14:14:49 +0200 |
commit | b48c368a18cd52b0fd167dd324fb5664cf19943f (patch) | |
tree | 85d288dff6ff54fe6eb5378b08e580fd9290dfda | |
parent | e209a7c5a56562c1d090689499c9f858421c148f (diff) | |
download | gnutls-b48c368a18cd52b0fd167dd324fb5664cf19943f.tar.gz |
Cleanup code.
-rw-r--r-- | tests/x509sign-verify.c | 86 |
1 files changed, 34 insertions, 52 deletions
diff --git a/tests/x509sign-verify.c b/tests/x509sign-verify.c index 5ce4a562e4..b2e201dd59 100644 --- a/tests/x509sign-verify.c +++ b/tests/x509sign-verify.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation + * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation * - * Author: Simon Josefsson + * Author: Nikos Mavrogiannopoulos, Simon Josefsson * * This file is part of GNUTLS. * @@ -32,36 +32,23 @@ #include <sys/types.h> #include <netinet/in.h> #include <sys/socket.h> -#include <sys/wait.h> #include <arpa/inet.h> #include <unistd.h> #include <gnutls/gnutls.h> #include <gnutls/x509.h> -#include "ex-session-info.c" -#include "ex-x509-info.c" - #include "utils.h" -pid_t child; - -static void -tls_log_func (int level, const char *str) -{ - fprintf (stderr, "%s |<%d>| %s", child ? "server" : "client", level, str); -} - -/* A very basic TLS client, with anonymous authentication. - */ - /* sha1 hash of "hello" string */ const gnutls_datum_t hash_data = { - (void*)"\xaa\xf4\xc6\x1d\xdc\xc5\xe8\xa2\xda\xbe\xde\x0f\x3b\x48\x2c\xd9\xae\xa9\x43\x4d", + (void *) + "\xaa\xf4\xc6\x1d\xdc\xc5\xe8\xa2\xda\xbe" + "\xde\x0f\x3b\x48\x2c\xd9\xae\xa9\x43\x4d", 20 }; const gnutls_datum_t raw_data = { - (void*)"hello", + (void *) "hello", 5 }; @@ -82,21 +69,21 @@ static char cert_pem[] = const gnutls_datum_t cert = { cert_pem, sizeof (cert_pem) }; char key_pem[] = - "-----BEGIN RSA PRIVATE KEY-----\n" - "MIICXAIBAAKBgQC7ZkP18sXXtozMxd/1iDuxyUtqDqGtIFBACIChT1yj0Phsz+Y8\n" - "9+wEdhMXi2SJIlvA3VN8O+18BLuAuSi+jpvGjqClEsv1Vx6i57u3M0mf47tKrmpN\n" - "aP/JEeIyjc49gAuNde/YAIGPKAQDoCKNYQQH+rY3fSEHSdIJYWmYkKNYqQIDAQAB\n" - "AoGADpmARG5CQxS+AesNkGmpauepiCz1JBF/JwnyiX6vEzUh0Ypd39SZztwrDxvF\n" - "PJjQaKVljml1zkJpIDVsqvHdyVdse8M+Qn6hw4x2p5rogdvhhIL1mdWo7jWeVJTF\n" - "RKB7zLdMPs3ySdtcIQaF9nUAQ2KJEvldkO3m/bRJFEp54k0CQQDYy+RlTmwRD6hy\n" - "7UtMjR0H3CSZJeQ8svMCxHLmOluG9H1UKk55ZBYfRTsXniqUkJBZ5wuV1L+pR9EK\n" - "ca89a+1VAkEA3UmBelwEv2u9cAU1QjKjmwju1JgXbrjEohK+3B5y0ESEXPAwNQT9\n" - "TrDM1m9AyxYTWLxX93dI5QwNFJtmbtjeBQJARSCWXhsoaDRG8QZrCSjBxfzTCqZD\n" - "ZXtl807ymCipgJm60LiAt0JLr4LiucAsMZz6+j+quQbSakbFCACB8SLV1QJBAKZQ\n" - "YKf+EPNtnmta/rRKKvySsi3GQZZN+Dt3q0r094XgeTsAqrqujVNfPhTMeP4qEVBX\n" - "/iVX2cmMTSh3w3z8MaECQEp0XJWDVKOwcTW6Ajp9SowtmiZ3YDYo1LF9igb4iaLv\n" - "sWZGfbnU3ryjvkb6YuFjgtzbZDZHWQCo8/cOtOBmPdk=\n" - "-----END RSA PRIVATE KEY-----\n"; + "-----BEGIN RSA PRIVATE KEY-----\n" + "MIICXAIBAAKBgQC7ZkP18sXXtozMxd/1iDuxyUtqDqGtIFBACIChT1yj0Phsz+Y8\n" + "9+wEdhMXi2SJIlvA3VN8O+18BLuAuSi+jpvGjqClEsv1Vx6i57u3M0mf47tKrmpN\n" + "aP/JEeIyjc49gAuNde/YAIGPKAQDoCKNYQQH+rY3fSEHSdIJYWmYkKNYqQIDAQAB\n" + "AoGADpmARG5CQxS+AesNkGmpauepiCz1JBF/JwnyiX6vEzUh0Ypd39SZztwrDxvF\n" + "PJjQaKVljml1zkJpIDVsqvHdyVdse8M+Qn6hw4x2p5rogdvhhIL1mdWo7jWeVJTF\n" + "RKB7zLdMPs3ySdtcIQaF9nUAQ2KJEvldkO3m/bRJFEp54k0CQQDYy+RlTmwRD6hy\n" + "7UtMjR0H3CSZJeQ8svMCxHLmOluG9H1UKk55ZBYfRTsXniqUkJBZ5wuV1L+pR9EK\n" + "ca89a+1VAkEA3UmBelwEv2u9cAU1QjKjmwju1JgXbrjEohK+3B5y0ESEXPAwNQT9\n" + "TrDM1m9AyxYTWLxX93dI5QwNFJtmbtjeBQJARSCWXhsoaDRG8QZrCSjBxfzTCqZD\n" + "ZXtl807ymCipgJm60LiAt0JLr4LiucAsMZz6+j+quQbSakbFCACB8SLV1QJBAKZQ\n" + "YKf+EPNtnmta/rRKKvySsi3GQZZN+Dt3q0r094XgeTsAqrqujVNfPhTMeP4qEVBX\n" + "/iVX2cmMTSh3w3z8MaECQEp0XJWDVKOwcTW6Ajp9SowtmiZ3YDYo1LF9igb4iaLv\n" + "sWZGfbnU3ryjvkb6YuFjgtzbZDZHWQCo8/cOtOBmPdk=\n" + "-----END RSA PRIVATE KEY-----\n"; const gnutls_datum_t key_dat = { key_pem, sizeof (key_pem) }; void @@ -106,50 +93,45 @@ doit (void) gnutls_x509_crt_t crt; gnutls_digest_algorithm_t hash_algo; unsigned char _signature[128]; - size_t _signature_size = sizeof(_signature); + size_t _signature_size = sizeof (_signature); gnutls_datum signature; int ret; gnutls_global_init (); - gnutls_global_set_log_function (tls_log_func); -// if (debug) - gnutls_global_set_log_level (4711); - ret = gnutls_x509_privkey_init (&key); if (ret < 0) - fail("gnutls_x509_privkey_init\n"); + fail ("gnutls_x509_privkey_init\n"); ret = gnutls_x509_privkey_import (key, &key_dat, GNUTLS_X509_FMT_PEM); if (ret < 0) - fail("gnutls_x509_privkey_import\n"); + fail ("gnutls_x509_privkey_import\n"); - ret = gnutls_x509_privkey_sign_data (key, GNUTLS_DIG_SHA1, 0, &raw_data, _signature, &_signature_size); + ret = gnutls_x509_privkey_sign_data (key, GNUTLS_DIG_SHA1, 0, &raw_data, + _signature, &_signature_size); if (ret < 0) - fail("gnutls_x509_privkey_sign_hash\n"); + fail ("gnutls_x509_privkey_sign_hash\n"); ret = gnutls_x509_crt_init (&crt); if (ret < 0) - fail("gnutls_x509_crt_init\n"); + fail ("gnutls_x509_crt_init\n"); ret = gnutls_x509_crt_import (crt, &cert, GNUTLS_X509_FMT_PEM); if (ret < 0) - fail("gnutls_x509_crt_import\n"); + fail ("gnutls_x509_crt_import\n"); signature.data = _signature; signature.size = _signature_size; - ret = gnutls_x509_crt_get_verify_algorithm(crt, &signature, &hash_algo); + ret = gnutls_x509_crt_get_verify_algorithm (crt, &signature, &hash_algo); if (ret < 0 || hash_algo != GNUTLS_DIG_SHA1) - fail("gnutls_x509_crt_get_verify_algorithm\n"); - + fail ("gnutls_x509_crt_get_verify_algorithm\n"); + ret = gnutls_x509_crt_verify_hash (crt, 0, &hash_data, &signature); if (ret < 0) - fail("gnutls_x509_privkey_verify_hash\n"); + fail ("gnutls_x509_privkey_verify_hash\n"); gnutls_x509_privkey_deinit (key); gnutls_x509_crt_deinit (crt); - return; + gnutls_global_deinit (); } - - |