projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo.
[oweals/openssl.git]
/
ssl
/
kssl.c
diff --git
a/ssl/kssl.c
b/ssl/kssl.c
index 2b82ef60f742c526ab95f3ca6ad22eea4c536b68..a80f5b2f74dad0019f31da33d79da7885911e1a0 100644
(file)
--- a/
ssl/kssl.c
+++ b/
ssl/kssl.c
@@
-70,6
+70,7
@@
#define _XOPEN_SOURCE /* glibc2 needs this to declare strptime() */
#include <time.h>
#define _XOPEN_SOURCE /* glibc2 needs this to declare strptime() */
#include <time.h>
+#undef _XOPEN_SOURCE /* To avoid clashes with anything else... */
#include <string.h>
#include <openssl/ssl.h>
#include <string.h>
#include <openssl/ssl.h>
@@
-1961,7
+1962,7
@@
krb5_error_code kssl_check_authent(
const EVP_CIPHER *enc = NULL;
unsigned char iv[EVP_MAX_IV_LENGTH];
unsigned char *p, *unenc_authent;
const EVP_CIPHER *enc = NULL;
unsigned char iv[EVP_MAX_IV_LENGTH];
unsigned char *p, *unenc_authent;
- int
padl,
outl, unencbufsize;
+ int outl, unencbufsize;
struct tm tm_time, *tm_l, *tm_g;
time_t now, tl, tg, tr, tz_offset;
struct tm tm_time, *tm_l, *tm_g;
time_t now, tl, tg, tr, tz_offset;
@@
-2033,7
+2034,7
@@
krb5_error_code kssl_check_authent(
if (!EVP_CipherInit(&ciph_ctx,enc,kssl_ctx->key,iv,0))
{
kssl_err_set(kssl_err, SSL_R_KRB5_S_INIT,
if (!EVP_CipherInit(&ciph_ctx,enc,kssl_ctx->key,iv,0))
{
kssl_err_set(kssl_err, SSL_R_KRB5_S_INIT,
- "EVP_
DecryptInit_ex
error decrypting authenticator.\n");
+ "EVP_
CipherInit
error decrypting authenticator.\n");
krb5rc = KRB5KRB_AP_ERR_BAD_INTEGRITY;
goto err;
}
krb5rc = KRB5KRB_AP_ERR_BAD_INTEGRITY;
goto err;
}
@@
-2094,6
+2095,7
@@
krb5_error_code kssl_check_authent(
if (auth) KRB5_AUTHENT_free((KRB5_AUTHENT *) auth);
if (dec_authent) KRB5_ENCDATA_free(dec_authent);
if (unenc_authent) free(unenc_authent);
if (auth) KRB5_AUTHENT_free((KRB5_AUTHENT *) auth);
if (dec_authent) KRB5_ENCDATA_free(dec_authent);
if (unenc_authent) free(unenc_authent);
+ EVP_CIPHER_CTX_cleanup(&ciph_ctx);
return krb5rc;
}
return krb5rc;
}