[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a8a355402cf2b75fd8fffcd56f9abf6e9c5fae4a (commit)
      from  9471f7760dcc81fe6995f016fc7120db0c678818 (commit)


- Log -----------------------------------------------------------------
commit a8a355402cf2b75fd8fffcd56f9abf6e9c5fae4a
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 8 23:12:14 2016 +0100

    Adapt e_capi to the DSA_SIG_get0() API
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 engines/e_capi.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/engines/e_capi.c b/engines/e_capi.c
index 8e78354..58283e5 100644
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -1022,15 +1022,13 @@ static DSA_SIG *capi_dsa_do_sign(const unsigned char *digest, int dlen,
         capi_addlasterror();
         goto err;
     } else {
+        BIGNUM *r = NULL, *s = NULL;
         ret = DSA_SIG_new();
         if (ret == NULL)
             goto err;
-        ret->r = BN_new();
-        ret->s = BN_new();
-        if (ret->r == NULL || ret->s == NULL)
-            goto err;
-        if (!lend_tobn(ret->r, csigbuf, 20)
-            || !lend_tobn(ret->s, csigbuf + 20, 20)) {
+        DSA_SIG_get0(&r, &s, ret);
+        if (!lend_tobn(r, csigbuf, 20)
+            || !lend_tobn(s, csigbuf + 20, 20)) {
             DSA_SIG_free(ret);
             ret = NULL;
             goto err;