diff options
author | beck <> | 2000-04-15 06:18:51 +0000 |
---|---|---|
committer | beck <> | 2000-04-15 06:18:51 +0000 |
commit | b608c7f2b175e121f2c22d53341a317153afdc8e (patch) | |
tree | e94b160b3fcd8180df79e4251d68d24d665f0195 /src/lib/libcrypto/pem | |
parent | c8d6701c396cebdcd0d45eac73b762e9498f6b01 (diff) | |
download | openbsd-b608c7f2b175e121f2c22d53341a317153afdc8e.tar.gz openbsd-b608c7f2b175e121f2c22d53341a317153afdc8e.tar.bz2 openbsd-b608c7f2b175e121f2c22d53341a317153afdc8e.zip |
OpenSSL 0.9.5a merge
Diffstat (limited to 'src/lib/libcrypto/pem')
-rw-r--r-- | src/lib/libcrypto/pem/pem_err.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/pem/pem_lib.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pem/pem_err.c b/src/lib/libcrypto/pem/pem_err.c index 642129da20..8b1789b11c 100644 --- a/src/lib/libcrypto/pem/pem_err.c +++ b/src/lib/libcrypto/pem/pem_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c index 072211ba0f..b5e0a650f8 100644 --- a/src/lib/libcrypto/pem/pem_lib.c +++ b/src/lib/libcrypto/pem/pem_lib.c | |||
@@ -373,7 +373,7 @@ int PEM_ASN1_write_bio(int (*i2d)(), const char *name, BIO *bp, char *x, | |||
373 | kstr=(unsigned char *)buf; | 373 | kstr=(unsigned char *)buf; |
374 | } | 374 | } |
375 | RAND_add(data,i,0);/* put in the RSA key. */ | 375 | RAND_add(data,i,0);/* put in the RSA key. */ |
376 | if (RAND_bytes(iv,8) <= 0) /* Generate a salt */ | 376 | if (RAND_pseudo_bytes(iv,8) < 0) /* Generate a salt */ |
377 | goto err; | 377 | goto err; |
378 | /* The 'iv' is used as the iv and as a salt. It is | 378 | /* The 'iv' is used as the iv and as a salt. It is |
379 | * NOT taken from the BytesToKey function */ | 379 | * NOT taken from the BytesToKey function */ |