diff options
| author | Adam Langley <agl@google.com> | 2015-09-24 22:57:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-24 22:57:25 +0000 |
| commit | 3781a60670f92c3c6fca860cb4589495cefa2e56 (patch) | |
| tree | dd743d9d64af3145fe96b8d5fc2f3427544794bd /src/crypto/x509v3/v3_crld.c | |
| parent | 4ca36931e543512682d75e8e6d923144261dfd4d (diff) | |
| parent | 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (diff) | |
| download | external_boringssl-3781a60670f92c3c6fca860cb4589495cefa2e56.zip external_boringssl-3781a60670f92c3c6fca860cb4589495cefa2e56.tar.gz external_boringssl-3781a60670f92c3c6fca860cb4589495cefa2e56.tar.bz2 | |
am 1e4884f6: external/boringssl: sync with upstream.
* commit '1e4884f615b20946411a74e41eb9c6aa65e2d5f3':
external/boringssl: sync with upstream.
Diffstat (limited to 'src/crypto/x509v3/v3_crld.c')
| -rw-r--r-- | src/crypto/x509v3/v3_crld.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/crypto/x509v3/v3_crld.c b/src/crypto/x509v3/v3_crld.c index e41dd65..3984c31 100644 --- a/src/crypto/x509v3/v3_crld.c +++ b/src/crypto/x509v3/v3_crld.c @@ -103,7 +103,7 @@ static STACK_OF(GENERAL_NAME) *gnames_from_sectname(X509V3_CTX *ctx, char *sect) gnsect = X509V3_parse_list(sect); if (!gnsect) { - OPENSSL_PUT_ERROR(X509V3, gnames_from_sectname, X509V3_R_SECTION_NOT_FOUND); + OPENSSL_PUT_ERROR(X509V3, X509V3_R_SECTION_NOT_FOUND); return NULL; } gens = v2i_GENERAL_NAMES(NULL, ctx, gnsect); @@ -136,7 +136,7 @@ static int set_dist_point_name(DIST_POINT_NAME **pdp, X509V3_CTX *ctx, dnsect = X509V3_get_section(ctx, cnf->value); if (!dnsect) { - OPENSSL_PUT_ERROR(X509V3, set_dist_point_name, X509V3_R_SECTION_NOT_FOUND); + OPENSSL_PUT_ERROR(X509V3, X509V3_R_SECTION_NOT_FOUND); return -1; } ret = X509V3_NAME_from_section(nm, dnsect, MBSTRING_ASC); @@ -152,7 +152,7 @@ static int set_dist_point_name(DIST_POINT_NAME **pdp, X509V3_CTX *ctx, if (sk_X509_NAME_ENTRY_value(rnm, sk_X509_NAME_ENTRY_num(rnm) - 1)->set) { - OPENSSL_PUT_ERROR(X509V3, set_dist_point_name, X509V3_R_INVALID_MULTIPLE_RDNS); + OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_MULTIPLE_RDNS); goto err; } } @@ -161,7 +161,7 @@ static int set_dist_point_name(DIST_POINT_NAME **pdp, X509V3_CTX *ctx, if (*pdp) { - OPENSSL_PUT_ERROR(X509V3, set_dist_point_name, X509V3_R_DISTPOINT_ALREADY_SET); + OPENSSL_PUT_ERROR(X509V3, X509V3_R_DISTPOINT_ALREADY_SET); goto err; } @@ -362,7 +362,7 @@ static void *v2i_crld(const X509V3_EXT_METHOD *method, return crld; merr: - OPENSSL_PUT_ERROR(X509V3, v2i_crld, ERR_R_MALLOC_FAILURE); + OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE); err: GENERAL_NAME_free(gen); GENERAL_NAMES_free(gens); @@ -490,7 +490,7 @@ static void *v2i_idp(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, } else { - OPENSSL_PUT_ERROR(X509V3, v2i_idp, X509V3_R_INVALID_NAME); + OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_NAME); X509V3_conf_err(cnf); goto err; } @@ -498,7 +498,7 @@ static void *v2i_idp(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, return idp; merr: - OPENSSL_PUT_ERROR(X509V3, v2i_idp, ERR_R_MALLOC_FAILURE); + OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE); err: ISSUING_DIST_POINT_free(idp); return NULL; |