Use BN_CTX_end when exiting early from BN_mod_exp_mont_word because

[oweals/openssl.git] / crypto / objects / obj_lib.c

diff --git a/crypto/objects/obj_lib.c b/crypto/objects/obj_lib.c
index ba30736dc7ce2a8d42f52ea9563e952515df88ff..0c71639ebaff15eac6c1506dae9f76f83aeda899 100644 (file)
--- a/crypto/objects/obj_lib.c
+++ b/crypto/objects/obj_lib.c
@@ -58,12 +58,11 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "lhash.h"
-#include "objects.h"
-#include "buffer.h"
+#include <openssl/lhash.h>
+#include <openssl/objects.h>
+#include <openssl/buffer.h>
 
-ASN1_OBJECT *OBJ_dup(o)
-ASN1_OBJECT *o;
+ASN1_OBJECT *OBJ_dup(ASN1_OBJECT *o)
        {
        ASN1_OBJECT *r;
        int i;
@@ -79,7 +78,7 @@ ASN1_OBJECT *o;
                OBJerr(OBJ_F_OBJ_DUP,ERR_R_ASN1_LIB);
                return(NULL);
                }
-       r->data=Malloc(o->length);
+       r->data=OPENSSL_malloc(o->length);
        if (r->data == NULL)
                goto err;
        memcpy(r->data,o->data,o->length);
@@ -89,7 +88,7 @@ ASN1_OBJECT *o;
        if (o->ln != NULL)
                {
                i=strlen(o->ln)+1;
-               r->ln=ln=Malloc(i);
+               r->ln=ln=OPENSSL_malloc(i);
                if (r->ln == NULL) goto err;
                memcpy(ln,o->ln,i);
                }
@@ -99,7 +98,7 @@ ASN1_OBJECT *o;
                char *s;
 
                i=strlen(o->sn)+1;
-               r->sn=s=Malloc(i);
+               r->sn=s=OPENSSL_malloc(i);
                if (r->sn == NULL) goto err;
                memcpy(s,o->sn,i);
                }
@@ -110,16 +109,14 @@ err:
        OBJerr(OBJ_F_OBJ_DUP,ERR_R_MALLOC_FAILURE);
        if (r != NULL)
                {
-               if (ln != NULL) Free(ln);
-               if (r->data != NULL) Free(r->data);
-               Free(r);
+               if (ln != NULL) OPENSSL_free(ln);
+               if (r->data != NULL) OPENSSL_free(r->data);
+               OPENSSL_free(r);
                }
        return(NULL);
        }
 
-int OBJ_cmp(a,b)
-ASN1_OBJECT *a;
-ASN1_OBJECT *b;
+int OBJ_cmp(ASN1_OBJECT *a, ASN1_OBJECT *b)
        {
        int ret;