diff options
| author |   beck <beck@openbsd.org> | 1999-09-29 04:35:07 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 1999-09-29 04:35:07 +0000 |
| commit | 913ec974266f8a62ab2e5ca34a31d6e6f75b3cf0 (patch) | |
| tree | 62c001f84cb6413a049c5c811a08bfbe7c747b77 /lib/libcrypto/x509/x509type.c | |
| parent | fix byte counters; imain@netidea.com (diff) | |
| download | wireguard-openbsd-913ec974266f8a62ab2e5ca34a31d6e6f75b3cf0.tar.xz wireguard-openbsd-913ec974266f8a62ab2e5ca34a31d6e6f75b3cf0.zip | |
OpenSSL 0.9.4 merge
Diffstat (limited to 'lib/libcrypto/x509/x509type.c')
| -rw-r--r-- | lib/libcrypto/x509/x509type.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/libcrypto/x509/x509type.c b/lib/libcrypto/x509/x509type.c index 42c23bcfca0..8e78b344581 100644 --- a/lib/libcrypto/x509/x509type.c +++ b/lib/libcrypto/x509/x509type.c @@ -58,13 +58,11 @@ #include <stdio.h> #include "cryptlib.h" -#include "evp.h" -#include "objects.h" -#include "x509.h" +#include <openssl/evp.h> +#include <openssl/objects.h> +#include <openssl/x509.h> -int X509_certificate_type(x,pkey) -X509 *x; -EVP_PKEY *pkey; +int X509_certificate_type(X509 *x, EVP_PKEY *pkey) { EVP_PKEY *pk; int ret=0,i; @@ -108,8 +106,9 @@ EVP_PKEY *pkey; break; } - if (EVP_PKEY_size(pkey) <= 512) + if (EVP_PKEY_size(pk) <= 512) ret|=EVP_PKT_EXP; + if(pkey==NULL) EVP_PKEY_free(pk); return(ret); } |