Improve optional 64-bit NIST-P224 implementation, and add NIST-P256 and

[openssl.git] / crypto / store / str_mem.c

diff --git a/crypto/store/str_mem.c b/crypto/store/str_mem.c
index 3f9f62f210d438ee1f4acd32017c778493bc7f30..8ac4f7e55c70b8440223a3b064b42dd2981d2df4 100644 (file)
--- a/crypto/store/str_mem.c
+++ b/crypto/store/str_mem.c
@@ -83,7 +83,7 @@ typedef struct mem_object_data_st
        int references;
        } MEM_OBJECT_DATA;
 
-DECLARE_STACK_OF(MEM_OBJECT_DATA);
+DECLARE_STACK_OF(MEM_OBJECT_DATA)
 struct mem_data_st
        {
        STACK_OF(MEM_OBJECT_DATA) *data; /* sorted with
@@ -93,7 +93,7 @@ struct mem_data_st
                                                from parts of the data. */
        };
 
-DECLARE_STACK_OF(STORE_ATTR_INFO);
+DECLARE_STACK_OF(STORE_ATTR_INFO)
 struct mem_ctx_st
        {
        int type;               /* The type we're searching for */
@@ -314,9 +314,9 @@ static STORE_OBJECT *mem_list_next(STORE *s, void *handle)
        for(srch = context->search_index;
            srch < sk_MEM_OBJECT_DATA_num(store->data)
                    && STORE_ATTR_INFO_in_range(key.attr_info,
-                           sk_MEM_OBJECT_DATA_value(store->data, srch))
+                           sk_MEM_OBJECT_DATA_value(store->data, srch)->attr_info)
                    && !(cres = STORE_ATTR_INFO_in_ex(key.attr_info,
-                                sk_MEM_OBJECT_DATA_value(store->data, srch)));
+                                sk_MEM_OBJECT_DATA_value(store->data, srch)->attr_info));
            srch++)
                ;