X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fssl.h;h=aa719afd8675abf6b2a0b706637fdba9a1467577;hb=bc7bbbdfcc9933129d7838224cdef3983ce53c26;hp=6aa0b1ae654c2bf8edef9e3e819b416746e7b449;hpb=817236c4ef5a94865a85ca403b24ba721417ecc1;p=umurmur.git diff --git a/src/ssl.h b/src/ssl.h index 6aa0b1a..aa719af 100644 --- a/src/ssl.h +++ b/src/ssl.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009-2011, Martin Johansson - Copyright (C) 2005-2011, Thorvald Natvig +/* Copyright (C) 2009-2012, Martin Johansson + Copyright (C) 2005-2012, Thorvald Natvig All rights reserved. @@ -108,7 +108,7 @@ typedef SSL SSL_handle_t; void SSLi_init(void); void SSLi_deinit(void); SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready); -void SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash); +bool_t SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash); void SSLi_closeconnection(SSL_handle_t *ssl); int SSLi_nonblockaccept(SSL_handle_t *ssl, bool_t *SSLready); int SSLi_read(SSL_handle_t *ssl, uint8_t *buf, int len); @@ -118,4 +118,23 @@ bool_t SSLi_data_pending(SSL_handle_t *ssl); void SSLi_shutdown(SSL_handle_t *ssl); void SSLi_free(SSL_handle_t *ssl); +static inline void SSLi_hash2hex(uint8_t *hash, char *out) +{ + int i, offset = 0; + for (i = 0; i < 20; i++) + offset += sprintf(out + offset, "%02x", hash[i]); +} +static inline void SSLi_hex2hash(char *in, uint8_t *hash) +{ + int i, offset = 0; + char byte[3]; + int scanned; + + byte[2] = '\0'; + for (i = 0; i < 20; i++) { + memcpy(byte, &in[i * 2], 2); + sscanf(byte, "%02x", &scanned); + hash[i] = scanned; + } +} #endif