Unverified Commit 0a083a66 authored by Johannes Schindelin's avatar Johannes Schindelin Committed by Daniel Stenberg
Browse files

vtls: move sha256sum into the Curl_ssl struct 



The SHA-256 checksumming is also an SSL backend-specific function.
Let's include it in the struct declaring the functionality of SSL
backends.

In contrast to MD5, there is no fall-back code. To indicate this, the
respective entries are NULL for those backends that offer no support for
SHA-256 checksumming.

Signed-off-by: default avatarJohannes Schindelin <johannes.schindelin@gmx.de>
parent e35205a0

lib/vtls/axtls.c

+2 −1
Original line number Diff line number Diff line
@@ -722,7 +722,8 @@ const struct Curl_ssl Curl_ssl_axtls = { 
  Curl_none_set_engine_default,   /* set_engine_default */

  Curl_none_engines_list,         /* engines_list */

  Curl_none_false_start,          /* false_start */

  Curl_none_md5sum                /* md5sum */

  Curl_none_md5sum,               /* md5sum */

  NULL                            /* sha256sum */

};



const struct Curl_ssl *Curl_ssl = &Curl_ssl_axtls;

lib/vtls/cyassl.c

+6 −5
Original line number Diff line number Diff line
@@ -939,7 +939,7 @@ CURLcode Curl_cyassl_random(struct Curl_easy *data, 
  return CURLE_OK;

}



void Curl_cyassl_sha256sum(const unsigned char *tmp, /* input */

static void Curl_cyassl_sha256sum(const unsigned char *tmp, /* input */

                                  size_t tmplen,

                                  unsigned char *sha256sum /* output */,

                                  size_t unused)
@@ -971,7 +971,8 @@ const struct Curl_ssl Curl_ssl_cyassl = { 
  Curl_none_set_engine_default,    /* set_engine_default */

  Curl_none_engines_list,          /* engines_list */

  Curl_none_false_start,           /* false_start */

  Curl_none_md5sum                 /* md5sum */

  Curl_none_md5sum,                /* md5sum */

  Curl_cyassl_sha256sum            /* sha256sum */

};



const struct Curl_ssl *Curl_ssl = &Curl_ssl_cyassl;

lib/vtls/cyassl.h

+0 −6
Original line number Diff line number Diff line
@@ -54,10 +54,6 @@ CURLcode Curl_cyassl_connect_nonblocking(struct connectdata *conn, 
CURLcode Curl_cyassl_random(struct Curl_easy *data,

                            unsigned char *entropy,

                            size_t length);

void Curl_cyassl_sha256sum(const unsigned char *tmp, /* input */

                     size_t tmplen,

                     unsigned char *sha256sum, /* output */

                     size_t unused);



extern const struct Curl_ssl Curl_ssl_cyassl;
@@ -72,7 +68,5 @@ extern const struct Curl_ssl Curl_ssl_cyassl; 
#define have_curlssl_pinnedpubkey 1

#endif



#define curlssl_sha256sum(a,b,c,d) Curl_cyassl_sha256sum(a,b,c,d)



#endif /* USE_CYASSL */

#endif /* HEADER_CURL_CYASSL_H */

lib/vtls/darwinssl.c

+6 −5
Original line number Diff line number Diff line
@@ -2733,7 +2733,7 @@ static CURLcode Curl_darwinssl_md5sum(unsigned char *tmp, /* input */ 
  return CURLE_OK;

}



void Curl_darwinssl_sha256sum(const unsigned char *tmp, /* input */

static void Curl_darwinssl_sha256sum(const unsigned char *tmp, /* input */

                                     size_t tmplen,

                                     unsigned char *sha256sum, /* output */

                                     size_t sha256len)
@@ -2877,7 +2877,8 @@ const struct Curl_ssl Curl_ssl_darwinssl = { 
  Curl_none_set_engine_default,       /* set_engine_default */

  Curl_none_engines_list,             /* engines_list */

  Curl_darwinssl_false_start,         /* false_start */

  Curl_darwinssl_md5sum               /* md5sum */

  Curl_darwinssl_md5sum,              /* md5sum */

  Curl_darwinssl_sha256sum            /* sha256sum */

};



const struct Curl_ssl *Curl_ssl = &Curl_ssl_darwinssl;

lib/vtls/darwinssl.h

+0 −6
Original line number Diff line number Diff line
@@ -44,10 +44,6 @@ bool Curl_darwinssl_data_pending(const struct connectdata *conn, 


CURLcode Curl_darwinssl_random(struct Curl_easy *data, unsigned char *entropy,

                               size_t length);

void Curl_darwinssl_sha256sum(const unsigned char *tmp, /* input */

                              size_t tmplen,

                              unsigned char *sha256sum, /* output */

                              size_t sha256len);

bool Curl_darwinssl_false_start(void);



extern const struct Curl_ssl Curl_ssl_darwinssl;
@@ -74,7 +70,5 @@ extern const struct Curl_ssl Curl_ssl_darwinssl; 
#define have_curlssl_pinnedpubkey 1

#endif /* DARWIN_SSL_PINNEDPUBKEY */



#define curlssl_sha256sum(a,b,c,d) Curl_darwinssl_sha256sum(a, b, c, d)



#endif /* USE_DARWINSSL */

#endif /* HEADER_CURL_DARWINSSL_H */