mirrors/opendht
1
0 Fork 0
mirror of https://github.com/savoirfairelinux/opendht.git synced 2026-11-08 04:21:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypto: avoid goto

Browse Source
This commit is contained in:
Adrien Béraud committed 2020-06-15 17:47:32 -04:00
1 parent acbf7cfcf0
commit ae05bc8ea5
1 file changed
+16 -24
Download Patch File Download Diff File Expand all files Collapse all files
src/crypto.cpp
+16 -24
View File
@@ -1037,32 +1037,24 @@ Certificate::getPreferredDigest() const
std::pair<Blob,Blob>
Certificate::generateOcspRequest(gnutls_x509_crt_t& issuer)
{
int ret;
gnutls_ocsp_req_t req;
gnutls_datum_t rdata, nonce;
ret = gnutls_ocsp_req_init(&req);
if (ret < 0) {
goto end;
}
ret = gnutls_ocsp_req_add_cert(req, GNUTLS_DIG_SHA512, issuer, cert);
if (ret < 0) {
goto end;
}
unsigned char noncebuf[64];
nonce = { noncebuf, sizeof(noncebuf) };
ret = gnutls_rnd(GNUTLS_RND_NONCE, nonce.data, nonce.size);
ret = gnutls_ocsp_req_set_nonce(req, 0, &nonce);
if (ret < 0) {
goto end;
}
ret = gnutls_ocsp_req_export(req, &rdata);
if (ret != 0) {
goto end;
}
end:
gnutls_ocsp_req_deinit(req);
gnutls_ocsp_req_t rreq;
int ret = gnutls_ocsp_req_init(&rreq);
if (ret < 0)
throw CryptoException(gnutls_strerror(ret));
std::unique_ptr<struct gnutls_ocsp_req_int, decltype(&gnutls_ocsp_req_deinit)> req(rreq, &gnutls_ocsp_req_deinit);
ret = gnutls_ocsp_req_add_cert(req.get(), GNUTLS_DIG_SHA512, issuer, cert);
if (ret < 0)
throw CryptoException(gnutls_strerror(ret));
unsigned char noncebuf[64];
gnutls_datum_t nonce = { noncebuf, sizeof(noncebuf) };
ret = gnutls_rnd(GNUTLS_RND_NONCE, nonce.data, nonce.size);
ret = gnutls_ocsp_req_set_nonce(req.get(), 0, &nonce);
if (ret < 0)
throw CryptoException(gnutls_strerror(ret));
gnutls_datum_t rdata;
ret = gnutls_ocsp_req_export(req.get(), &rdata);
if (ret != 0)
throw CryptoException(gnutls_strerror(ret));
return std::make_pair<Blob,Blob>({rdata.data, rdata.data + rdata.size},
{nonce.data, nonce.data + nonce.size});
}