"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "test/v3ext.c" between
openssl-1.1.1o.tar.gz and openssl-1.1.1p.tar.gz

About: OpenSSL is a toolkit implementing the Transport Layer Security (TLS) protocols (including SSLv3) as well as a full-strength general purpose cryptographic library. Long Term Support (LTS) version (includes support for TLSv1.3).

v3ext.c  (openssl-1.1.1o)	:	v3ext.c  (openssl-1.1.1p)
/*		/*
* Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.		* Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
*		*
* Licensed under the OpenSSL license (the "License"). You may not use		* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy		* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at		* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html		* https://www.openssl.org/source/license.html
*/		*/
#include <stdio.h>		#include <stdio.h>
#include <openssl/x509.h>		#include <openssl/x509.h>
#include <openssl/x509v3.h>		#include <openssl/x509v3.h>
skipping to change at line 40		skipping to change at line 40
goto end;		goto end;
ret = 1;		ret = 1;
end:		end:
BIO_free(b);		BIO_free(b);
X509_free(x);		X509_free(x);
return ret;		return ret;
}		}
		static int test_asid(void)
		{
		ASN1_INTEGER *val1 = NULL, *val2 = NULL;
		ASIdentifiers *asid1 = ASIdentifiers_new(), *asid2 = ASIdentifiers_new(),
		*asid3 = ASIdentifiers_new(), *asid4 = ASIdentifiers_new();
		int testresult = 0;
		if (!TEST_ptr(asid1)
		|| !TEST_ptr(asid2)
		|| !TEST_ptr(asid3))
		goto err;
		if (!TEST_ptr(val1 = ASN1_INTEGER_new())
		|| !TEST_true(ASN1_INTEGER_set_int64(val1, 64496)))
		goto err;
		if (!TEST_true(X509v3_asid_add_id_or_range(asid1, V3_ASID_ASNUM, val1, NULL)
		))
		goto err;
		val1 = NULL;
		if (!TEST_ptr(val2 = ASN1_INTEGER_new())
		|| !TEST_true(ASN1_INTEGER_set_int64(val2, 64497)))
		goto err;
		if (!TEST_true(X509v3_asid_add_id_or_range(asid2, V3_ASID_ASNUM, val2, NULL)
		))
		goto err;
		val2 = NULL;
		if (!TEST_ptr(val1 = ASN1_INTEGER_new())
		|| !TEST_true(ASN1_INTEGER_set_int64(val1, 64496))
		|| !TEST_ptr(val2 = ASN1_INTEGER_new())
		|| !TEST_true(ASN1_INTEGER_set_int64(val2, 64497)))
		goto err;
		/*
		* Just tests V3_ASID_ASNUM for now. Could be extended at some point to also
		* test V3_ASID_RDI if we think it is worth it.
		*/
		if (!TEST_true(X509v3_asid_add_id_or_range(asid3, V3_ASID_ASNUM, val1, val2)
		))
		goto err;
		val1 = val2 = NULL;
		/* Actual subsets */
		if (!TEST_true(X509v3_asid_subset(NULL, NULL))
		|| !TEST_true(X509v3_asid_subset(NULL, asid1))
		|| !TEST_true(X509v3_asid_subset(asid1, asid1))
		|| !TEST_true(X509v3_asid_subset(asid2, asid2))
		|| !TEST_true(X509v3_asid_subset(asid1, asid3))
		|| !TEST_true(X509v3_asid_subset(asid2, asid3))
		|| !TEST_true(X509v3_asid_subset(asid3, asid3))
		|| !TEST_true(X509v3_asid_subset(asid4, asid1))
		|| !TEST_true(X509v3_asid_subset(asid4, asid2))
		|| !TEST_true(X509v3_asid_subset(asid4, asid3)))
		goto err;
		/* Not subsets */
		if (!TEST_false(X509v3_asid_subset(asid1, NULL))
		|| !TEST_false(X509v3_asid_subset(asid1, asid2))
		|| !TEST_false(X509v3_asid_subset(asid2, asid1))
		|| !TEST_false(X509v3_asid_subset(asid3, asid1))
		|| !TEST_false(X509v3_asid_subset(asid3, asid2))
		|| !TEST_false(X509v3_asid_subset(asid1, asid4))
		|| !TEST_false(X509v3_asid_subset(asid2, asid4))
		|| !TEST_false(X509v3_asid_subset(asid3, asid4)))
		goto err;
		testresult = 1;
		err:
		ASN1_INTEGER_free(val1);
		ASN1_INTEGER_free(val2);
		ASIdentifiers_free(asid1);
		ASIdentifiers_free(asid2);
		ASIdentifiers_free(asid3);
		ASIdentifiers_free(asid4);
		return testresult;
		}
int setup_tests(void)		int setup_tests(void)
{		{
if (!TEST_ptr(infile = test_get_argument(0)))		if (!TEST_ptr(infile = test_get_argument(0)))
return 0;		return 0;
ADD_TEST(test_pathlen);		ADD_TEST(test_pathlen);
		ADD_TEST(test_asid);
return 1;		return 1;
}		}
End of changes. 3 change blocks.
1 lines changed or deleted		82 lines changed or added

---