diff options
| author | Steven Valdez <svaldez@google.com> | 2016-10-07 10:34:51 -0400 |
|---|---|---|
| committer | Steven Valdez <svaldez@google.com> | 2016-10-10 10:12:47 -0400 |
| commit | bb1ceac29bc7a18b94e3da78057dc41aa7071784 (patch) | |
| tree | d2c33595946806d8cbc75201ada3e044382727ce /src/crypto/x509/x509_vpm.c | |
| parent | 7c0d06c221ce9edf44bbf978b909b38a0aee2084 (diff) | |
| download | boringssl-bb1ceac29bc7a18b94e3da78057dc41aa7071784.tar.gz | |
external/boringssl: Sync to 3cbdc346.android-n-mr1-preview-2android-n-mr1-preview-1
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/e34bcc91c07c0bf65ecc53a814d51f5246007150..3cbdc34619daafb9f8527fb9dd27afc8ee7dcf19
This removes android_compat_keywrap.c, as these APIs are now provided
natively by BoringSSL.
Test: cts-tradefed run cts -m CtsLibcoreTestCases -m
CtsLibcoreOkHttpTestCases -a arm64-v8a
Change-Id: I29bce93c45eb5b80fa739667bf6e357e0af03b7f
Diffstat (limited to 'src/crypto/x509/x509_vpm.c')
| -rw-r--r-- | src/crypto/x509/x509_vpm.c | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/src/crypto/x509/x509_vpm.c b/src/crypto/x509/x509_vpm.c index b51bc176..9e9dbf5e 100644 --- a/src/crypto/x509/x509_vpm.c +++ b/src/crypto/x509/x509_vpm.c @@ -192,25 +192,36 @@ void X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *param) OPENSSL_free(param); } -/* +/*- * This function determines how parameters are "inherited" from one structure - * to another. There are several different ways this can happen. 1. If a - * child structure needs to have its values initialized from a parent they are - * simply copied across. For example SSL_CTX copied to SSL. 2. If the - * structure should take on values only if they are currently unset. For - * example the values in an SSL structure will take appropriate value for SSL - * servers or clients but only if the application has not set new ones. The - * "inh_flags" field determines how this function behaves. Normally any - * values which are set in the default are not copied from the destination and - * verify flags are ORed together. If X509_VP_FLAG_DEFAULT is set then - * anything set in the source is copied to the destination. Effectively the - * values in "to" become default values which will be used only if nothing new - * is set in "from". If X509_VP_FLAG_OVERWRITE is set then all value are - * copied across whether they are set or not. Flags is still Ored though. If - * X509_VP_FLAG_RESET_FLAGS is set then the flags value is copied instead of - * ORed. If X509_VP_FLAG_LOCKED is set then no values are copied. If - * X509_VP_FLAG_ONCE is set then the current inh_flags setting is zeroed after - * the next call. + * to another. There are several different ways this can happen. + * + * 1. If a child structure needs to have its values initialized from a parent + * they are simply copied across. For example SSL_CTX copied to SSL. + * 2. If the structure should take on values only if they are currently unset. + * For example the values in an SSL structure will take appropriate value + * for SSL servers or clients but only if the application has not set new + * ones. + * + * The "inh_flags" field determines how this function behaves. + * + * Normally any values which are set in the default are not copied from the + * destination and verify flags are ORed together. + * + * If X509_VP_FLAG_DEFAULT is set then anything set in the source is copied + * to the destination. Effectively the values in "to" become default values + * which will be used only if nothing new is set in "from". + * + * If X509_VP_FLAG_OVERWRITE is set then all value are copied across whether + * they are set or not. Flags is still Ored though. + * + * If X509_VP_FLAG_RESET_FLAGS is set then the flags value is copied instead + * of ORed. + * + * If X509_VP_FLAG_LOCKED is set then no values are copied. + * + * If X509_VP_FLAG_ONCE is set then the current inh_flags setting is zeroed + * after the next call. */ /* Macro to test if a field should be copied from src to dest */ |