projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patches from Vern Staats <staatsvr@asc.hpc.mil> to get Kerberos 5 in
[oweals/openssl.git]
/
crypto
/
cryptlib.c
diff --git
a/crypto/cryptlib.c
b/crypto/cryptlib.c
index 5da4828f88a2640b68c03811a54de1438cfa2c52..b733abafeeea944b9cdb0c99f742a37e6070be4d 100644
(file)
--- a/
crypto/cryptlib.c
+++ b/
crypto/cryptlib.c
@@
-397,16
+397,15
@@
void CRYPTO_lock(int mode, int type, const char *file, int line)
#endif
if (type < 0)
{
#endif
if (type < 0)
{
- int i = -type - 1;
struct CRYPTO_dynlock_value *pointer
struct CRYPTO_dynlock_value *pointer
- = CRYPTO_get_dynlock_value(
i
);
+ = CRYPTO_get_dynlock_value(
type
);
if (pointer && dynlock_lock_callback)
{
dynlock_lock_callback(mode, pointer, file, line);
}
if (pointer && dynlock_lock_callback)
{
dynlock_lock_callback(mode, pointer, file, line);
}
- CRYPTO_destroy_dynlockid(
i
);
+ CRYPTO_destroy_dynlockid(
type
);
}
else
if (locking_callback != NULL)
}
else
if (locking_callback != NULL)
@@
-432,7
+431,6
@@
int CRYPTO_add_lock(int *pointer, int amount, int type, const char *file,
CRYPTO_get_lock_name(type),
file,line);
#endif
CRYPTO_get_lock_name(type),
file,line);
#endif
- *pointer=ret;
}
else
{
}
else
{