diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-03-30 21:46:13 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-04-02 17:34:27 +0100 |
| commit | fa0a9d715e7e35d4f597683c16b643343245fa26 (patch) | |
| tree | bc7a1ade98acfb9609cf4b770a638c24f41ef1e3 /crypto/x509/x509_err.c | |
| parent | 2d5a1cfab8af8a282c62a3e1562aab1ad905b3e9 (diff) | |
Fix X509_PUBKEY cached key handling.
Don't decode a public key in X509_PUBKEY_get0(): that is handled when
the key is parsed using x509_pubkey_decode() instead.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Diffstat (limited to 'crypto/x509/x509_err.c')
| -rw-r--r-- | crypto/x509/x509_err.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/x509/x509_err.c b/crypto/x509/x509_err.c index 9754c128c3..90a22de41c 100644 --- a/crypto/x509/x509_err.c +++ b/crypto/x509/x509_err.c @@ -1,5 +1,5 @@ /* ==================================================================== - * Copyright (c) 1999-2015 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2016 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -110,6 +110,7 @@ static ERR_STRING_DATA X509_str_functs[] = { {ERR_FUNC(X509_F_X509_NAME_ONELINE), "X509_NAME_oneline"}, {ERR_FUNC(X509_F_X509_NAME_PRINT), "X509_NAME_print"}, {ERR_FUNC(X509_F_X509_PRINT_EX_FP), "X509_print_ex_fp"}, + {ERR_FUNC(X509_F_X509_PUBKEY_DECODE), "x509_pubkey_decode"}, {ERR_FUNC(X509_F_X509_PUBKEY_GET0), "X509_PUBKEY_get0"}, {ERR_FUNC(X509_F_X509_PUBKEY_SET), "X509_PUBKEY_set"}, {ERR_FUNC(X509_F_X509_REQ_CHECK_PRIVATE_KEY), |