mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
25f2138b0a
Currently, there are two different directories which contain internal header files of libcrypto which are meant to be shared internally: While header files in 'include/internal' are intended to be shared between libcrypto and libssl, the files in 'crypto/include/internal' are intended to be shared inside libcrypto only. To make things complicated, the include search path is set up in such a way that the directive #include "internal/file.h" could refer to a file in either of these two directoroes. This makes it necessary in some cases to add a '_int.h' suffix to some files to resolve this ambiguity: #include "internal/file.h" # located in 'include/internal' #include "internal/file_int.h" # located in 'crypto/include/internal' This commit moves the private crypto headers from 'crypto/include/internal' to 'include/crypto' As a result, the include directives become unambiguous #include "internal/file.h" # located in 'include/internal' #include "crypto/file.h" # located in 'include/crypto' hence the superfluous '_int.h' suffixes can be stripped. The files 'store_int.h' and 'store.h' need to be treated specially; they are joined into a single file. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9333)
116 lines
3.1 KiB
C
116 lines
3.1 KiB
C
/*
|
|
* Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
/* Internal tests for the asn1 module */
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include <openssl/asn1.h>
|
|
#include <openssl/evp.h>
|
|
#include <openssl/objects.h>
|
|
#include "testutil.h"
|
|
#include "internal/nelem.h"
|
|
|
|
/**********************************************************************
|
|
*
|
|
* Test of a_strnid's tbl_standard
|
|
*
|
|
***/
|
|
|
|
#include "../crypto/asn1/tbl_standard.h"
|
|
|
|
static int test_tbl_standard(void)
|
|
{
|
|
const ASN1_STRING_TABLE *tmp;
|
|
int last_nid = -1;
|
|
size_t i;
|
|
|
|
for (tmp = tbl_standard, i = 0; i < OSSL_NELEM(tbl_standard); i++, tmp++) {
|
|
if (tmp->nid < last_nid) {
|
|
last_nid = 0;
|
|
break;
|
|
}
|
|
last_nid = tmp->nid;
|
|
}
|
|
|
|
if (TEST_int_ne(last_nid, 0)) {
|
|
TEST_info("asn1 tbl_standard: Table order OK");
|
|
return 1;
|
|
}
|
|
|
|
TEST_info("asn1 tbl_standard: out of order");
|
|
for (tmp = tbl_standard, i = 0; i < OSSL_NELEM(tbl_standard); i++, tmp++)
|
|
TEST_note("asn1 tbl_standard: Index %zu, NID %d, Name=%s",
|
|
i, tmp->nid, OBJ_nid2ln(tmp->nid));
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**********************************************************************
|
|
*
|
|
* Test of ameth_lib's standard_methods
|
|
*
|
|
***/
|
|
|
|
#include "crypto/asn1.h"
|
|
#include "../crypto/asn1/standard_methods.h"
|
|
|
|
static int test_standard_methods(void)
|
|
{
|
|
const EVP_PKEY_ASN1_METHOD **tmp;
|
|
int last_pkey_id = -1;
|
|
size_t i;
|
|
int ok = 1;
|
|
|
|
for (tmp = standard_methods, i = 0; i < OSSL_NELEM(standard_methods);
|
|
i++, tmp++) {
|
|
if ((*tmp)->pkey_id < last_pkey_id) {
|
|
last_pkey_id = 0;
|
|
break;
|
|
}
|
|
last_pkey_id = (*tmp)->pkey_id;
|
|
|
|
/*
|
|
* One of the following must be true:
|
|
*
|
|
* pem_str == NULL AND ASN1_PKEY_ALIAS is set
|
|
* pem_str != NULL AND ASN1_PKEY_ALIAS is clear
|
|
*
|
|
* Anything else is an error and may lead to a corrupt ASN1 method table
|
|
*/
|
|
if (!TEST_true(((*tmp)->pem_str == NULL && ((*tmp)->pkey_flags & ASN1_PKEY_ALIAS) != 0)
|
|
|| ((*tmp)->pem_str != NULL && ((*tmp)->pkey_flags & ASN1_PKEY_ALIAS) == 0))) {
|
|
TEST_note("asn1 standard methods: Index %zu, pkey ID %d, Name=%s",
|
|
i, (*tmp)->pkey_id, OBJ_nid2sn((*tmp)->pkey_id));
|
|
ok = 0;
|
|
}
|
|
}
|
|
|
|
if (TEST_int_ne(last_pkey_id, 0)) {
|
|
TEST_info("asn1 standard methods: Table order OK");
|
|
return ok;
|
|
}
|
|
|
|
TEST_note("asn1 standard methods: out of order");
|
|
for (tmp = standard_methods, i = 0; i < OSSL_NELEM(standard_methods);
|
|
i++, tmp++)
|
|
TEST_note("asn1 standard methods: Index %zu, pkey ID %d, Name=%s",
|
|
i, (*tmp)->pkey_id, OBJ_nid2sn((*tmp)->pkey_id));
|
|
|
|
return 0;
|
|
}
|
|
|
|
int setup_tests(void)
|
|
{
|
|
ADD_TEST(test_tbl_standard);
|
|
ADD_TEST(test_standard_methods);
|
|
return 1;
|
|
}
|