projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RSA, DSA, DH: Allow some given input to be NULL on already initialised keys
[openssl.git]
/
crypto
/
stack
/
stack.c
diff --git
a/crypto/stack/stack.c
b/crypto/stack/stack.c
index efabe166edbc6e851eb38a762472a8cc66f4d71f..d486f335b2ebec07c9bfef6e2a9890ddfc61a434 100644
(file)
--- a/
crypto/stack/stack.c
+++ b/
crypto/stack/stack.c
@@
-1,4
+1,3
@@
-/* crypto/stack/stack.c */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@
-56,7
+55,7
@@
* [including the GNU Public Licence.]
*/
#include <stdio.h>
* [including the GNU Public Licence.]
*/
#include <stdio.h>
-#include "cryptlib.h"
+#include "
internal/
cryptlib.h"
#include <openssl/stack.h>
#include <openssl/objects.h>
#include <openssl/stack.h>
#include <openssl/objects.h>
@@
-71,8
+70,6
@@
struct stack_st {
#undef MIN_NODES
#define MIN_NODES 4
#undef MIN_NODES
#define MIN_NODES 4
-const char STACK_version[] = "Stack" OPENSSL_VERSION_PTEXT;
-
#include <errno.h>
int (*sk_set_cmp_func(_STACK *sk, int (*c) (const void *, const void *)))
#include <errno.h>
int (*sk_set_cmp_func(_STACK *sk, int (*c) (const void *, const void *)))
@@
-152,19
+149,15
@@
_STACK *sk_new_null(void)
_STACK *sk_new(int (*c) (const void *, const void *))
{
_STACK *ret;
_STACK *sk_new(int (*c) (const void *, const void *))
{
_STACK *ret;
- int i;
- if ((ret = OPENSSL_
m
alloc(sizeof(_STACK))) == NULL)
+ if ((ret = OPENSSL_
z
alloc(sizeof(_STACK))) == NULL)
goto err;
goto err;
- if ((ret->data = OPENSSL_
m
alloc(sizeof(*ret->data) * MIN_NODES)) == NULL)
+ if ((ret->data = OPENSSL_
z
alloc(sizeof(*ret->data) * MIN_NODES)) == NULL)
goto err;
goto err;
- for (i = 0; i < MIN_NODES; i++)
- ret->data[i] = NULL;
ret->comp = c;
ret->num_alloc = MIN_NODES;
ret->comp = c;
ret->num_alloc = MIN_NODES;
- ret->num = 0;
- ret->sorted = 0;
return (ret);
return (ret);
+
err:
OPENSSL_free(ret);
return (NULL);
err:
OPENSSL_free(ret);
return (NULL);
@@
-296,7
+289,7
@@
void sk_zero(_STACK *st)
return;
if (st->num <= 0)
return;
return;
if (st->num <= 0)
return;
- memset(
(char *)
st->data, 0, sizeof(*st->data) * st->num);
+ memset(st->data, 0, sizeof(*st->data) * st->num);
st->num = 0;
}
st->num = 0;
}
@@
-343,7
+336,7
@@
void *sk_set(_STACK *st, int i, void *value)
void sk_sort(_STACK *st)
{
void sk_sort(_STACK *st)
{
- if (st && !st->sorted) {
+ if (st && !st->sorted
&& st->comp != NULL
) {
int (*comp_func) (const void *, const void *);
/*
int (*comp_func) (const void *, const void *);
/*