diff options
author | beck <> | 2017-01-29 17:49:23 +0000 |
---|---|---|
committer | beck <> | 2017-01-29 17:49:23 +0000 |
commit | 957b11334a7afb14537322f0e4795b2e368b3f59 (patch) | |
tree | 1a54abba678898ee5270ae4f3404a50ee9a92eea /src/lib/libcrypto/objects/obj_lib.c | |
parent | df96e020e729c6c37a8c7fe311fdd1fe6a8718c5 (diff) | |
download | openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.tar.gz openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.tar.bz2 openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.zip |
Send the function codes from the error functions to the bit bucket,
as was done earlier in libssl. Thanks inoguchi@ for noticing
libssl had more reacharounds into this.
ok jsing@ inoguchi@
Diffstat (limited to 'src/lib/libcrypto/objects/obj_lib.c')
-rw-r--r-- | src/lib/libcrypto/objects/obj_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/objects/obj_lib.c b/src/lib/libcrypto/objects/obj_lib.c index 247bafbe01..53f3bb9ebe 100644 --- a/src/lib/libcrypto/objects/obj_lib.c +++ b/src/lib/libcrypto/objects/obj_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: obj_lib.c,v 1.13 2014/10/07 04:59:25 miod Exp $ */ | 1 | /* $OpenBSD: obj_lib.c,v 1.14 2017/01/29 17:49:23 beck Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -79,7 +79,7 @@ OBJ_dup(const ASN1_OBJECT *o) | |||
79 | 79 | ||
80 | r = ASN1_OBJECT_new(); | 80 | r = ASN1_OBJECT_new(); |
81 | if (r == NULL) { | 81 | if (r == NULL) { |
82 | OBJerr(OBJ_F_OBJ_DUP, ERR_R_ASN1_LIB); | 82 | OBJerror(ERR_R_ASN1_LIB); |
83 | return (NULL); | 83 | return (NULL); |
84 | } | 84 | } |
85 | data = malloc(o->length); | 85 | data = malloc(o->length); |
@@ -110,7 +110,7 @@ OBJ_dup(const ASN1_OBJECT *o) | |||
110 | return (r); | 110 | return (r); |
111 | 111 | ||
112 | err: | 112 | err: |
113 | OBJerr(OBJ_F_OBJ_DUP, ERR_R_MALLOC_FAILURE); | 113 | OBJerror(ERR_R_MALLOC_FAILURE); |
114 | free(ln); | 114 | free(ln); |
115 | free(sn); | 115 | free(sn); |
116 | free(data); | 116 | free(data); |