diff options
| author | beck <> | 2017-01-29 17:49:23 +0000 |
|---|---|---|
| committer | beck <> | 2017-01-29 17:49:23 +0000 |
| commit | d1f47bd292f36094480caa49ada36b99a69c59b0 (patch) | |
| tree | 1a54abba678898ee5270ae4f3404a50ee9a92eea /src/lib/libcrypto/asn1/x_pkey.c | |
| parent | f8c627888330b75c2eea8a3c27d0efe947a4f9da (diff) | |
| download | openbsd-d1f47bd292f36094480caa49ada36b99a69c59b0.tar.gz openbsd-d1f47bd292f36094480caa49ada36b99a69c59b0.tar.bz2 openbsd-d1f47bd292f36094480caa49ada36b99a69c59b0.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/asn1/x_pkey.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/x_pkey.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/asn1/x_pkey.c b/src/lib/libcrypto/asn1/x_pkey.c index 701db0fc6d..c946281f4a 100644 --- a/src/lib/libcrypto/asn1/x_pkey.c +++ b/src/lib/libcrypto/asn1/x_pkey.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x_pkey.c,v 1.19 2015/09/30 18:41:06 jsing Exp $ */ | 1 | /* $OpenBSD: x_pkey.c,v 1.20 2017/01/29 17:49:22 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 | * |
| @@ -70,16 +70,16 @@ X509_PKEY_new(void) | |||
| 70 | X509_PKEY *ret = NULL; | 70 | X509_PKEY *ret = NULL; |
| 71 | 71 | ||
| 72 | if ((ret = malloc(sizeof(X509_PKEY))) == NULL) { | 72 | if ((ret = malloc(sizeof(X509_PKEY))) == NULL) { |
| 73 | ASN1err(ASN1_F_X509_PKEY_NEW, ERR_R_MALLOC_FAILURE); | 73 | ASN1error(ERR_R_MALLOC_FAILURE); |
| 74 | goto err; | 74 | goto err; |
| 75 | } | 75 | } |
| 76 | ret->version = 0; | 76 | ret->version = 0; |
| 77 | if ((ret->enc_algor = X509_ALGOR_new()) == NULL) { | 77 | if ((ret->enc_algor = X509_ALGOR_new()) == NULL) { |
| 78 | ASN1err(ASN1_F_X509_PKEY_NEW, ERR_R_MALLOC_FAILURE); | 78 | ASN1error(ERR_R_MALLOC_FAILURE); |
| 79 | goto err; | 79 | goto err; |
| 80 | } | 80 | } |
| 81 | if ((ret->enc_pkey = ASN1_OCTET_STRING_new()) == NULL) { | 81 | if ((ret->enc_pkey = ASN1_OCTET_STRING_new()) == NULL) { |
| 82 | ASN1err(ASN1_F_X509_PKEY_NEW, ERR_R_MALLOC_FAILURE); | 82 | ASN1error(ERR_R_MALLOC_FAILURE); |
| 83 | goto err; | 83 | goto err; |
| 84 | } | 84 | } |
| 85 | ret->dec_pkey = NULL; | 85 | ret->dec_pkey = NULL; |
