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/x509/x509_cmp.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/x509/x509_cmp.c')
-rw-r--r-- | src/lib/libcrypto/x509/x509_cmp.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/libcrypto/x509/x509_cmp.c b/src/lib/libcrypto/x509/x509_cmp.c index 407e1e07ad..72fbef1544 100644 --- a/src/lib/libcrypto/x509/x509_cmp.c +++ b/src/lib/libcrypto/x509/x509_cmp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_cmp.c,v 1.26 2015/07/29 14:58:34 jsing Exp $ */ | 1 | /* $OpenBSD: x509_cmp.c,v 1.27 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 | * |
@@ -351,16 +351,13 @@ X509_check_private_key(X509 *x, EVP_PKEY *k) | |||
351 | case 1: | 351 | case 1: |
352 | break; | 352 | break; |
353 | case 0: | 353 | case 0: |
354 | X509err(X509_F_X509_CHECK_PRIVATE_KEY, | 354 | X509error(X509_R_KEY_VALUES_MISMATCH); |
355 | X509_R_KEY_VALUES_MISMATCH); | ||
356 | break; | 355 | break; |
357 | case -1: | 356 | case -1: |
358 | X509err(X509_F_X509_CHECK_PRIVATE_KEY, | 357 | X509error(X509_R_KEY_TYPE_MISMATCH); |
359 | X509_R_KEY_TYPE_MISMATCH); | ||
360 | break; | 358 | break; |
361 | case -2: | 359 | case -2: |
362 | X509err(X509_F_X509_CHECK_PRIVATE_KEY, | 360 | X509error(X509_R_UNKNOWN_KEY_TYPE); |
363 | X509_R_UNKNOWN_KEY_TYPE); | ||
364 | } | 361 | } |
365 | EVP_PKEY_free(xk); | 362 | EVP_PKEY_free(xk); |
366 | if (ret > 0) | 363 | if (ret > 0) |